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

Commit 2c0f9951 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Michael Ellerman
Browse files

powerpc/32: Fix early access to cpu_spec relocation 



Commit 9402c684 ("powerpc: Factor do_feature_fixup calls")
introduced a subtle bug on 32-bit. When reading the cpu spec from the
global, we not only need to do a pointer relocation on the global
address but also on the pointer we read from it.

This fixes crashes reported on MPC5200 based machines.

Fixes: 9402c684 ("powerpc: Factor do_feature_fixup calls")
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent a67ae758

arch/powerpc/lib/feature-fixups.c

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static unsigned long __initdata saved_firmware_features; 


void __init apply_feature_fixups(void)

{

	struct cpu_spec *spec = *PTRRELOC(&cur_cpu_spec);

	struct cpu_spec *spec = PTRRELOC(*PTRRELOC(&cur_cpu_spec));



	*PTRRELOC(&saved_cpu_features) = spec->cpu_features;

	*PTRRELOC(&saved_mmu_features) = spec->mmu_features;