1 files changed, 82 insertions, 50 deletions

diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 93e52039321b..e4d98de83dd8 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -36,6 +36,8 @@
 #include <linux/cpu.h>
 #include <linux/timex.h>
 #include <linux/bootmem.h>
+#include <linux/slab.h>
+#include <asm/asm-offsets.h>
 #include <asm/ipl.h>
 #include <asm/setup.h>
 #include <asm/sigp.h>
@@ -52,6 +54,9 @@
 #include <asm/cpu.h>
 #include "entry.h"
 
+/* logical cpu to cpu address */
+unsigned short __cpu_logical_map[NR_CPUS];
+
 static struct task_struct *current_set[NR_CPUS];
 
 static u8 smp_cpu_type;
@@ -69,13 +74,13 @@ static int cpu_management;
 
 static DEFINE_PER_CPU(struct cpu, cpu_devices);
 
-static void smp_ext_bitcall(int, ec_bit_sig);
+static void smp_ext_bitcall(int, int);
 
-static int cpu_stopped(int cpu)
+static int raw_cpu_stopped(int cpu)
 {
-        __u32 status;
+        u32 status;
 
-        switch (signal_processor_ps(&status, 0, cpu, sigp_sense)) {
+        switch (raw_sigp_ps(&status, 0, cpu, sigp_sense)) {
         case sigp_status_stored:
                 /* Check for stopped and check stop state */
                 if (status & 0x50)
@@ -87,6 +92,44 @@ static int cpu_stopped(int cpu)
         return 0;
 }
 
+static inline int cpu_stopped(int cpu)
+{
+        return raw_cpu_stopped(cpu_logical_map(cpu));
+}
+
+void smp_switch_to_ipl_cpu(void (*func)(void *), void *data)
+{
+        struct _lowcore *lc, *current_lc;
+        struct stack_frame *sf;
+        struct pt_regs *regs;
+        unsigned long sp;
+
+        if (smp_processor_id() == 0)
+                func(data);
+        __load_psw_mask(PSW_BASE_BITS | PSW_DEFAULT_KEY);
+        /* Disable lowcore protection */
+        __ctl_clear_bit(0, 28);
+        current_lc = lowcore_ptr[smp_processor_id()];
+        lc = lowcore_ptr[0];
+        if (!lc)
+                lc = current_lc;
+        lc->restart_psw.mask = PSW_BASE_BITS | PSW_DEFAULT_KEY;
+        lc->restart_psw.addr = PSW_ADDR_AMODE | (unsigned long) smp_restart_cpu;
+        if (!cpu_online(0))
+                smp_switch_to_cpu(func, data, 0, stap(), __cpu_logical_map[0]);
+        while (sigp(0, sigp_stop_and_store_status) == sigp_busy)
+                cpu_relax();
+        sp = lc->panic_stack;
+        sp -= sizeof(struct pt_regs);
+        regs = (struct pt_regs *) sp;
+        memcpy(&regs->gprs, &current_lc->gpregs_save_area, sizeof(regs->gprs));
+        regs->psw = lc->psw_save_area;
+        sp -= STACK_FRAME_OVERHEAD;
+        sf = (struct stack_frame *) sp;
+        sf->back_chain = regs->gprs[15];
+        smp_switch_to_cpu(func, data, sp, stap(), __cpu_logical_map[0]);
+}
+
 void smp_send_stop(void)
 {
         int cpu, rc;
@@ -100,7 +143,7 @@ void smp_send_stop(void)
                 if (cpu == smp_processor_id())
                         continue;
                 do {
-                        rc = signal_processor(cpu, sigp_stop);
+                        rc = sigp(cpu, sigp_stop);
                 } while (rc == sigp_busy);
 
                 while (!cpu_stopped(cpu))
@@ -136,13 +179,13 @@ static void do_ext_call_interrupt(__u16 code)
  * Send an external call sigp to another cpu and return without waiting
  * for its completion.
  */
-static void smp_ext_bitcall(int cpu, ec_bit_sig sig)
+static void smp_ext_bitcall(int cpu, int sig)
 {
         /*
          * Set signaling bit in lowcore of target cpu and kick it
          */
         set_bit(sig, (unsigned long *) &lowcore_ptr[cpu]->ext_call_fast);
-        while (signal_processor(cpu, sigp_emergency_signal) == sigp_busy)
+        while (sigp(cpu, sigp_emergency_signal) == sigp_busy)
                 udelay(10);
 }
 
@@ -236,24 +279,8 @@ void smp_ctl_clear_bit(int cr, int bit)
 }
 EXPORT_SYMBOL(smp_ctl_clear_bit);
 
-/*
- * In early ipl state a temp. logically cpu number is needed, so the sigp
- * functions can be used to sense other cpus. Since NR_CPUS is >= 2 on
- * CONFIG_SMP and the ipl cpu is logical cpu 0, it must be 1.
- */
-#define CPU_INIT_NO     1
-
 #ifdef CONFIG_ZFCPDUMP
 
-/*
- * zfcpdump_prefix_array holds prefix registers for the following scenario:
- * 64 bit zfcpdump kernel and 31 bit kernel which is to be dumped. We have to
- * save its prefix registers, since they get lost, when switching from 31 bit
- * to 64 bit.
- */
-unsigned int zfcpdump_prefix_array[NR_CPUS + 1] \
-        __attribute__((__section__(".data")));
-
 static void __init smp_get_save_area(unsigned int cpu, unsigned int phy_cpu)
 {
         if (ipl_info.type != IPL_TYPE_FCP_DUMP)
@@ -263,21 +290,15 @@ static void __init smp_get_save_area(unsigned int cpu, unsigned int phy_cpu)
                            "the dump\n", cpu, NR_CPUS - 1);
                 return;
         }
-        zfcpdump_save_areas[cpu] = kmalloc(sizeof(union save_area), GFP_KERNEL);
-        __cpu_logical_map[CPU_INIT_NO] = (__u16) phy_cpu;
-        while (signal_processor(CPU_INIT_NO, sigp_stop_and_store_status) ==
-               sigp_busy)
+        zfcpdump_save_areas[cpu] = kmalloc(sizeof(struct save_area), GFP_KERNEL);
+        while (raw_sigp(phy_cpu, sigp_stop_and_store_status) == sigp_busy)
                 cpu_relax();
-        memcpy(zfcpdump_save_areas[cpu],
-               (void *)(unsigned long) store_prefix() + SAVE_AREA_BASE,
-               SAVE_AREA_SIZE);
-#ifdef CONFIG_64BIT
-        /* copy original prefix register */
-        zfcpdump_save_areas[cpu]->s390x.pref_reg = zfcpdump_prefix_array[cpu];
-#endif
+        memcpy_real(zfcpdump_save_areas[cpu],
+                    (void *)(unsigned long) store_prefix() + SAVE_AREA_BASE,
+                    sizeof(struct save_area));
 }
 
