Merge tag 'mac80211-for-john-2014-11-18' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / arch / powerpc / platforms / pseries / dlpar.c

diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
index a2450b8..fdf01b6 100644 (file)
--- a/arch/powerpc/platforms/pseries/dlpar.c
+++ b/arch/powerpc/platforms/pseries/dlpar.c
@@ -17,6 +17,7 @@
 #include <linux/slab.h>
 #include <linux/of.h>
 #include "offline_states.h"
+#include "pseries.h"
 
 #include <asm/prom.h>
 #include <asm/machdep.h>
@@ -363,7 +364,8 @@ static int dlpar_online_cpu(struct device_node *dn)
        int rc = 0;
        unsigned int cpu;
        int len, nthreads, i;
-       const u32 *intserv;
+       const __be32 *intserv;
+       u32 thread;
 
        intserv = of_get_property(dn, "ibm,ppc-interrupt-server#s", &len);
        if (!intserv)
@@ -373,8 +375,9 @@ static int dlpar_online_cpu(struct device_node *dn)
 
        cpu_maps_update_begin();
        for (i = 0; i < nthreads; i++) {
+               thread = be32_to_cpu(intserv[i]);
                for_each_present_cpu(cpu) {
-                       if (get_hard_smp_processor_id(cpu) != intserv[i])
+                       if (get_hard_smp_processor_id(cpu) != thread)
                                continue;
                        BUG_ON(get_cpu_current_state(cpu)
                                        != CPU_STATE_OFFLINE);
@@ -388,7 +391,7 @@ static int dlpar_online_cpu(struct device_node *dn)
                }
                if (cpu == num_possible_cpus())
                        printk(KERN_WARNING "Could not find cpu to online "
-                              "with physical id 0x%x\n", intserv[i]);
+                              "with physical id 0x%x\n", thread);
        }
        cpu_maps_update_done();
 
@@ -442,7 +445,8 @@ static int dlpar_offline_cpu(struct device_node *dn)
        int rc = 0;
        unsigned int cpu;
        int len, nthreads, i;
-       const u32 *intserv;
+       const __be32 *intserv;
+       u32 thread;
 
        intserv = of_get_property(dn, "ibm,ppc-interrupt-server#s", &len);
        if (!intserv)
@@ -452,8 +456,9 @@ static int dlpar_offline_cpu(struct device_node *dn)
 
        cpu_maps_update_begin();
        for (i = 0; i < nthreads; i++) {
+               thread = be32_to_cpu(intserv[i]);
                for_each_present_cpu(cpu) {
-                       if (get_hard_smp_processor_id(cpu) != intserv[i])
+                       if (get_hard_smp_processor_id(cpu) != thread)
                                continue;
 
                        if (get_cpu_current_state(cpu) == CPU_STATE_OFFLINE)
@@ -475,14 +480,14 @@ static int dlpar_offline_cpu(struct device_node *dn)
                         * Upgrade it's state to CPU_STATE_OFFLINE.
                         */
                        set_preferred_offline_state(cpu, CPU_STATE_OFFLINE);
-                       BUG_ON(plpar_hcall_norets(H_PROD, intserv[i])
+                       BUG_ON(plpar_hcall_norets(H_PROD, thread)
                                                                != H_SUCCESS);
                        __cpu_die(cpu);
                        break;
                }
                if (cpu == num_possible_cpus())
                        printk(KERN_WARNING "Could not find cpu to offline "
-                              "with physical id 0x%x\n", intserv[i]);
+                              "with physical id 0x%x\n", thread);
        }
        cpu_maps_update_done();
 
@@ -494,15 +499,15 @@ out:
 static ssize_t dlpar_cpu_release(const char *buf, size_t count)
 {
        struct device_node *dn;
-       const u32 *drc_index;
+       u32 drc_index;
        int rc;
 
        dn = of_find_node_by_path(buf);
        if (!dn)
                return -EINVAL;
 
-       drc_index = of_get_property(dn, "ibm,my-drc-index", NULL);
-       if (!drc_index) {
+       rc = of_property_read_u32(dn, "ibm,my-drc-index", &drc_index);
+       if (rc) {
                of_node_put(dn);
                return -EINVAL;
        }
@@ -513,7 +518,7 @@ static ssize_t dlpar_cpu_release(const char *buf, size_t count)
                return -EINVAL;
        }
 
-       rc = dlpar_release_drc(*drc_index);
+       rc = dlpar_release_drc(drc_index);
        if (rc) {
                of_node_put(dn);
                return rc;
@@ -521,7 +526,7 @@ static ssize_t dlpar_cpu_release(const char *buf, size_t count)
 
        rc = dlpar_detach_node(dn);
        if (rc) {
-               dlpar_acquire_drc(*drc_index);
+               dlpar_acquire_drc(drc_index);
                return rc;
        }