6 files changed, 60 insertions, 79 deletions

diff --git a/arch/powerpc/platforms/iseries/Kconfig b/arch/powerpc/platforms/iseries/Kconfig
index e5bc9f75d474..b57cda3a0817 100644
--- a/arch/powerpc/platforms/iseries/Kconfig
+++ b/arch/powerpc/platforms/iseries/Kconfig
@@ -1,7 +1,9 @@
 config PPC_ISERIES
         bool "IBM Legacy iSeries"
         depends on PPC64 && PPC_BOOK3S
-        select PPC_INDIRECT_IO
+        select PPC_SMP_MUXED_IPI
+        select PPC_INDIRECT_PIO
+        select PPC_INDIRECT_MMIO
         select PPC_PCI_CHOICE if EXPERT
 
 menu "iSeries device drivers"
diff --git a/arch/powerpc/platforms/iseries/exception.S b/arch/powerpc/platforms/iseries/exception.S
index 32a56c6dfa72..29c02f36b32f 100644
--- a/arch/powerpc/platforms/iseries/exception.S
+++ b/arch/powerpc/platforms/iseries/exception.S
@@ -31,6 +31,7 @@
 #include <asm/thread_info.h>
 #include <asm/ptrace.h>
 #include <asm/cputable.h>
+#include <asm/mmu.h>
 
 #include "exception.h"
 
@@ -60,29 +61,31 @@ system_reset_iSeries:
 /* Spin on __secondary_hold_spinloop until it is updated by the boot cpu. */
 /* In the UP case we'll yield() later, and we will not access the paca anyway */
 #ifdef CONFIG_SMP
-1:
+iSeries_secondary_wait_paca:
         HMT_LOW
         LOAD_REG_ADDR(r23, __secondary_hold_spinloop)
         ld      r23,0(r23)
-        sync
-        LOAD_REG_ADDR(r3,current_set)
-        sldi    r28,r24,3               /* get current_set[cpu#] */
-        ldx     r3,r3,r28
-        addi    r1,r3,THREAD_SIZE
-        subi    r1,r1,STACK_FRAME_OVERHEAD
 
-        cmpwi   0,r23,0                 /* Keep poking the Hypervisor until */
-        bne     2f                      /* we're released */
-        /* Let the Hypervisor know we are alive */
+        cmpdi   0,r23,0
+        bne     2f                      /* go on when the master is ready */
+
+        /* Keep poking the Hypervisor until we're released */
         /* 8002 is a call to HvCallCfg::getLps, a harmless Hypervisor function */
         lis     r3,0x8002
         rldicr  r3,r3,32,15             /* r0 = (r3 << 32) & 0xffff000000000000 */
         li      r0,-1                   /* r0=-1 indicates a Hypervisor call */
         sc                              /* Invoke the hypervisor via a system call */
-        b       1b
-#endif
+        b       iSeries_secondary_wait_paca
 
 2:
+        HMT_MEDIUM
+        sync
+
+        LOAD_REG_ADDR(r3, nr_cpu_ids)   /* get number of pacas allocated */
+        lwz     r3,0(r3)                /* nr_cpus= or NR_CPUS can limit */
+        cmpld   0,r24,r3                /* is our cpu number allocated? */
+        bge     iSeries_secondary_yield /* no, yield forever */
+
         /* Load our paca now that it's been allocated */
         LOAD_REG_ADDR(r13, paca)
         ld      r13,0(r13)
@@ -93,10 +96,24 @@ system_reset_iSeries:
         ori     r23,r23,MSR_RI
         mtmsrd  r23                     /* RI on */
 
-        HMT_LOW
-#ifdef CONFIG_SMP
+iSeries_secondary_smp_loop:
         lbz     r23,PACAPROCSTART(r13)  /* Test if this processor
                                          * should start */
+        cmpwi   0,r23,0
+        bne     3f                      /* go on when we are told */
+
+        HMT_LOW
+        /* Let the Hypervisor know we are alive */
+        /* 8002 is a call to HvCallCfg::getLps, a harmless Hypervisor function */
+        lis     r3,0x8002
+        rldicr  r3,r3,32,15             /* r0 = (r3 << 32) & 0xffff000000000000 */
+        li      r0,-1                   /* r0=-1 indicates a Hypervisor call */
+        sc                              /* Invoke the hypervisor via a system call */
+        mfspr   r13,SPRN_SPRG_PACA      /* Put r13 back ???? */
+        b       iSeries_secondary_smp_loop /* wait for signal to start */
+
+3:
+        HMT_MEDIUM
         sync
         LOAD_REG_ADDR(r3,current_set)
         sldi    r28,r24,3               /* get current_set[cpu#] */
@@ -104,27 +121,22 @@ system_reset_iSeries:
         addi    r1,r3,THREAD_SIZE
         subi    r1,r1,STACK_FRAME_OVERHEAD
 
-        cmpwi   0,r23,0
-        beq     iSeries_secondary_smp_loop      /* Loop until told to go */
         b       __secondary_start               /* Loop until told to go */
