powerpc/pkeys: Fix boot failures with Nemo board (A-EON AmigaOne X1000)
PATCH 1/1 powerpc/pkeys: Fix boot failures with Nemo board (A-EON AmigaOne X1000)
On p6 and before we should avoid updating UAMOR SPRN. This resulted in boot failure on Nemo board.
Fixes 269e829f48a0 ("powerpc/book3s64/pkey: Disable pkey on POWER6 and before")
Reported-by Christian Zigotzky <[email protected]>
Signed-off-by Aneesh Kumar K.V <[email protected]>
--- arch/powerpc/mm/book3s64/hash_utils.c | 5 ++--- arch/powerpc/mm/book3s64/pkeys.c | 12 ++++++------ 2 files changed, 8 insertions(+), 9 deletions(-)
arch/powerpc/mm/book3s64/hash_utils.c +2 -3
@@ -1115,9 +1115,8 @@ void hash__early_init_mmu_secondary(void) && cpu_has_feature(CPU_FTR_HVMODE))tlbiel_all (); -#ifdef CONFIG_PPC_MEM_KEYS -mtspr (SPRN_UAMOR , default_uamor); -#endif +if (IS_ENABLED (CONFIG_PPC_MEM_KEYS ) &&mmu_has_feature (MMU_FTR_PKEY )) + mtspr(SPRN_UAMOR, default_uamor); }#endif /* CONFIG_SMP */
arch/powerpc/mm/book3s64/pkeys.c +6 -6
@@ -73,12 +73,6 @@ static int scan_pkey_feature(void)if (early_radix_enabled ())return 0 ; -/* -* Only P7 and above supports SPRN_AMR update with MSR[PR] = 1 -*/ -if (!early_cpu_has_feature (CPU_FTR_ARCH_206 )) -return 0 ; - ret =of_scan_flat_dt (dt_scan_storage_keys, &pkeys_total);if (ret ==0 ) {/*
@@ -124,6 +118,12 @@ void __init pkey_early_init_devtree(void)__builtin_popcountl (ARCH_VM_PKEY_FLAGS >>VM_PKEY_SHIFT ) != (sizeof(u64) * BITS_PER_BYTE)); +/* +* Only P7 and above supports SPRN_AMR update with MSR[PR] = 1 +*/ +if (!early_cpu_has_feature (CPU_FTR_ARCH_206 )) +return ; +/* scan the device tree for pkey feature */ pkeys_total =scan_pkey_feature ();if (!pkeys_total)
Signature · 1 line
2.26.2
Michael Ellerman
AppliedQuoted 2 lines · Aneesh Kumar K.V
On p6 and before we should avoid updating UAMOR SPRN. This resulted in boot failure on Nemo board.
Applied to powerpc/fixes.
[1/1] powerpc/pkeys: Fix boot failures with Nemo board (A-EON AmigaOne X1000)
https://git.kernel.org/powerpc/c/6553fb799f601497ca0703682e2aff131197dc5c
cheers