moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

firmware: turris-mox-rwtm: fix reply status decoding function

Browse Source 
[ Upstream commit e34e60253d ]

The status decoding function mox_get_status() currently contains an
incorrect check: if the error status is not MBOX_STS_SUCCESS, it always
returns -EIO, so the comparison to MBOX_STS_FAIL is never executed and
we don't get the actual error code sent by the firmware.

Fix this.

Signed-off-by: Marek Behún <kabel@kernel.org>
Reviewed-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Fixes: 389711b374 ("firmware: Add Turris Mox rWTM firmware driver")
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Marek Behún
2021-05-20 13:35:17 +02:00
committed by Greg Kroah-Hartman
parent 804aabb509
commit 271c12dbeb
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/firmware/turris-mox-rwtm.c
View File

@@ -147,11 +147,14 @@ MOX_ATTR_RO(pubkey, "%s\n", pubkey);
static int mox_get_status(enum mbox_cmd cmd, u32 retval) static int mox_get_status(enum mbox_cmd cmd, u32 retval)
{ {
if (MBOX_STS_CMD(retval) != cmd || if (MBOX_STS_CMD(retval) != cmd)
MBOX_STS_ERROR(retval) != MBOX_STS_SUCCESS)
return -EIO; return -EIO;
else if (MBOX_STS_ERROR(retval) == MBOX_STS_FAIL) else if (MBOX_STS_ERROR(retval) == MBOX_STS_FAIL)
return -(int)MBOX_STS_VALUE(retval); return -(int)MBOX_STS_VALUE(retval);
else if (MBOX_STS_ERROR(retval) == MBOX_STS_BADCMD)
return -ENOSYS;
else if (MBOX_STS_ERROR(retval) != MBOX_STS_SUCCESS)
return -EIO;
else else
return MBOX_STS_VALUE(retval); return MBOX_STS_VALUE(retval);
} }