leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm64: fix ID map extension to 52 bits

Browse Source 
Commit fa2a8445b1 added support for extending the ID map to 52 bits,
but accidentally dropped a required change to __cpu_uses_extended_idmap.
As a result, the kernel fails to boot when VA_BITS = 48 and the ID map
text is in 52-bit physical memory, because we reduce TCR.T0SZ to cover
the ID map, but then never set it back to VA_BITS.

Add back the change, and also clean up some double parentheses.

Fixes: fa2a8445b1 ("arm64: allow ID map to be extended to 52 bits")
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Kristina Martsenko <kristina.martsenko@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
This commit is contained in:
Kristina Martsenko 2018-01-15 15:23:48 +00:00 committed by Catalin Marinas
parent 071929dbdd
commit 6a20542075
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm64/include/asm/mmu_context.h
View File

@ -72,8 +72,7 @@ extern u64 idmap_ptrs_per_pgd;
static inline bool __cpu_uses_extended_idmap(void) static inline bool __cpu_uses_extended_idmap(void)
{ {
return (!IS_ENABLED(CONFIG_ARM64_VA_BITS_48) && return unlikely(idmap_t0sz != TCR_T0SZ(VA_BITS));
unlikely(idmap_t0sz != TCR_T0SZ(VA_BITS)));
} }
/* /*
@ -82,7 +81,7 @@ static inline bool __cpu_uses_extended_idmap(void)
*/ */
static inline bool __cpu_uses_extended_idmap_level(void) static inline bool __cpu_uses_extended_idmap_level(void)
{ {
return ARM64_HW_PGTABLE_LEVELS((64 - idmap_t0sz)) > CONFIG_PGTABLE_LEVELS; return ARM64_HW_PGTABLE_LEVELS(64 - idmap_t0sz) > CONFIG_PGTABLE_LEVELS;
} }
/* /*