michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arch: arm64: mmu: create macro for TCR_PS_BITS

Browse source 
Create macro for TCR_PS_BITS instead of programmatically looking up
a static value based on a CONFIG option.  Moving to macro
removes logically dead code reported by Coverity static analysis tool.

Signed-off-by: Scott Branden <scott.branden@broadcom.com>
This commit is contained in:
Scott Branden 2020-06-17 08:35:32 -07:00 • committed by Ioannis Glaropoulos
commit d77fbcb86a
1 changed files with 15 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

36
arch/arm/core/aarch64/arm_mmu.c
View file

@ -96,34 +96,28 @@ static uint64_t base_xlat_table[NUM_BASE_LEVEL_ENTRIES]
static uint64_t xlat_tables[CONFIG_MAX_XLAT_TABLES][XLAT_TABLE_ENTRIES] static uint64_t xlat_tables[CONFIG_MAX_XLAT_TABLES][XLAT_TABLE_ENTRIES]
__aligned(XLAT_TABLE_ENTRIES * sizeof(uint64_t)); __aligned(XLAT_TABLE_ENTRIES * sizeof(uint64_t));
#if (CONFIG_ARM64_PA_BITS == 48)
#define TCR_PS_BITS TCR_PS_BITS_256TB
#elif (CONFIG_ARM64_PA_BITS == 44)
#define TCR_PS_BITS TCR_PS_BITS_16TB
#elif (CONFIG_ARM64_PA_BITS == 42)
#define TCR_PS_BITS TCR_PS_BITS_4TB
#elif (CONFIG_ARM64_PA_BITS == 40)
#define TCR_PS_BITS TCR_PS_BITS_1TB
#elif (CONFIG_ARM64_PA_BITS == 36)
#define TCR_PS_BITS TCR_PS_BITS_64GB
#else
#define TCR_PS_BITS TCR_PS_BITS_4GB
#endif
/* Translation table control register settings */ /* Translation table control register settings */
static uint64_t get_tcr(int el) static uint64_t get_tcr(int el)
{ {
uint64_t tcr; uint64_t tcr;
uint64_t pa_bits = CONFIG_ARM64_PA_BITS;
uint64_t va_bits = CONFIG_ARM64_VA_BITS; uint64_t va_bits = CONFIG_ARM64_VA_BITS;
uint64_t tcr_ps_bits; uint64_t tcr_ps_bits;
switch (pa_bits) { tcr_ps_bits = TCR_PS_BITS;
case 48:
tcr_ps_bits = TCR_PS_BITS_256TB;
break;
case 44:
tcr_ps_bits = TCR_PS_BITS_16TB;
break;
case 42:
tcr_ps_bits = TCR_PS_BITS_4TB;
break;
case 40:
tcr_ps_bits = TCR_PS_BITS_1TB;
break;
case 36:
tcr_ps_bits = TCR_PS_BITS_64GB;
break;
default:
tcr_ps_bits = TCR_PS_BITS_4GB;
break;
}
if (el == 1) { if (el == 1) {
tcr = (tcr_ps_bits << TCR_EL1_IPS_SHIFT); tcr = (tcr_ps_bits << TCR_EL1_IPS_SHIFT);