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.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/include/asm/feature-fixups.h b/arch/powerpc/include/asm/feature-fixups.h
index 9a67a38bf7b94a3b443dc0b1428bf64b40b544aa..57fec8ac7b924cdeabb4a21b65d46785e9fbf745 100644 (file)
--- a/arch/powerpc/include/asm/feature-fixups.h
+++ b/arch/powerpc/include/asm/feature-fixups.h
@@ -184,4 +184,8 @@ label##3:                                           \
        FTR_ENTRY_OFFSET label##1b-label##3b;           \
        .popsection;
 
+#ifndef __ASSEMBLY__
+void apply_feature_fixups(void);
+#endif
+
 #endif /* __ASM_POWERPC_FEATURE_FIXUPS_H */

diff --git a/arch/powerpc/include/asm/synch.h b/arch/powerpc/include/asm/synch.h
index c50868681f9ead40b285cdc4bb411e43123fb3ff..78efe8d5d77574dbb75263bc31e826af08291f32 100644 (file)
--- a/arch/powerpc/include/asm/synch.h
+++ b/arch/powerpc/include/asm/synch.h
@@ -13,7 +13,6 @@
 extern unsigned int __start___lwsync_fixup, __stop___lwsync_fixup;
 extern void do_lwsync_fixups(unsigned long value, void *fixup_start,
                             void *fixup_end);
-extern void do_final_fixups(void);
 
 static inline void eieio(void)
 {

diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index 4abefb52546289d69549a4706c5eac4dc35724fe..3f0aca2b7f63199285c21bbacec45123d50576fa 100644 (file)
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -70,7 +70,6 @@ int ucache_bsize;
 notrace unsigned long __init early_init(unsigned long dt_ptr)
 {
        unsigned long offset = reloc_offset();
-       struct cpu_spec *spec;
 
        /* First zero the BSS -- use memset_io, some platforms don't have
         * caches on yet */
@@ -81,21 +80,9 @@ notrace unsigned long __init early_init(unsigned long dt_ptr)
         * Identify the CPU type and fix up code sections
         * that depend on which cpu we have.
         */
-       spec = identify_cpu(offset, mfspr(SPRN_PVR));
+       identify_cpu(offset, mfspr(SPRN_PVR));
 
-       do_feature_fixups(spec->cpu_features,
-                         PTRRELOC(&__start___ftr_fixup),
-                         PTRRELOC(&__stop___ftr_fixup));
-
-       do_feature_fixups(spec->mmu_features,
-                         PTRRELOC(&__start___mmu_ftr_fixup),
-                         PTRRELOC(&__stop___mmu_ftr_fixup));
-
-       do_lwsync_fixups(spec->cpu_features,
-                        PTRRELOC(&__start___lwsync_fixup),
-                        PTRRELOC(&__stop___lwsync_fixup));
-
-       do_final_fixups();
+       apply_feature_fixups();
 
        return KERNELBASE + offset;
 }

diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 521846c904ca61ed3b08393c60116f0028031584..373ef9d692f64e3b13567aea42985fd1304b80fa 100644 (file)
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -467,18 +467,7 @@ void __init setup_system(void)
 {
        DBG(" -> setup_system()\n");
 
-       /* Apply the CPUs-specific and firmware specific fixups to kernel
-        * text (nop out sections not relevant to this CPU or this firmware)
-        */
-       do_feature_fixups(cur_cpu_spec->cpu_features,
-                         &__start___ftr_fixup, &__stop___ftr_fixup);
-       do_feature_fixups(cur_cpu_spec->mmu_features,
-                         &__start___mmu_ftr_fixup, &__stop___mmu_ftr_fixup);
-       do_feature_fixups(powerpc_firmware_features,
-                         &__start___fw_ftr_fixup, &__stop___fw_ftr_fixup);
-       do_lwsync_fixups(cur_cpu_spec->cpu_features,
-                        &__start___lwsync_fixup, &__stop___lwsync_fixup);
-       do_final_fixups();
+       apply_feature_fixups();
 
        /*
         * Unflatten the device-tree passed by prom_init or kexec

diff --git a/arch/powerpc/lib/feature-fixups.c b/arch/powerpc/lib/feature-fixups.c
index 7ce3870d7ddd1054898421647c54819ead09e20e..defb2998b8183a9588c76bc10a1f575ee28aa46d 100644 (file)
--- a/arch/powerpc/lib/feature-fixups.c
+++ b/arch/powerpc/lib/feature-fixups.c
@@ -20,7 +20,8 @@
 #include <asm/code-patching.h>
 #include <asm/page.h>
 #include <asm/sections.h>
-
+#include <asm/setup.h>
+#include <asm/firmware.h>
 
 struct fixup_entry {
        unsigned long   mask;
@@ -130,7 +131,7 @@ void do_lwsync_fixups(unsigned long value, void *fixup_start, void *fixup_end)
        }
 }
 
-void do_final_fixups(void)
+static void do_final_fixups(void)
 {
 #if defined(CONFIG_PPC64) && defined(CONFIG_RELOCATABLE)
        int *src, *dest;
@@ -151,6 +152,33 @@ void do_final_fixups(void)
 #endif
 }
 
+void apply_feature_fixups(void)
+{
+       struct cpu_spec *spec = *PTRRELOC(&cur_cpu_spec);
+
+       /*
+        * Apply the CPU-specific and firmware specific fixups to kernel text
+        * (nop out sections not relevant to this CPU or this firmware).
+        */
+       do_feature_fixups(spec->cpu_features,
+                         PTRRELOC(&__start___ftr_fixup),
+                         PTRRELOC(&__stop___ftr_fixup));
+
+       do_feature_fixups(spec->mmu_features,
+                         PTRRELOC(&__start___mmu_ftr_fixup),
+                         PTRRELOC(&__stop___mmu_ftr_fixup));
+
+       do_lwsync_fixups(spec->cpu_features,
+                        PTRRELOC(&__start___lwsync_fixup),
+                        PTRRELOC(&__stop___lwsync_fixup));
+
+#ifdef CONFIG_PPC64
+       do_feature_fixups(powerpc_firmware_features,
+                         &__start___fw_ftr_fixup, &__stop___fw_ftr_fixup);
+#endif
+       do_final_fixups();
+}
+
 #ifdef CONFIG_FTR_FIXUP_SELFTEST
 
 #define check(x)       \