OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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: Suraj Jitindar Singh <sjitindarsingh@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Suraj Jitindar Singh 2016-06-29 13:38:38 +10:00 committed by Michael Ellerman
parent 1ae88fd54c
commit d0226d315d
7 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/powerpc/include/asm/opal.h
View File

@ -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 */

2
arch/powerpc/platforms/powernv/opal-sensor.c
View File

@ -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;

4
arch/powerpc/platforms/powernv/opal-sysparam.c
View File

@ -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);

2
drivers/i2c/busses/i2c-opal.c
View File

@ -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;

2
drivers/leds/leds-powernv.c
View File

@ -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);

2
drivers/mtd/devices/powernv_flash.c
View File

@ -95,7 +95,7 @@ static int powernv_flash_async_op(struct mtd_info *mtd, enum flash_op op,
return -EIO;
}
rc = be64_to_cpu(msg.params[1]);
rc = opal_get_async_rc(msg);
if (rc == OPAL_SUCCESS) {
rc = 0;
if (retlen)

4
drivers/rtc/rtc-opal.c
View File

@ -134,7 +134,7 @@ static int opal_get_tpo_time(struct device *dev, struct rtc_wkalrm *alarm)
goto exit;
}
rc = be64_to_cpu(msg.params[1]);
rc = opal_get_async_rc(msg);
if (rc != OPAL_SUCCESS) {
rc = -EIO;
goto exit;
@ -181,7 +181,7 @@ static int opal_set_tpo_time(struct device *dev, struct rtc_wkalrm *alarm)
goto exit;
}
rc = be64_to_cpu(msg.params[1]);
rc = opal_get_async_rc(msg);
if (rc != OPAL_SUCCESS)
rc = -EIO;