powerpc/powernv: Fix endian issues with sensor code

One OPAL call and one device tree property needed byte swapping.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --git a/arch/powerpc/include/asm/opal.h b/arch/powerpc/include/asm/opal.h
index fc73661c20fa384ab2966e824cd9dff81de5be5e..a13ab397eddac43faabcecde44e3f44e3029604b 100644 (file)
--- a/arch/powerpc/include/asm/opal.h
+++ b/arch/powerpc/include/asm/opal.h
@@ -874,8 +874,7 @@ int64_t opal_get_param(uint64_t token, uint32_t param_id, uint64_t buffer,
                size_t length);
 int64_t opal_set_param(uint64_t token, uint32_t param_id, uint64_t buffer,
                size_t length);
-int64_t opal_sensor_read(uint32_t sensor_hndl, int token,
-               uint32_t *sensor_data);
+int64_t opal_sensor_read(uint32_t sensor_hndl, int token, __be32 *sensor_data);
 
 /* Internal functions */
 extern int early_init_dt_scan_opal(unsigned long node, const char *uname, int depth, void *data);

diff --git a/arch/powerpc/platforms/powernv/opal-sensor.c b/arch/powerpc/platforms/powernv/opal-sensor.c
index 7503e298c4c3798229c5f589497b45c308114dbc..10271ad1fac45129599cb8ac20c5bf6c94c20462 100644 (file)
--- a/arch/powerpc/platforms/powernv/opal-sensor.c
+++ b/arch/powerpc/platforms/powernv/opal-sensor.c
@@ -33,6 +33,7 @@ int opal_get_sensor_data(u32 sensor_hndl, u32 *sensor_data)
 {
        int ret, token;
        struct opal_msg msg;
+       __be32 data;
 
        token = opal_async_get_token_interruptible();
        if (token < 0) {
@@ -42,7 +43,7 @@ int opal_get_sensor_data(u32 sensor_hndl, u32 *sensor_data)
        }
 
        mutex_lock(&opal_sensor_mutex);
-       ret = opal_sensor_read(sensor_hndl, token, sensor_data);
+       ret = opal_sensor_read(sensor_hndl, token, &data);
        if (ret != OPAL_ASYNC_COMPLETION)
                goto out_token;
 
@@ -53,6 +54,7 @@ int opal_get_sensor_data(u32 sensor_hndl, u32 *sensor_data)
                goto out_token;
        }
 
+       *sensor_data = be32_to_cpu(data);
        ret = be64_to_cpu(msg.params[1]);
 
 out_token: