Re: MPC5200 does not boot

On Tue, 2016-08-02 at 00:44 +0200, Michal Sojka wrote:

Hi Benjamin,

the following commit causes my MPC5200 not to boot.

    commit 9402c684613163888714df0955fa1f17142b08bf
    Author: Benjamin Herrenschmidt [off-list ref]
    Date:   Tue Jul 5 15:03:41 2016 +1000
     
        powerpc: Factor do_feature_fixup calls
        
        32 and 64-bit do a similar set of calls early on, we move it
all to
        a single common function to make the boot code more readable.
        
        Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.o
rg>
        Signed-off-by: Michael Ellerman [off-list ref]

I suspect that the cause will be similar as described in commit
1cd03890ea64795e53f17a94928cca22495acb2a. Unfortunately, I don't have
much time to debug this, but I can easily test patches.

Does this fixes it for you ?

diff --git a/arch/powerpc/lib/feature-fixups.c b/arch/powerpc/lib/feature-fixups.c
index defb299..fd36e13 100644
--- a/arch/powerpc/lib/feature-fixups.c
+++ b/arch/powerpc/lib/feature-fixups.c

@@ -154,7 +154,7 @@ static void do_final_fixups(void)
 
 void apply_feature_fixups(void)
 {
-	struct cpu_spec *spec = *PTRRELOC(&cur_cpu_spec);
+	struct cpu_spec *spec = PTRRELOC(*PTRRELOC(&cur_cpu_spec));
 
 	/*
 	 * Apply the CPU-specific and firmware specific fixups to kernel text