[PATCH] powerpc: merge code values for identifying platforms

This patch merges platform codes.  systemcfg->platform is no longer used,
systemcfg use in general is deprecated as much as possible (and renamed
_systemcfg before it gets completely moved elsewhere in a future patch),
_machine is now used on ppc64 along as ppc32.  Platform codes aren't gone
yet but we are getting a step closer. A bunch of asm code in head[_64].S
is also turned into C code.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

27 files changed, 165 insertions, 195 deletions

diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index b75757251994..8793102711a8 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -106,7 +106,6 @@ int main(void)
         DEFINE(ICACHEL1LINESIZE, offsetof(struct ppc64_caches, iline_size));
         DEFINE(ICACHEL1LOGLINESIZE, offsetof(struct ppc64_caches, log_iline_size));
         DEFINE(ICACHEL1LINESPERPAGE, offsetof(struct ppc64_caches, ilines_per_page));
-        DEFINE(PLATFORM, offsetof(struct systemcfg, platform));
         DEFINE(PLATFORM_LPAR, PLATFORM_LPAR);
 
         /* paca */
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 16ab40daa738..8a8bf79ef044 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -28,7 +28,6 @@
 #include <asm/reg.h>
 #include <asm/page.h>
 #include <asm/mmu.h>
-#include <asm/systemcfg.h>
 #include <asm/ppc_asm.h>
 #include <asm/asm-offsets.h>
 #include <asm/bug.h>
@@ -1697,25 +1696,14 @@ _GLOBAL(pmac_secondary_start)
  *   SPRG3 = paca virtual address
  */
 _GLOBAL(__secondary_start)
+        /* Set thread priority to MEDIUM */
+        HMT_MEDIUM
 
-        HMT_MEDIUM                      /* Set thread priority to MEDIUM */
-
+        /* Load TOC */
         ld      r2,PACATOC(r13)
-        li      r6,0
-        stb     r6,PACAPROCENABLED(r13)
-
-#ifndef CONFIG_PPC_ISERIES
-        /* Initialize the page table pointer register. */
-        LOADADDR(r6,_SDR1)
-        ld      r6,0(r6)                /* get the value of _SDR1        */
-        mtspr   SPRN_SDR1,r6                    /* set the htab location         */
-#endif
-        /* Initialize the first segment table (or SLB) entry             */
-        ld      r3,PACASTABVIRT(r13)    /* get addr of segment table     */
-BEGIN_FTR_SECTION
-        bl      .stab_initialize
-END_FTR_SECTION_IFCLR(CPU_FTR_SLB)
-        bl      .slb_initialize
+
+        /* Do early setup for that CPU (stab, slb, hash table pointer) */
+        bl      .early_setup_secondary
 
         /* Initialize the kernel stack.  Just a repeat for iSeries.      */
         LOADADDR(r3,current_set)
@@ -1724,37 +1712,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_SLB)
         addi    r1,r1,THREAD_SIZE-STACK_FRAME_OVERHEAD
         std     r1,PACAKSAVE(r13)
 
-        ld      r3,PACASTABREAL(r13)    /* get raddr of segment table    */
-        ori     r4,r3,1                 /* turn on valid bit             */
-
-#ifdef CONFIG_PPC_ISERIES
-        li      r0,-1                   /* hypervisor call */
-        li      r3,1
-        sldi    r3,r3,63                /* 0x8000000000000000 */
-        ori     r3,r3,4                 /* 0x8000000000000004 */
-        sc                              /* HvCall_setASR */
-#else
-        /* set the ASR */
-        ld      r3,systemcfg@got(r2)    /* r3 = ptr to systemcfg         */
-        ld      r3,0(r3)
-        lwz     r3,PLATFORM(r3)         /* r3 = platform flags           */
-        andi.   r3,r3,PLATFORM_LPAR     /* Test if bit 0 is set (LPAR bit) */
-        beq     98f                     /* branch if result is 0  */
-        mfspr   r3,SPRN_PVR
-        srwi    r3,r3,16
-        cmpwi   r3,0x37                 /* SStar  */
-        beq     97f
-        cmpwi   r3,0x36                 /* IStar  */
-        beq     97f
-        cmpwi   r3,0x34                 /* Pulsar */
-        bne     98f
-97:     li      r3,H_SET_ASR            /* hcall = H_SET_ASR */
-        HVSC                            /* Invoking hcall */
-        b       99f
-98:                                     /* !(rpa hypervisor) || !(star)  */
-        mtasr   r4                      /* set the stab location         */
-99:
-#endif
+        /* Clear backchain so we get nice backtraces */
         li      r7,0
         mtlr    r7
 
@@ -1777,6 +1735,7 @@ _GLOBAL(start_secondary_prolog)
         li      r3,0
         std     r3,0(r1)                /* Zero the stack frame pointer */
         bl      .start_secondary
