1 files changed, 45 insertions, 48 deletions

diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 0471e843b6c..6791668213e 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -61,6 +61,8 @@
 #include <asm/xmon.h>
 #include <asm/udbg.h>
 
+#include "setup.h"
+
 #ifdef DEBUG
 #define DBG(fmt...) udbg_printf(fmt)
 #else
@@ -94,15 +96,6 @@ extern void udbg_init_maple_realmode(void);
         do { udbg_putc = call_rtas_display_status_delay; } while(0)
 #endif
 
-/* extern void *stab; */
-extern unsigned long klimit;
-
-extern void mm_init_ppc64(void);
-extern void stab_initialize(unsigned long stab);
-extern void htab_initialize(void);
-extern void early_init_devtree(void *flat_dt);
-extern void unflatten_device_tree(void);
-
 int have_of = 1;
 int boot_cpuid = 0;
 int boot_cpuid_phys = 0;
@@ -254,11 +247,10 @@ void __init early_setup(unsigned long dt_ptr)
          * Iterate all ppc_md structures until we find the proper
          * one for the current machine type
          */
-        DBG("Probing machine type for platform %x...\n",
-            systemcfg->platform);
+        DBG("Probing machine type for platform %x...\n", _machine);
 
         for (mach = machines; *mach; mach++) {
-                if ((*mach)->probe(systemcfg->platform))
+                if ((*mach)->probe(_machine))
                         break;
         }
         /* What can we do if we didn't find ? */
@@ -290,6 +282,28 @@ void __init early_setup(unsigned long dt_ptr)
         DBG(" <- early_setup()\n");
 }
 
+#ifdef CONFIG_SMP
+void early_setup_secondary(void)
+{
+        struct paca_struct *lpaca = get_paca();
+
+        /* Mark enabled in PACA */
+        lpaca->proc_enabled = 0;
+
+        /* Initialize hash table for that CPU */
+        htab_initialize_secondary();
+
+        /* Initialize STAB/SLB. We use a virtual address as it works
+         * in real mode on pSeries and we want a virutal address on
+         * iSeries anyway
+         */
+        if (cpu_has_feature(CPU_FTR_SLB))
+                slb_initialize();
+        else
+                stab_initialize(lpaca->stab_addr);
+}
+
+#endif /* CONFIG_SMP */
 
 #if defined(CONFIG_SMP) || defined(CONFIG_KEXEC)
 void smp_release_cpus(void)
@@ -315,7 +329,8 @@ void smp_release_cpus(void)
 #endif /* CONFIG_SMP || CONFIG_KEXEC */
 
 /*
- * Initialize some remaining members of the ppc64_caches and systemcfg structures
+ * Initialize some remaining members of the ppc64_caches and systemcfg
+ * structures
  * (at least until we get rid of them completely). This is mostly some
  * cache informations about the CPU that will be used by cache flush
  * routines and/or provided to userland
@@ -340,7 +355,7 @@ static void __init initialize_cache_info(void)
                         const char *dc, *ic;
 
                         /* Then read cache informations */