-union save_area *zfcpdump_save_areas[NR_CPUS + 1];
+struct save_area *zfcpdump_save_areas[NR_CPUS + 1];
 EXPORT_SYMBOL_GPL(zfcpdump_save_areas);
 
 #else
@@ -386,8 +407,7 @@ static void __init smp_detect_cpus(void)
                 for (cpu = 0; cpu <= MAX_CPU_ADDRESS; cpu++) {
                         if (cpu == boot_cpu_addr)
                                 continue;
-                        __cpu_logical_map[CPU_INIT_NO] = cpu;
-                        if (!cpu_stopped(CPU_INIT_NO))
+                        if (!raw_cpu_stopped(cpu))
                                 continue;
                         smp_get_save_area(c_cpus, cpu);
                         c_cpus++;
@@ -410,8 +430,7 @@ static void __init smp_detect_cpus(void)
                 cpu_addr = info->cpu[cpu].address;
                 if (cpu_addr == boot_cpu_addr)
                         continue;
-                __cpu_logical_map[CPU_INIT_NO] = cpu_addr;
-                if (!cpu_stopped(CPU_INIT_NO)) {
+                if (!raw_cpu_stopped(cpu_addr)) {
                         s_cpus++;
                         continue;
                 }
@@ -530,18 +549,18 @@ static void smp_free_lowcore(int cpu)
 /* Upping and downing of CPUs */
 int __cpuinit __cpu_up(unsigned int cpu)
 {
-        struct task_struct *idle;
         struct _lowcore *cpu_lowcore;
+        struct task_struct *idle;
         struct stack_frame *sf;
-        sigp_ccode ccode;
         u32 lowcore;
+        int ccode;
 
         if (smp_cpu_state[cpu] != CPU_STATE_CONFIGURED)
                 return -EIO;
         if (smp_alloc_lowcore(cpu))
                 return -ENOMEM;
         do {
-                ccode = signal_processor(cpu, sigp_initial_cpu_reset);
+                ccode = sigp(cpu, sigp_initial_cpu_reset);
                 if (ccode == sigp_busy)
                         udelay(10);
                 if (ccode == sigp_not_operational)
@@ -549,7 +568,7 @@ int __cpuinit __cpu_up(unsigned int cpu)
         } while (ccode == sigp_busy);
 
         lowcore = (u32)(unsigned long)lowcore_ptr[cpu];
-        while (signal_processor_p(lowcore, cpu, sigp_set_prefix) == sigp_busy)
+        while (sigp_p(lowcore, cpu, sigp_set_prefix) == sigp_busy)
                 udelay(10);
 
         idle = current_set[cpu];
@@ -575,7 +594,7 @@ int __cpuinit __cpu_up(unsigned int cpu)
         cpu_lowcore->ftrace_func = S390_lowcore.ftrace_func;
         eieio();
 
-        while (signal_processor(cpu, sigp_restart) == sigp_busy)
+        while (sigp(cpu, sigp_restart) == sigp_busy)
                 udelay(10);
 
         while (!cpu_online(cpu))
@@ -637,7 +656,7 @@ void __cpu_die(unsigned int cpu)
         /* Wait until target cpu is down */
         while (!cpu_stopped(cpu))
                 cpu_relax();
-        while (signal_processor_p(0, cpu, sigp_set_prefix) == sigp_busy)
+        while (sigp_p(0, cpu, sigp_set_prefix) == sigp_busy)
                 udelay(10);
         smp_free_lowcore(cpu);
         pr_info("Processor %d stopped\n", cpu);
@@ -646,7 +665,7 @@ void __cpu_die(unsigned int cpu)
 void cpu_die(void)
 {
         idle_task_exit();
-        while (signal_processor(smp_processor_id(), sigp_stop) == sigp_busy)
+        while (sigp(smp_processor_id(), sigp_stop) == sigp_busy)
                 cpu_relax();
         for (;;);
 }
@@ -717,6 +736,12 @@ void __init smp_cpus_done(unsigned int max_cpus)
 {
 }
 
+void __init smp_setup_processor_id(void)
+{
+        S390_lowcore.cpu_nr = 0;
+        __cpu_logical_map[0] = stap();
+}
+
 /*
  * the frequency of the profiling timer can be changed
  * by writing a multiplier value into /proc/profile.
@@ -756,7 +781,8 @@ static ssize_t cpu_configure_store(struct sys_device *dev,
         get_online_cpus();
         mutex_lock(&smp_cpu_state_mutex);
         rc = -EBUSY;
-        if (cpu_online(cpu))
+        /* disallow configuration changes of online cpus and cpu 0 */
+        if (cpu_online(cpu) || cpu == 0)
                 goto out;
         rc = 0;
         switch (val) {
@@ -995,7 +1021,9 @@ out:
         return rc;
 }
 
-static ssize_t __ref rescan_store(struct sysdev_class *class, const char *buf,
+static ssize_t __ref rescan_store(struct sysdev_class *class,
+                                  struct sysdev_class_attribute *attr,
+                                  const char *buf,
                                   size_t count)
 {
         int rc;
@@ -1006,7 +1034,9 @@ static ssize_t __ref rescan_store(struct sysdev_class *class, const char *buf,
 static SYSDEV_CLASS_ATTR(rescan, 0200, NULL, rescan_store);
 #endif /* CONFIG_HOTPLUG_CPU */
 
-static ssize_t dispatching_show(struct sysdev_class *class, char *buf)
+static ssize_t dispatching_show(struct sysdev_class *class,
+                                struct sysdev_class_attribute *attr,
+                                char *buf)
 {
         ssize_t count;
 
@@ -1016,7 +1046,9 @@ static ssize_t dispatching_show(struct sysdev_class *class, char *buf)
         return count;
 }
 
-static ssize_t dispatching_store(struct sysdev_class *dev, const char *buf,
+static ssize_t dispatching_store(struct sysdev_class *dev,
+                                 struct sysdev_class_attribute *attr,
+                                 const char *buf,
                                  size_t count)
 {
         int val, rc;