+        b       .
 #endif
 
 /*
@@ -1896,40 +1855,6 @@ _STATIC(start_here_multiplatform)
         mr      r3,r31
         bl      .early_setup
 
-        /* set the ASR */
-        ld      r3,PACASTABREAL(r13)
-        ori     r4,r3,1                 /* turn on valid bit             */
-        ld      r3,systemcfg@got(r2)    /* r3 = ptr to systemcfg */
-        ld      r3,0(r3)
-        lwz     r3,PLATFORM(r3)         /* r3 = platform flags */
-        andi.   r3,r3,PLATFORM_LPAR     /* Test if bit 0 is set (LPAR bit) */
-        beq     98f                     /* branch if result is 0  */
-        mfspr   r3,SPRN_PVR
-        srwi    r3,r3,16
-        cmpwi   r3,0x37                 /* SStar */
-        beq     97f
-        cmpwi   r3,0x36                 /* IStar  */
-        beq     97f
-        cmpwi   r3,0x34                 /* Pulsar */
-        bne     98f
-97:     li      r3,H_SET_ASR            /* hcall = H_SET_ASR */
-        HVSC                            /* Invoking hcall */
-        b       99f
-98:                                     /* !(rpa hypervisor) || !(star) */
-        mtasr   r4                      /* set the stab location        */
-99:
-        /* Set SDR1 (hash table pointer) */
-        ld      r3,systemcfg@got(r2)    /* r3 = ptr to systemcfg */
-        ld      r3,0(r3)
-        lwz     r3,PLATFORM(r3)         /* r3 = platform flags */
-        /* Test if bit 0 is set (LPAR bit) */
-        andi.   r3,r3,PLATFORM_LPAR
-        bne     98f                     /* branch if result is !0  */
-        LOADADDR(r6,_SDR1)              /* Only if NOT LPAR */
-        add     r6,r6,r26
-        ld      r6,0(r6)                /* get the value of _SDR1 */
-        mtspr   SPRN_SDR1,r6                    /* set the htab location  */
-98: 
         LOADADDR(r3,.start_here_common)
         SET_REG_TO_CONST(r4, MSR_KERNEL)
         mtspr   SPRN_SRR0,r3
diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c
index 179948eb0580..3cf2517c5f91 100644
--- a/arch/powerpc/kernel/paca.c
+++ b/arch/powerpc/kernel/paca.c
@@ -15,7 +15,7 @@
 #include <asm/processor.h>
 #include <asm/ptrace.h>
 #include <asm/page.h>
-
+#include <asm/systemcfg.h>
 #include <asm/lppaca.h>
 #include <asm/iseries/it_lp_queue.h>
 #include <asm/paca.h>
@@ -24,8 +24,7 @@ static union {
         struct systemcfg        data;
         u8                      page[PAGE_SIZE];
 } systemcfg_store __attribute__((__section__(".data.page.aligned")));
-struct systemcfg *systemcfg = &systemcfg_store.data;
-EXPORT_SYMBOL(systemcfg);
+struct systemcfg *_systemcfg = &systemcfg_store.data;
 
 
 /* This symbol is provided by the linker - let it fill in the paca
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index 5d9fd0369aad..5dcf4ba05ee8 100644
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -188,9 +188,6 @@ EXPORT_SYMBOL(adb_try_handler_change);
 EXPORT_SYMBOL(cuda_request);
 EXPORT_SYMBOL(cuda_poll);
 #endif /* CONFIG_ADB_CUDA */
-#if defined(CONFIG_PPC_MULTIPLATFORM) && defined(CONFIG_PPC32)
-EXPORT_SYMBOL(_machine);
-#endif
 #ifdef CONFIG_PPC_PMAC
 EXPORT_SYMBOL(sys_ctrler);
 #endif
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 5af39f866735..1bf3642cb859 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -48,9 +48,6 @@
 #include <asm/machdep.h>
 #include <asm/pSeries_reconfig.h>
 #include <asm/pci-bridge.h>
-#ifdef CONFIG_PPC64
-#include <asm/systemcfg.h>
-#endif
 
 #ifdef DEBUG
 #define DBG(fmt...) printk(KERN_ERR fmt)
