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

Commit d0226d31 authored by Suraj Jitindar Singh's avatar Suraj Jitindar Singh Committed by Michael Ellerman
Browse files

powerpc/opal: Add inline function to get rc from an ASYNC_COMP opal_msg 



An opal_msg of type OPAL_MSG_ASYNC_COMP contains the return code in the
params[1] struct member. However this isn't intuitive or obvious when
reading the code and requires that a user look at the skiboot
documentation or opal-api.h to verify this.

Add an inline function to get the return code from an opal_msg and update
call sites accordingly.

Signed-off-by: default avatarSuraj Jitindar Singh <sjitindarsingh@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 1ae88fd5

arch/powerpc/include/asm/opal.h

+8 −0
Original line number Diff line number Diff line
@@ -282,6 +282,14 @@ extern int opal_error_code(int rc); 


ssize_t opal_msglog_copy(char *to, loff_t pos, size_t count);



static inline int opal_get_async_rc(struct opal_msg msg)

{

	if (msg.msg_type != OPAL_MSG_ASYNC_COMP)

		return OPAL_PARAMETER;

	else

		return be64_to_cpu(msg.params[1]);

}



#endif /* __ASSEMBLY__ */



#endif /* _ASM_POWERPC_OPAL_H */

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

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ int opal_get_sensor_data(u32 sensor_hndl, u32 *sensor_data) 
			goto out_token;

		}



		ret = opal_error_code(be64_to_cpu(msg.params[1]));

		ret = opal_error_code(opal_get_async_rc(msg));

		*sensor_data = be32_to_cpu(data);

		break;

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

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static ssize_t opal_get_sys_param(u32 param_id, u32 length, void *buffer) 
		goto out_token;

	}



	ret = opal_error_code(be64_to_cpu(msg.params[1]));

	ret = opal_error_code(opal_get_async_rc(msg));



out_token:

	opal_async_release_token(token);
@@ -103,7 +103,7 @@ static int opal_set_sys_param(u32 param_id, u32 length, void *buffer) 
		goto out_token;

	}



	ret = opal_error_code(be64_to_cpu(msg.params[1]));

	ret = opal_error_code(opal_get_async_rc(msg));



out_token:

	opal_async_release_token(token);

drivers/i2c/busses/i2c-opal.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static int i2c_opal_send_request(u32 bus_id, struct opal_i2c_request *req) 
	if (rc)

		goto exit;



	rc = be64_to_cpu(msg.params[1]);

	rc = opal_get_async_rc(msg);

	if (rc != OPAL_SUCCESS) {

		rc = i2c_opal_translate_error(rc);

		goto exit;

drivers/leds/leds-powernv.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static int powernv_led_set(struct powernv_led_data *powernv_led, 
		goto out_token;

	}



	rc = be64_to_cpu(msg.params[1]);

	rc = opal_get_async_rc(msg);

	if (rc != OPAL_SUCCESS)

		dev_err(dev, "%s : OAPL async call returned failed [rc=%d]\n",

			__func__, rc);