mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 09:59:32 +00:00
powerpc fixes for 5.9 #2
One fix for a boot crash on some platforms introduced by the recent pkey refactoring. Thanks to: Christian Zigotzky, Aneesh Kumar K.V. -----BEGIN PGP SIGNATURE----- iQJHBAABCAAxFiEEJFGtCPCthwEv2Y/bUevqPMjhpYAFAl82hVUTHG1wZUBlbGxl cm1hbi5pZC5hdQAKCRBR6+o8yOGlgI5GEACaEJDAJimcb7zqMJ7dQZR1hr5CoU50 r7LIa0BTDDwP4gTfj+CrCp3XCZvTHeYFoYKMgQ2TU9qW/viF6DrXAoufLPQ8Ftyf sFSHvA7olz1ztPwAVLM4HkF61BsMCvrqMCRoDe3NRTWyLD7Ufs4dtiV1GtrjMSZt vQtXs0OWXhNas9hPnt4GR9ZgTSQQxp/VsgiwkhpLsW8dVUXQ12kcHjjKgD6qmXy3 LXdK5NNvHKZ632shwIHHOp0gMd016AqwZAIKGtSD7A8ZRRVMX8StQw8W+pPKRCSA dksHtOUrM4reDx7B00Ce84rNkr2r+gOSzzOyIhnhcMbxhLj6lyb4PkXsCS1D+lB0 c0IbAti7IJaPOIDVG+sjpMR7IetyAtGLRioLMeOcyQmd+C27DEy/NbUzl1yJF8LK htR0XvJNmBgJ3QPhyWw3NpcdLMYsnGZ6rJdHp0XnrXn9ngR1zb8xQU8BdaP/DtKd xeAwNBeiQ7EPeEWv67KXJUJYsEKSKSjZNdUyY6W8m9/qwOHrUrvbBnYzuVD1e4eE ELB1GF5DO10EeYdqFEhhnGUJIwjA7M3SU30LI5DO9x8ikiMCRoI0vLgT4eWU+aTe aRVYfQ750ZlYEGvDhvWKlpcvgRcdtT2rgnqrysyjkJ9bf24/prXa0MSfhwvPipXA A4gY681C1/2IOA== =d4vU -----END PGP SIGNATURE----- Merge tag 'powerpc-5.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux Pull powerpc fix from Michael Ellerman: "One fix for a boot crash on some platforms introduced by the recent pkey refactoring. Thanks to Christian Zigotzky and Aneesh Kumar K.V" * tag 'powerpc-5.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: powerpc/pkeys: Fix boot failures with Nemo board (A-EON AmigaOne X1000)
This commit is contained in:
commit
7fca4dee61
2 changed files with 8 additions and 9 deletions
|
@ -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 */
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue