Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cac4a185 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Michael Ellerman
Browse files

powerpc/mm: Fix missing update of HID register on secondary CPUs 



We need to update on secondaries for the selected MMU mode.

Fixes: ad410674 ("powerpc/mm: Update the HID bit when switching from radix to hash")
Reported-by: default avatarMichael Neuling <mikey@neuling.org>
Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 96ed1fe5

arch/powerpc/mm/hash_utils_64.c

+4 −0
Original line number Diff line number Diff line
@@ -1029,6 +1029,10 @@ void hash__early_init_mmu_secondary(void) 
{

	/* Initialize hash table for that CPU */

	if (!firmware_has_feature(FW_FEATURE_LPAR)) {



		if (cpu_has_feature(CPU_FTR_POWER9_DD1))

			update_hid_for_hash();



		if (!cpu_has_feature(CPU_FTR_ARCH_300))

			mtspr(SPRN_SDR1, _SDR1);

		else

arch/powerpc/mm/pgtable-radix.c

+4 −0
Original line number Diff line number Diff line
@@ -388,6 +388,10 @@ void radix__early_init_mmu_secondary(void) 
	 * update partition table control register and UPRT

	 */

	if (!firmware_has_feature(FW_FEATURE_LPAR)) {



		if (cpu_has_feature(CPU_FTR_POWER9_DD1))

			update_hid_for_radix();



		lpcr = mfspr(SPRN_LPCR);

		mtspr(SPRN_LPCR, lpcr | LPCR_UPRT | LPCR_HR);