@@ -391,7 +388,7 @@ static int __devinit finish_node_interrupts(struct device_node *np,
 
 #ifdef CONFIG_PPC64
                 /* We offset irq numbers for the u3 MPIC by 128 in PowerMac */
-                if (systemcfg->platform == PLATFORM_POWERMAC && ic && ic->parent) {
+                if (_machine == PLATFORM_POWERMAC && ic && ic->parent) {
                         char *name = get_property(ic->parent, "name", NULL);
                         if (name && !strcmp(name, "u3"))
                                 np->intrs[intrcount].line += 128;
@@ -1161,13 +1158,9 @@ static int __init early_init_dt_scan_chosen(unsigned long node,
         prop = (u32 *)of_get_flat_dt_prop(node, "linux,platform", NULL);
         if (prop == NULL)
                 return 0;
-#ifdef CONFIG_PPC64
-        systemcfg->platform = *prop;
-#else
 #ifdef CONFIG_PPC_MULTIPLATFORM
         _machine = *prop;
 #endif
-#endif
 
 #ifdef CONFIG_PPC64
         /* check if iommu is forced on or off */
@@ -1346,9 +1339,6 @@ void __init early_init_devtree(void *params)
         of_scan_flat_dt(early_init_dt_scan_memory, NULL);
         lmb_enforce_memory_limit(memory_limit);
         lmb_analyze();
-#ifdef CONFIG_PPC64
-        systemcfg->physicalMemorySize = lmb_phys_mem_size();
-#endif
         lmb_reserve(0, __pa(klimit));
 
         DBG("Phys. mem: %lx\n", lmb_phys_mem_size());
@@ -1915,7 +1905,7 @@ static int of_finish_dynamic_node(struct device_node *node,
         /* We don't support that function on PowerMac, at least
          * not yet
          */
-        if (systemcfg->platform == PLATFORM_POWERMAC)
+        if (_machine == PLATFORM_POWERMAC)
                 return -ENODEV;
 
         /* fix up new node's linux_phandle field */
@@ -1999,9 +1989,11 @@ int prom_add_property(struct device_node* np, struct property* prop)
         *next = prop;
         write_unlock(&devtree_lock);
 
+#ifdef CONFIG_PROC_DEVICETREE
         /* try to add to proc as well if it was initialized */
         if (np->pde)
                 proc_device_tree_add_prop(np->pde, prop);
+#endif /* CONFIG_PROC_DEVICETREE */
 
         return 0;
 }
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 09db1bb9ec91..4ce0105c308e 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -117,11 +117,6 @@ int of_workarounds;
 #define prom_debug(x...)
 #endif
 
-#ifdef CONFIG_PPC32
-#define PLATFORM_POWERMAC       _MACH_Pmac
-#define PLATFORM_CHRP           _MACH_chrp
-#endif
-
 
 typedef u32 prom_arg_t;
 
@@ -2078,7 +2073,8 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
         /*
          * On pSeries, inform the firmware about our capabilities
          */
-        if (RELOC(of_platform) & PLATFORM_PSERIES)
+        if (RELOC(of_platform) == PLATFORM_PSERIES ||
+            RELOC(of_platform) == PLATFORM_PSERIES_LPAR)
                 prom_send_capabilities();
 #endif
 
diff --git a/arch/powerpc/kernel/rtas-proc.c b/arch/powerpc/kernel/rtas-proc.c
index 5bdd5b079d96..ae1a36449ccd 100644
--- a/arch/powerpc/kernel/rtas-proc.c
+++ b/arch/powerpc/kernel/rtas-proc.c
@@ -259,7 +259,7 @@ static int __init proc_rtas_init(void)
 {
         struct proc_dir_entry *entry;
 
-        if (!(systemcfg->platform & PLATFORM_PSERIES))
+        if (_machine != PLATFORM_PSERIES && _machine != PLATFORM_PSERIES_LPAR)
                 return 1;
 
         rtas_node = of_find_node_by_name(NULL, "rtas");
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index 9d4e07f6f1ec..4283fa33f784 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -29,9 +29,6 @@
 #include <asm/delay.h>
 #include <asm/uaccess.h>
 #include <asm/lmb.h>
-#ifdef CONFIG_PPC64
-#include <asm/systemcfg.h>
-#endif
 
 struct rtas_t rtas = {
         .lock = SPIN_LOCK_UNLOCKED
@@ -671,7 +668,7 @@ void __init rtas_initialize(void)
          * the stop-self token if any
          */
 #ifdef CONFIG_PPC64
-        if (systemcfg->platform == PLATFORM_PSERIES_LPAR)
+        if (_machine == PLATFORM_PSERIES_LPAR)
                 rtas_region = min(lmb.rmo_size, RTAS_INSTANTIATE_MAX);
 #endif
         rtas_rmo_buf = lmb_alloc_base(RTAS_RMOBUF_MAX, PAGE_SIZE, rtas_region);
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 17c46a2e356d..06e4ef215627 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -33,6 +33,7 @@
 #include <asm/io.h>
 #include <asm/prom.h>
 #include <asm/processor.h>
+#include <asm/systemcfg.h>
 #include <asm/pgtable.h>
 #include <asm/smp.h>
 #include <asm/elf.h>
@@ -63,6 +64,11 @@
 #define DBG(fmt...)
 #endif
 
+#ifdef CONFIG_PPC_MULTIPLATFORM
+int _machine = 0;
+EXPORT_SYMBOL(_machine);
+#endif
+
 /*
  * This still seems to be needed... -- paulus
  */ 
@@ -513,8 +519,8 @@ void __init smp_setup_cpu_maps(void)
          * On pSeries LPAR, we need to know how many cpus
          * could possibly be added to this partition.
          */
-        if (systemcfg->platform == PLATFORM_PSERIES_LPAR &&
-                                (dn = of_find_node_by_path("/rtas"))) {
+        if (_machine == PLATFORM_PSERIES_LPAR &&
+            (dn = of_find_node_by_path("/rtas"))) {
                 int num_addr_cell, num_size_cell, maxcpus;
                 unsigned int *ireg;
 
@@ -558,7 +564,7 @@ void __init smp_setup_cpu_maps(void)
                         cpu_set(cpu ^ 0x1, cpu_sibling_map[cpu]);
         }
 
-        systemcfg->processorCount = num_present_cpus();
+        _systemcfg->processorCount = num_present_cpus();
 #endif /* CONFIG_PPC64 */
 }
 #endif /* CONFIG_SMP */
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index 55f485f78c00..f73d7681b2e9 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -72,8 +72,6 @@ unsigned int DMA_MODE_WRITE;
 int have_of = 1;
 
 #ifdef CONFIG_PPC_MULTIPLATFORM
-int _machine = 0;
-
 extern void prep_init(void);
 extern void pmac_init(void);
 extern void chrp_init(void);
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index fe39aac4f24d..be607b877a55 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -100,10 +100,9 @@ extern void udbg_init_maple_realmode(void);
 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);
+extern void check_for_initrd(void);
 
 int have_of = 1;
 int boot_cpuid = 0;
@@ -256,11 +255,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 ? */
@@ -292,6 +290,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)
@@ -317,7 +337,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
@@ -342,7 +363,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 {
@@ -362,8 +383,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;
@@ -380,8 +401,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;
@@ -389,10 +410,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");
 }
@@ -481,10 +504,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",
@@ -566,12 +589,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);
                 }
         }
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 5c330c3366e4..7fd530898bd1 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -44,6 +44,7 @@
 #include <asm/cputable.h>
 #include <asm/system.h>
 #include <asm/mpic.h>
+#include <asm/systemcfg.h>
 #ifdef CONFIG_PPC64
 #include <asm/paca.h>
 #endif
@@ -368,7 +369,9 @@ int generic_cpu_disable(void)
         if (cpu == boot_cpuid)
                 return -EBUSY;
 
-        systemcfg->processorCount--;
+#ifdef CONFIG_PPC64
+        _systemcfg->processorCount--;
+#endif
         cpu_clear(cpu, cpu_online_map);
         fixup_irqs(cpu_online_map);
         return 0;
diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c
index a8210ed5c686..9c921d1c4084 100644
--- a/arch/powerpc/kernel/sys_ppc32.c
+++ b/arch/powerpc/kernel/sys_ppc32.c
@@ -52,7 +52,6 @@
 #include <asm/semaphore.h>
 #include <asm/time.h>
 #include <asm/mmu_context.h>
-#include <asm/systemcfg.h>
 #include <asm/ppc-pci.h>
 
 /* readdir & getdents */
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index a6282b625b44..386006b3d616 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -271,13 +271,13 @@ static inline void update_gtod(u64 new_tb_stamp, u64 new_stamp_xsec,
          * tb_to_xs and stamp_xsec values are consistent.  If not, then it
          * loops back and reads them again until this criteria is met.
          */
-        ++(systemcfg->tb_update_count);
+        ++(_systemcfg->tb_update_count);
         smp_wmb();
-        systemcfg->tb_orig_stamp = new_tb_stamp;
-        systemcfg->stamp_xsec = new_stamp_xsec;
-        systemcfg->tb_to_xs = new_tb_to_xs;
+        _systemcfg->tb_orig_stamp = new_tb_stamp;
+        _systemcfg->stamp_xsec = new_stamp_xsec;
+        _systemcfg->tb_to_xs = new_tb_to_xs;
         smp_wmb();
-        ++(systemcfg->tb_update_count);
+        ++(_systemcfg->tb_update_count);
 #endif
 }
 
@@ -357,8 +357,9 @@ static void iSeries_tb_recal(void)
                                 do_gtod.tb_ticks_per_sec = tb_ticks_per_sec;
                                 tb_to_xs = divres.result_low;
                                 do_gtod.varp->tb_to_xs = tb_to_xs;
-                                systemcfg->tb_ticks_per_sec = tb_ticks_per_sec;
-                                systemcfg->tb_to_xs = tb_to_xs;
+                                _systemcfg->tb_ticks_per_sec =
+                                        tb_ticks_per_sec;
+                                _systemcfg->tb_to_xs = tb_to_xs;
                         }
                         else {
                                 printk( "Titan recalibrate: FAILED (difference > 4 percent)\n"
@@ -559,8 +560,8 @@ int do_settimeofday(struct timespec *tv)
         update_gtod(tb_last_jiffy, new_xsec, do_gtod.varp->tb_to_xs);
 
 #ifdef CONFIG_PPC64
-        systemcfg->tz_minuteswest = sys_tz.tz_minuteswest;
-        systemcfg->tz_dsttime = sys_tz.tz_dsttime;
+        _systemcfg->tz_minuteswest = sys_tz.tz_minuteswest;
+        _systemcfg->tz_dsttime = sys_tz.tz_dsttime;
 #endif
 
         write_sequnlock_irqrestore(&xtime_lock, flags);
@@ -711,11 +712,11 @@ void __init time_init(void)
         do_gtod.varp->tb_to_xs = tb_to_xs;
         do_gtod.tb_to_us = tb_to_us;
 #ifdef CONFIG_PPC64
-        systemcfg->tb_orig_stamp = tb_last_jiffy;
-        systemcfg->tb_update_count = 0;
-        systemcfg->tb_ticks_per_sec = tb_ticks_per_sec;
-        systemcfg->stamp_xsec = xtime.tv_sec * XSEC_PER_SEC;
-        systemcfg->tb_to_xs = tb_to_xs;
+        _systemcfg->tb_orig_stamp = tb_last_jiffy;
+        _systemcfg->tb_update_count = 0;
+        _systemcfg->tb_ticks_per_sec = tb_ticks_per_sec;
+        _systemcfg->stamp_xsec = xtime.tv_sec * XSEC_PER_SEC;
+        _systemcfg->tb_to_xs = tb_to_xs;
 #endif
 
         time_freq = 0;
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 0578f8387603..2020bb7648fb 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -129,7 +129,7 @@ int die(const char *str, struct pt_regs *regs, long err)
         nl = 1;
 #endif
 #ifdef CONFIG_PPC64
-        switch (systemcfg->platform) {
+        switch (_machine) {
         case PLATFORM_PSERIES:
                 printk("PSERIES ");
                 nl = 1;
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index c8c9c2df97e9..706e8a63ced9 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -84,10 +84,11 @@
 extern unsigned long dart_tablebase;
 #endif /* CONFIG_U3_DART */
 
+static unsigned long _SDR1;
+struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT];
+
 hpte_t *htab_address;
 unsigned long htab_hash_mask;
-unsigned long _SDR1;
-struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT];
 int mmu_linear_psize = MMU_PAGE_4K;
 int mmu_virtual_psize = MMU_PAGE_4K;
 #ifdef CONFIG_HUGETLB_PAGE
@@ -165,7 +166,7 @@ int htab_bolt_mapping(unsigned long vstart, unsigned long vend,
                  * normal insert callback here.
                  */
 #ifdef CONFIG_PPC_ISERIES
-                if (systemcfg->platform == PLATFORM_ISERIES_LPAR)
+                if (_machine == PLATFORM_ISERIES_LPAR)
                         ret = iSeries_hpte_insert(hpteg, va,
                                                   virt_to_abs(paddr),
                                                   tmp_mode,
@@ -174,7 +175,7 @@ int htab_bolt_mapping(unsigned long vstart, unsigned long vend,
                 else
 #endif
 #ifdef CONFIG_PPC_PSERIES
-                if (systemcfg->platform & PLATFORM_LPAR)
+                if (_machine & PLATFORM_LPAR)
                         ret = pSeries_lpar_hpte_insert(hpteg, va,
                                                        virt_to_abs(paddr),
                                                        tmp_mode,
@@ -293,7 +294,7 @@ static void __init htab_init_page_sizes(void)
          * Not in the device-tree, let's fallback on known size
          * list for 16M capable GP & GR
          */
-        if ((systemcfg->platform != PLATFORM_ISERIES_LPAR) &&
+        if ((_machine != PLATFORM_ISERIES_LPAR) &&
             cpu_has_feature(CPU_FTR_16M_PAGE))
                 memcpy(mmu_psize_defs, mmu_psize_defaults_gp,
                        sizeof(mmu_psize_defaults_gp));
@@ -364,7 +365,7 @@ static int __init htab_dt_scan_pftsize(unsigned long node,
 
 static unsigned long __init htab_get_table_size(void)
 {
-        unsigned long rnd_mem_size, pteg_count;
+        unsigned long mem_size, rnd_mem_size, pteg_count;
 
         /* If hash size isn't already provided by the platform, we try to
          * retreive it from the device-tree. If it's not there neither, we
@@ -376,8 +377,9 @@ static unsigned long __init htab_get_table_size(void)
                 return 1UL << ppc64_pft_size;
 
         /* round mem_size up to next power of 2 */
-        rnd_mem_size = 1UL << __ilog2(systemcfg->physicalMemorySize);
-        if (rnd_mem_size < systemcfg->physicalMemorySize)
+        mem_size = lmb_phys_mem_size();
+        rnd_mem_size = 1UL << __ilog2(mem_size);
+        if (rnd_mem_size < mem_size)
                 rnd_mem_size <<= 1;
 
         /* # pages / 2 */
@@ -419,7 +421,7 @@ void __init htab_initialize(void)
 
         htab_hash_mask = pteg_count - 1;
 
-        if (systemcfg->platform & PLATFORM_LPAR) {
+        if (platform_is_lpar()) {
                 /* Using a hypervisor which owns the htab */
                 htab_address = NULL;
                 _SDR1 = 0; 
@@ -440,6 +442,9 @@ void __init htab_initialize(void)
 
                 /* Initialize the HPT with no entries */
                 memset((void *)table, 0, htab_size_bytes);
+
+                /* Set SDR1 */
+                mtspr(SPRN_SDR1, _SDR1);
         }
 
         mode_rw = _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_COHERENT | PP_RWXX;
@@ -509,6 +514,12 @@ void __init htab_initialize(void)
 #undef KB
 #undef MB
 
+void __init htab_initialize_secondary(void)
+{
+        if (!platform_is_lpar())
+                mtspr(SPRN_SDR1, _SDR1);
+}
+
 /*
  * Called by asm hashtable.S for doing lazy icache flush
  */
diff --git a/arch/powerpc/mm/stab.c b/arch/powerpc/mm/stab.c
index fa325dbf98fc..cfbb4e1f966b 100644
--- a/arch/powerpc/mm/stab.c
+++ b/arch/powerpc/mm/stab.c
@@ -20,6 +20,7 @@
 #include <asm/cputable.h>
 #include <asm/lmb.h>
 #include <asm/abs_addr.h>
+#include <asm/firmware.h>
 
 struct stab_entry {
         unsigned long esid_data;
@@ -256,7 +257,7 @@ void stabs_alloc(void)
 
                 paca[cpu].stab_addr = newstab;
                 paca[cpu].stab_real = virt_to_abs(newstab);
-                printk(KERN_DEBUG "Segment table for CPU %d at 0x%lx "
+                printk(KERN_INFO "Segment table for CPU %d at 0x%lx "
                        "virtual, 0x%lx absolute\n",
                        cpu, paca[cpu].stab_addr, paca[cpu].stab_real);
         }
@@ -270,10 +271,28 @@ void stabs_alloc(void)
 void stab_initialize(unsigned long stab)
 {
         unsigned long vsid = get_kernel_vsid(KERNELBASE);
+        unsigned long stabreal;
 
         asm volatile("isync; slbia; isync":::"memory");
         make_ste(stab, GET_ESID(KERNELBASE), vsid);
 
         /* Order update */
         asm volatile("sync":::"memory");
+
+        /* Set ASR */
+        stabreal = get_paca()->stab_real | 0x1ul;
+
+#ifdef CONFIG_PPC_ISERIES
+        if (firmware_has_feature(FW_FEATURE_ISERIES)) {
+                HvCall1(HvCallBaseSetASR, stabreal);
+                return;
+        }
+#endif /* CONFIG_PPC_ISERIES */
+#ifdef CONFIG_PPC_PSERIES
+        if (platform_is_lpar()) {
+                plpar_hcall_norets(H_SET_ASR, stabreal);
+                return;
+        }
+#endif
+        mtspr(SPRN_ASR, stabreal);
 }
diff --git a/arch/powerpc/oprofile/op_model_power4.c b/arch/powerpc/oprofile/op_model_power4.c
index c4ee5478427b..e3a024e324b6 100644
--- a/arch/powerpc/oprofile/op_model_power4.c
+++ b/arch/powerpc/oprofile/op_model_power4.c
@@ -233,8 +233,7 @@ static unsigned long get_pc(struct pt_regs *regs)
         mmcra = mfspr(SPRN_MMCRA);
 
         /* Were we in the hypervisor? */
-        if ((systemcfg->platform == PLATFORM_PSERIES_LPAR) &&
-            (mmcra & MMCRA_SIHV))
+        if (platform_is_lpar() && (mmcra & MMCRA_SIHV))
                 /* function descriptor madness */
                 return *((unsigned long *)hypervisor_bucket);
 
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index 7f8f0cda6a74..623c39aa0436 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -39,6 +39,7 @@
 #include <asm/sections.h>
 #include <asm/iommu.h>
 #include <asm/firmware.h>
+#include <asm/systemcfg.h>
 
 #include <asm/time.h>
 #include <asm/paca.h>
@@ -71,7 +72,7 @@ extern void hvlog(char *fmt, ...);
 #endif
 
 /* Function Prototypes */
-static void build_iSeries_Memory_Map(void);
+static unsigned long build_iSeries_Memory_Map(void);
 static void iseries_shared_idle(void);
 static void iseries_dedicated_idle(void);
 #ifdef CONFIG_PCI
@@ -403,9 +404,11 @@ void mschunks_alloc(unsigned long num_chunks)
  * a table used to translate Linux's physical addresses to these
  * absolute addresses.  Absolute addresses are needed when
  * communicating with the hypervisor (e.g. to build HPT entries)
+ *
+ * Returns the physical memory size
  */
 
-static void __init build_iSeries_Memory_Map(void)
+static unsigned long __init build_iSeries_Memory_Map(void)
 {
         u32 loadAreaFirstChunk, loadAreaLastChunk, loadAreaSize;
         u32 nextPhysChunk;
@@ -538,7 +541,7 @@ static void __init build_iSeries_Memory_Map(void)
          * which should be equal to
          *   nextPhysChunk
          */
-        systemcfg->physicalMemorySize = chunk_to_addr(nextPhysChunk);
+        return chunk_to_addr(nextPhysChunk);
 }
 
 /*
@@ -564,8 +567,8 @@ static void __init iSeries_setup_arch(void)
         printk("Max physical processors = %d\n",
                         itVpdAreas.xSlicMaxPhysicalProcs);
 
-        systemcfg->processor = xIoHriProcessorVpd[procIx].xPVR;
-        printk("Processor version = %x\n", systemcfg->processor);
+        _systemcfg->processor = xIoHriProcessorVpd[procIx].xPVR;
+        printk("Processor version = %x\n", _systemcfg->processor);
 }
 
 static void iSeries_show_cpuinfo(struct seq_file *m)
@@ -929,7 +932,7 @@ void dt_cpus(struct iseries_flat_dt *dt)
         dt_end_node(dt);
 }
 
-void build_flat_dt(struct iseries_flat_dt *dt)
+void build_flat_dt(struct iseries_flat_dt *dt, unsigned long phys_mem_size)
 {
         u64 tmp[2];
 
@@ -945,7 +948,7 @@ void build_flat_dt(struct iseries_flat_dt *dt)
         dt_prop_str(dt, "name", "memory");
         dt_prop_str(dt, "device_type", "memory");
         tmp[0] = 0;
-        tmp[1] = systemcfg->physicalMemorySize;
+        tmp[1] = phys_mem_size;
         dt_prop_u64_list(dt, "reg", tmp, 2);
         dt_end_node(dt);
 
@@ -965,13 +968,15 @@ void build_flat_dt(struct iseries_flat_dt *dt)
 
 void * __init iSeries_early_setup(void)
 {
+        unsigned long phys_mem_size;
+
         iSeries_fixup_klimit();
 
         /*
          * Initialize the table which translate Linux physical addresses to
          * AS/400 absolute addresses
          */
-        build_iSeries_Memory_Map();
+        phys_mem_size = build_iSeries_Memory_Map();
 
         iSeries_get_cmdline();
 
@@ -981,7 +986,7 @@ void * __init iSeries_early_setup(void)
         /* Parse early parameters, in particular mem=x */
         parse_early_param();
 
-        build_flat_dt(&iseries_dt);
+        build_flat_dt(&iseries_dt, phys_mem_size);
 
         return (void *) __pa(&iseries_dt);
 }
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index b760836bb9d1..a33ba833109c 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -32,7 +32,6 @@
 #include <asm/machdep.h>
 #include <asm/ppc-pci.h>
 #include <asm/rtas.h>
-#include <asm/systemcfg.h>
 
 #undef DEBUG
 
@@ -1186,7 +1185,7 @@ static int __init eeh_init_proc(void)
 {
         struct proc_dir_entry *e;
 
-        if (systemcfg->platform & PLATFORM_PSERIES) {
+        if (platform_is_pseries()) {
                 e = create_proc_entry("ppc64/eeh", 0, NULL);
                 if (e)
                         e->proc_fops = &proc_eeh_operations;
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index fcc50bfd43fd..97ba5214417f 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -42,7 +42,6 @@
 #include <asm/machdep.h>
 #include <asm/abs_addr.h>
 #include <asm/pSeries_reconfig.h>
-#include <asm/systemcfg.h>
 #include <asm/firmware.h>
 #include <asm/tce.h>
 #include <asm/ppc-pci.h>
@@ -582,7 +581,7 @@ void iommu_init_early_pSeries(void)
                 return;
         }
 
-        if (systemcfg->platform & PLATFORM_LPAR) {
+        if (platform_is_lpar()) {
                 if (firmware_has_feature(FW_FEATURE_MULTITCE)) {
                         ppc_md.tce_build = tce_buildmulti_pSeriesLP;
                         ppc_md.tce_free  = tce_freemulti_pSeriesLP;
diff --git a/arch/powerpc/platforms/pseries/pci.c b/arch/powerpc/platforms/pseries/pci.c
index c198656a3bb5..6b0772f35692 100644
--- a/arch/powerpc/platforms/pseries/pci.c
+++ b/arch/powerpc/platforms/pseries/pci.c
@@ -123,7 +123,7 @@ static void fixup_winbond_82c105(struct pci_dev* dev)
         int i;
         unsigned int reg;
 
-        if (!(systemcfg->platform & PLATFORM_PSERIES))
+        if (!platform_is_pseries())
                 return;
 
         printk("Using INTC for W82c105 IDE controller.\n");
diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c
index d7d400339458..d8864164dbe8 100644
--- a/arch/powerpc/platforms/pseries/reconfig.c
+++ b/arch/powerpc/platforms/pseries/reconfig.c
@@ -408,7 +408,7 @@ static int proc_ppc64_create_ofdt(void)
 {
         struct proc_dir_entry *ent;
 
-        if (!(systemcfg->platform & PLATFORM_PSERIES))
+        if (!platform_is_pseries())
                 return 0;
 
         ent = create_proc_entry("ppc64/ofdt", S_IWUSR, NULL);
diff --git a/arch/powerpc/platforms/pseries/rtasd.c b/arch/powerpc/platforms/pseries/rtasd.c
index e26b0420b6dd..00cf331a1dc4 100644
--- a/arch/powerpc/platforms/pseries/rtasd.c
+++ b/arch/powerpc/platforms/pseries/rtasd.c
@@ -482,10 +482,12 @@ static int __init rtas_init(void)
 {
         struct proc_dir_entry *entry;
 
-        /* No RTAS, only warn if we are on a pSeries box  */
+        if (!platform_is_pseries())
+                return 0;
+
+        /* No RTAS */
         if (rtas_token("event-scan") == RTAS_UNKNOWN_SERVICE) {
-                if (systemcfg->platform & PLATFORM_PSERIES)
-                        printk(KERN_INFO "rtasd: no event-scan on system\n");
+                printk(KERN_INFO "rtasd: no event-scan on system\n");
                 return 1;
         }
 
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index a093a0d4dd69..e94247c28d42 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -249,7 +249,7 @@ static void __init pSeries_setup_arch(void)
                 ppc_md.idle_loop = default_idle;
         }
 
-        if (systemcfg->platform & PLATFORM_LPAR)
+        if (platform_is_lpar())
                 ppc_md.enable_pmcs = pseries_lpar_enable_pmcs;
         else
                 ppc_md.enable_pmcs = power4_enable_pmcs;
@@ -378,7 +378,7 @@ static void __init pSeries_init_early(void)
 
         fw_feature_init();
         
-        if (systemcfg->platform & PLATFORM_LPAR)
+        if (platform_is_lpar())
                 hpte_init_lpar();
         else {
                 hpte_init_native();
@@ -388,7 +388,7 @@ static void __init pSeries_init_early(void)
 
         generic_find_legacy_serial_ports(&physport, &default_speed);
 
-        if (systemcfg->platform & PLATFORM_LPAR)
+        if (platform_is_lpar())
                 find_udbg_vterm();
         else if (physport) {
                 /* Map the uart for udbg. */
@@ -592,7 +592,7 @@ static void pseries_shared_idle(void)
 
 static int pSeries_pci_probe_mode(struct pci_bus *bus)
 {
-        if (systemcfg->platform & PLATFORM_LPAR)
+        if (platform_is_lpar())
                 return PCI_PROBE_DEVTREE;
         return PCI_PROBE_NORMAL;
 }
diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c
index 7a243e8ccd7e..3ba794ca3288 100644
--- a/arch/powerpc/platforms/pseries/smp.c
+++ b/arch/powerpc/platforms/pseries/smp.c
@@ -46,6 +46,7 @@
 #include <asm/rtas.h>
 #include <asm/pSeries_reconfig.h>
 #include <asm/mpic.h>
+#include <asm/systemcfg.h>
 
 #include "plpar_wrappers.h"
 
@@ -96,7 +97,7 @@ int pSeries_cpu_disable(void)
         int cpu = smp_processor_id();
 
         cpu_clear(cpu, cpu_online_map);
-        systemcfg->processorCount--;
+        _systemcfg->processorCount--;
 
         /*fix boot_cpuid here*/
         if (cpu == boot_cpuid)
@@ -441,7 +442,7 @@ void __init smp_init_pSeries(void)
         smp_ops->cpu_die = pSeries_cpu_die;
 
         /* Processors can be added/removed only on LPAR */
-        if (systemcfg->platform == PLATFORM_PSERIES_LPAR)
+        if (platform_is_lpar())
                 pSeries_reconfig_notifier_register(&pSeries_smp_nb);
 #endif
 
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index 405c4f3229b3..72ac18067ece 100644
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -545,7 +545,9 @@ nextnode:
                 of_node_put(np);
         }
 
-        if (systemcfg->platform == PLATFORM_PSERIES) {
+        if (platform_is_lpar())
+                ops = &pSeriesLP_ops;
+        else {
 #ifdef CONFIG_SMP
                 for_each_cpu(i) {
                         int hard_id;
@@ -561,8 +563,6 @@ nextnode:
 #else
                 xics_per_cpu[0] = ioremap(intr_base, intr_size);
 #endif /* CONFIG_SMP */
-        } else if (systemcfg->platform == PLATFORM_PSERIES_LPAR) {
-                ops = &pSeriesLP_ops;
         }
 
         xics_8259_pic.enable = i8259_pic.enable;