-                        if (systemcfg->platform == PLATFORM_POWERMAC) {
+                        if (_machine == PLATFORM_POWERMAC) {
                                 dc = "d-cache-block-size";
                                 ic = "i-cache-block-size";
                         } else {
@@ -360,8 +375,8 @@ static void __init initialize_cache_info(void)
                                 DBG("Argh, can't find dcache properties ! "
                                     "sizep: %p, lsizep: %p\n", sizep, lsizep);
 
-                        systemcfg->dcache_size = ppc64_caches.dsize = size;
-                        systemcfg->dcache_line_size =
+                        _systemcfg->dcache_size = ppc64_caches.dsize = size;
+                        _systemcfg->dcache_line_size =
                                 ppc64_caches.dline_size = lsize;
                         ppc64_caches.log_dline_size = __ilog2(lsize);
                         ppc64_caches.dlines_per_page = PAGE_SIZE / lsize;
@@ -378,8 +393,8 @@ static void __init initialize_cache_info(void)
                                 DBG("Argh, can't find icache properties ! "
                                     "sizep: %p, lsizep: %p\n", sizep, lsizep);
 
-                        systemcfg->icache_size = ppc64_caches.isize = size;
-                        systemcfg->icache_line_size =
+                        _systemcfg->icache_size = ppc64_caches.isize = size;
+                        _systemcfg->icache_line_size =
                                 ppc64_caches.iline_size = lsize;
                         ppc64_caches.log_iline_size = __ilog2(lsize);
                         ppc64_caches.ilines_per_page = PAGE_SIZE / lsize;
@@ -387,10 +402,12 @@ static void __init initialize_cache_info(void)
         }
 
         /* Add an eye catcher and the systemcfg layout version number */
-        strcpy(systemcfg->eye_catcher, "SYSTEMCFG:PPC64");
-        systemcfg->version.major = SYSTEMCFG_MAJOR;
-        systemcfg->version.minor = SYSTEMCFG_MINOR;
-        systemcfg->processor = mfspr(SPRN_PVR);
+        strcpy(_systemcfg->eye_catcher, "SYSTEMCFG:PPC64");
+        _systemcfg->version.major = SYSTEMCFG_MAJOR;
+        _systemcfg->version.minor = SYSTEMCFG_MINOR;
+        _systemcfg->processor = mfspr(SPRN_PVR);
+        _systemcfg->platform = _machine;
+        _systemcfg->physicalMemorySize = lmb_phys_mem_size();
 
         DBG(" <- initialize_cache_info()\n");
 }
@@ -479,10 +496,10 @@ void __init setup_system(void)
         printk("-----------------------------------------------------\n");
         printk("ppc64_pft_size                = 0x%lx\n", ppc64_pft_size);
         printk("ppc64_interrupt_controller    = 0x%ld\n", ppc64_interrupt_controller);
-        printk("systemcfg                     = 0x%p\n", systemcfg);
-        printk("systemcfg->platform           = 0x%x\n", systemcfg->platform);
-        printk("systemcfg->processorCount     = 0x%lx\n", systemcfg->processorCount);
-        printk("systemcfg->physicalMemorySize = 0x%lx\n", systemcfg->physicalMemorySize);
+        printk("systemcfg                     = 0x%p\n", _systemcfg);
+        printk("systemcfg->platform           = 0x%x\n", _systemcfg->platform);
+        printk("systemcfg->processorCount     = 0x%lx\n", _systemcfg->processorCount);
+        printk("systemcfg->physicalMemorySize = 0x%lx\n", _systemcfg->physicalMemorySize);
         printk("ppc64_caches.dcache_line_size = 0x%x\n",
                         ppc64_caches.dline_size);
         printk("ppc64_caches.icache_line_size = 0x%x\n",
@@ -564,12 +581,12 @@ void __init setup_syscall_map(void)
         for (i = 0; i < __NR_syscalls; i++) {
                 if (sys_call_table[i*2] != sys_ni_syscall) {
                         count64++;
-                        systemcfg->syscall_map_64[i >> 5] |=
+                        _systemcfg->syscall_map_64[i >> 5] |=
                                 0x80000000UL >> (i & 0x1f);
                 }
                 if (sys_call_table[i*2+1] != sys_ni_syscall) {
                         count32++;
-                        systemcfg->syscall_map_32[i >> 5] |=
+                        _systemcfg->syscall_map_32[i >> 5] |=
                                 0x80000000UL >> (i & 0x1f);
                 }
         }
@@ -858,26 +875,6 @@ int check_legacy_ioport(unsigned long base_port)
 }
 EXPORT_SYMBOL(check_legacy_ioport);
 
-#ifdef CONFIG_XMON
-static int __init early_xmon(char *p)
-{
-        /* ensure xmon is enabled */
-        if (p) {
-                if (strncmp(p, "on", 2) == 0)
-                        xmon_init(1);
-                if (strncmp(p, "off", 3) == 0)
-                        xmon_init(0);
-                if (strncmp(p, "early", 5) != 0)
-                        return 0;
-        }
-        xmon_init(1);
-        debugger(NULL);
-
-        return 0;
-}
-early_param("xmon", early_xmon);
-#endif
-
 void cpu_die(void)
 {
         if (ppc_md.cpu_die)