-iSeries_secondary_smp_loop:
-        /* Let the Hypervisor know we are alive */
-        /* 8002 is a call to HvCallCfg::getLps, a harmless Hypervisor function */
-        lis     r3,0x8002
-        rldicr  r3,r3,32,15             /* r0 = (r3 << 32) & 0xffff000000000000 */
-#else /* CONFIG_SMP */
+#endif /* CONFIG_SMP */
+
+iSeries_secondary_yield:
         /* Yield the processor.  This is required for non-SMP kernels
                 which are running on multi-threaded machines. */
+        HMT_LOW
         lis     r3,0x8000
         rldicr  r3,r3,32,15             /* r3 = (r3 << 32) & 0xffff000000000000 */
         addi    r3,r3,18                /* r3 = 0x8000000000000012 which is "yield" */
         li      r4,0                    /* "yield timed" */
         li      r5,-1                   /* "yield forever" */
-#endif /* CONFIG_SMP */
         li      r0,-1                   /* r0=-1 indicates a Hypervisor call */
         sc                              /* Invoke the hypervisor via a system call */
         mfspr   r13,SPRN_SPRG_PACA      /* Put r13 back ???? */
-        b       2b                      /* If SMP not configured, secondaries
+        b       iSeries_secondary_yield /* If SMP not configured, secondaries
                                          * loop forever */
 
 /***  ISeries-LPAR interrupt handlers ***/
@@ -157,7 +169,7 @@ BEGIN_FTR_SECTION
 FTR_SECTION_ELSE
         EXCEPTION_PROLOG_1(PACA_EXGEN)
         EXCEPTION_PROLOG_ISERIES_1
-ALT_FTR_SECTION_END_IFCLR(CPU_FTR_SLB)
+ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_SLB)
         b       data_access_common
 
 .do_stab_bolted_iSeries:
diff --git a/arch/powerpc/platforms/iseries/irq.c b/arch/powerpc/platforms/iseries/irq.c
index 52a6889832c7..b2103453eb01 100644
--- a/arch/powerpc/platforms/iseries/irq.c
+++ b/arch/powerpc/platforms/iseries/irq.c
@@ -42,7 +42,6 @@
 #include "irq.h"
 #include "pci.h"
 #include "call_pci.h"
-#include "smp.h"
 
 #ifdef CONFIG_PCI
 
@@ -171,7 +170,7 @@ static void iseries_enable_IRQ(struct irq_data *d)
 {
         u32 bus, dev_id, function, mask;
         const u32 sub_bus = 0;
-        unsigned int rirq = (unsigned int)irq_map[d->irq].hwirq;
+        unsigned int rirq = (unsigned int)irqd_to_hwirq(d);
 
         /* The IRQ has already been locked by the caller */
         bus = REAL_IRQ_TO_BUS(rirq);
@@ -188,7 +187,7 @@ static unsigned int iseries_startup_IRQ(struct irq_data *d)
 {
         u32 bus, dev_id, function, mask;
         const u32 sub_bus = 0;
-        unsigned int rirq = (unsigned int)irq_map[d->irq].hwirq;
+        unsigned int rirq = (unsigned int)irqd_to_hwirq(d);
 
         bus = REAL_IRQ_TO_BUS(rirq);
         function = REAL_IRQ_TO_FUNC(rirq);
@@ -234,7 +233,7 @@ static void iseries_shutdown_IRQ(struct irq_data *d)
 {
         u32 bus, dev_id, function, mask;
         const u32 sub_bus = 0;
-        unsigned int rirq = (unsigned int)irq_map[d->irq].hwirq;
+        unsigned int rirq = (unsigned int)irqd_to_hwirq(d);
 
         /* irq should be locked by the caller */
         bus = REAL_IRQ_TO_BUS(rirq);
@@ -257,7 +256,7 @@ static void iseries_disable_IRQ(struct irq_data *d)
 {
         u32 bus, dev_id, function, mask;
         const u32 sub_bus = 0;
-        unsigned int rirq = (unsigned int)irq_map[d->irq].hwirq;
+        unsigned int rirq = (unsigned int)irqd_to_hwirq(d);
 
         /* The IRQ has already been locked by the caller */
         bus = REAL_IRQ_TO_BUS(rirq);
@@ -271,7 +270,7 @@ static void iseries_disable_IRQ(struct irq_data *d)
 
 static void iseries_end_IRQ(struct irq_data *d)
 {
-        unsigned int rirq = (unsigned int)irq_map[d->irq].hwirq;
+        unsigned int rirq = (unsigned int)irqd_to_hwirq(d);
 
         HvCallPci_eoi(REAL_IRQ_TO_BUS(rirq), REAL_IRQ_TO_SUBBUS(rirq),
                 (REAL_IRQ_TO_IDSEL(rirq) << 4) + REAL_IRQ_TO_FUNC(rirq));
@@ -316,7 +315,7 @@ unsigned int iSeries_get_irq(void)
 #ifdef CONFIG_SMP
         if (get_lppaca()->int_dword.fields.ipi_cnt) {
                 get_lppaca()->int_dword.fields.ipi_cnt = 0;
-                iSeries_smp_message_recv();
+                smp_ipi_demux();
         }
 #endif /* CONFIG_SMP */
         if (hvlpevent_is_pending())
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index 2946ae10fbfd..c25a0815c26b 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -249,7 +249,7 @@ static unsigned long iSeries_process_mainstore_vpd(struct MemoryBlock *mb_array,
         unsigned long i;
         unsigned long mem_blocks = 0;
 
-        if (cpu_has_feature(CPU_FTR_SLB))
+        if (mmu_has_feature(MMU_FTR_SLB))
                 mem_blocks = iSeries_process_Regatta_mainstore_vpd(mb_array,
                                 max_entries);
         else
@@ -634,7 +634,7 @@ static int __init iseries_probe(void)
 
         hpte_init_iSeries();
         /* iSeries does not support 16M pages */
-        cur_cpu_spec->cpu_features &= ~CPU_FTR_16M_PAGE;
+        cur_cpu_spec->mmu_features &= ~MMU_FTR_16M_PAGE;
 
         return 1;
 }
@@ -685,6 +685,11 @@ void * __init iSeries_early_setup(void)
         powerpc_firmware_features |= FW_FEATURE_ISERIES;
         powerpc_firmware_features |= FW_FEATURE_LPAR;
 
+#ifdef CONFIG_SMP
+        /* On iSeries we know we can never have more than 64 cpus */
+        nr_cpu_ids = max(nr_cpu_ids, 64);
+#endif
+
         iSeries_fixup_klimit();
 
         /*
diff --git a/arch/powerpc/platforms/iseries/smp.c b/arch/powerpc/platforms/iseries/smp.c
index 6c6029914dbc..e3265adde5d3 100644
--- a/arch/powerpc/platforms/iseries/smp.c
+++ b/arch/powerpc/platforms/iseries/smp.c
@@ -42,57 +42,23 @@
 #include <asm/cputable.h>
 #include <asm/system.h>
 
-#include "smp.h"
-
-static unsigned long iSeries_smp_message[NR_CPUS];
-
-void iSeries_smp_message_recv(void)
-{
-        int cpu = smp_processor_id();
-        int msg;
-
-        if (num_online_cpus() < 2)
-                return;
-
-        for (msg = 0; msg < 4; msg++)
-                if (test_and_clear_bit(msg, &iSeries_smp_message[cpu]))
-                        smp_message_recv(msg);
-}
-
-static inline void smp_iSeries_do_message(int cpu, int msg)
+static void smp_iSeries_cause_ipi(int cpu, unsigned long data)
 {
-        set_bit(msg, &iSeries_smp_message[cpu]);
         HvCall_sendIPI(&(paca[cpu]));
 }
 
-static void smp_iSeries_message_pass(int target, int msg)
-{
-        int i;
-
-        if (target < NR_CPUS)
-                smp_iSeries_do_message(target, msg);
-        else {
-                for_each_online_cpu(i) {
-                        if ((target == MSG_ALL_BUT_SELF) &&
-                                        (i == smp_processor_id()))
-                                continue;
-                        smp_iSeries_do_message(i, msg);
-                }
-        }
-}
-
 static int smp_iSeries_probe(void)
 {
         return cpumask_weight(cpu_possible_mask);
 }
 
-static void smp_iSeries_kick_cpu(int nr)
+static int smp_iSeries_kick_cpu(int nr)
 {
         BUG_ON((nr < 0) || (nr >= NR_CPUS));
 
         /* Verify that our partition has a processor nr */
         if (lppaca_of(nr).dyn_proc_status >= 2)
-                return;
+                return -ENOENT;
 
         /* The processor is currently spinning, waiting
          * for the cpu_start field to become non-zero
@@ -100,6 +66,8 @@ static void smp_iSeries_kick_cpu(int nr)
          * continue on to secondary_start in iSeries_head.S
          */
         paca[nr].cpu_start = 1;
+
+        return 0;
 }
 
 static void __devinit smp_iSeries_setup_cpu(int nr)
@@ -107,7 +75,8 @@ static void __devinit smp_iSeries_setup_cpu(int nr)
 }
 
 static struct smp_ops_t iSeries_smp_ops = {
-        .message_pass = smp_iSeries_message_pass,
+        .message_pass = smp_muxed_ipi_message_pass,
+        .cause_ipi    = smp_iSeries_cause_ipi,
         .probe        = smp_iSeries_probe,
         .kick_cpu     = smp_iSeries_kick_cpu,
         .setup_cpu    = smp_iSeries_setup_cpu,
diff --git a/arch/powerpc/platforms/iseries/smp.h b/arch/powerpc/platforms/iseries/smp.h
deleted file mode 100644
index d501f7de01e7..000000000000
--- a/arch/powerpc/platforms/iseries/smp.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _PLATFORMS_ISERIES_SMP_H
-#define _PLATFORMS_ISERIES_SMP_H
-
-extern void iSeries_smp_message_recv(void);
-
-#endif  /* _PLATFORMS_ISERIES_SMP_H */