[POWERPC] Fix corruption in hcall9

[safe/jmp/linux-2.6] / arch / powerpc / platforms / pseries / hotplug-cpu.c

diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index 12864d7..f460b9c 100644 (file)
--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -53,7 +53,7 @@ static void rtas_stop_self(void)
        panic("Alas, I survived.\n");
 }
 
-static void pSeries_mach_cpu_die(void)
+static void pseries_mach_cpu_die(void)
 {
        local_irq_disable();
        idle_task_exit();
@@ -64,6 +64,8 @@ static void pSeries_mach_cpu_die(void)
        for(;;);
 }
 
+static int qcss_tok;   /* query-cpu-stopped-state token */
+
 /* Get state of physical CPU.
  * Return codes:
  *     0       - The processor is in the RTAS stopped state
@@ -74,12 +76,8 @@ static void pSeries_mach_cpu_die(void)
  */
 static int query_cpu_stopped(unsigned int pcpu)
 {
-       int cpu_status;
-       int status, qcss_tok;
+       int cpu_status, status;
 
-       qcss_tok = rtas_token("query-cpu-stopped-state");
-       if (qcss_tok == RTAS_UNKNOWN_SERVICE)
-               return -1;
        status = rtas_call(qcss_tok, 1, 2, &cpu_status, pcpu);
        if (status != 0) {
                printk(KERN_ERR
@@ -90,7 +88,7 @@ static int query_cpu_stopped(unsigned int pcpu)
        return cpu_status;
 }
 
-static int pSeries_cpu_disable(void)
+static int pseries_cpu_disable(void)
 {
        int cpu = smp_processor_id();
 
@@ -106,7 +104,7 @@ static int pSeries_cpu_disable(void)
        return 0;
 }
 
-static void pSeries_cpu_die(unsigned int cpu)
+static void pseries_cpu_die(unsigned int cpu)
 {
        int tries;
        int cpu_status;
@@ -138,7 +136,7 @@ static void pSeries_cpu_die(unsigned int cpu)
  * the logical ids for sibling SMT threads x and y are adjacent, such
  * that x^1 == y and y^1 == x.
  */
-static int pSeries_add_processor(struct device_node *np)
+static int pseries_add_processor(struct device_node *np)
 {
        unsigned int cpu;
        cpumask_t candidate_map, tmp = CPU_MASK_NONE;
@@ -199,7 +197,7 @@ out_unlock:
  * the hard id in the paca(s) to -1 to be consistent with boot time
  * convention for non-present cpus.
  */
-static void pSeries_remove_processor(struct device_node *np)
+static void pseries_remove_processor(struct device_node *np)
 {
        unsigned int cpu;
        int len, nthreads, i;
@@ -228,17 +226,18 @@ static void pSeries_remove_processor(struct device_node *np)
        unlock_cpu_hotplug();
 }
 
-static int pSeries_smp_notifier(struct notifier_block *nb, unsigned long action, void *node)
+static int pseries_smp_notifier(struct notifier_block *nb,
+                               unsigned long action, void *node)
 {
        int err = NOTIFY_OK;
 
        switch (action) {
        case PSERIES_RECONFIG_ADD:
-               if (pSeries_add_processor(node))
+               if (pseries_add_processor(node))
                        err = NOTIFY_BAD;
                break;
        case PSERIES_RECONFIG_REMOVE:
-               pSeries_remove_processor(node);
+               pseries_remove_processor(node);
                break;
        default:
                err = NOTIFY_DONE;
@@ -247,22 +246,29 @@ static int pSeries_smp_notifier(struct notifier_block *nb, unsigned long action,
        return err;
 }
 
-static struct notifier_block pSeries_smp_nb = {
-       .notifier_call = pSeries_smp_notifier,
+static struct notifier_block pseries_smp_nb = {
+       .notifier_call = pseries_smp_notifier,
 };
 
 static int __init pseries_cpu_hotplug_init(void)
 {
        rtas_stop_self_args.token = rtas_token("stop-self");
+       qcss_tok = rtas_token("query-cpu-stopped-state");
 
-       ppc_md.cpu_die = pSeries_mach_cpu_die;
+       if (rtas_stop_self_args.token == RTAS_UNKNOWN_SERVICE ||
+                       qcss_tok == RTAS_UNKNOWN_SERVICE) {
+               printk(KERN_INFO "CPU Hotplug not supported by firmware "
+                               "- disabling.\n");
+               return 0;
+       }
 
-       smp_ops->cpu_disable = pSeries_cpu_disable;
-       smp_ops->cpu_die = pSeries_cpu_die;
+       ppc_md.cpu_die = pseries_mach_cpu_die;
+       smp_ops->cpu_disable = pseries_cpu_disable;
+       smp_ops->cpu_die = pseries_cpu_die;
 
        /* Processors can be added/removed only on LPAR */
        if (firmware_has_feature(FW_FEATURE_LPAR))
-               pSeries_reconfig_notifier_register(&pSeries_smp_nb);
+               pSeries_reconfig_notifier_register(&pseries_smp_nb);
 
        return 0;
 }