Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9000c17d authored by Anton Blanchard's avatar Anton Blanchard Committed by Benjamin Herrenschmidt
Browse files

powerpc/powernv: Fix endian issues with sensor code 



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

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent bb4398e1

arch/powerpc/include/asm/opal.h

+1 −2
Original line number Diff line number Diff line
@@ -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);

arch/powerpc/platforms/powernv/opal-sensor.c

+3 −1
Original line number Diff line number Diff line
@@ -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: