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

Commit b7c1bafe authored by Marek Behún's avatar Marek Behún Committed by Greg Kroah-Hartman
Browse files

firmware: turris-mox-rwtm: report failures better 



[ Upstream commit 72f99888944c44de1c899bbe44db1e53bdc9d994 ]

Report a notice level message if a command is not supported by the rWTM
firmware.

This should not be an error, merely a notice, because the firmware can
be used on boards that do not have manufacturing information burned.

Fixes: 389711b3 ("firmware: Add Turris Mox rWTM firmware driver")
Signed-off-by: default avatarMarek Behún <kabel@kernel.org>
Reviewed-by: default avatarPali Rohár <pali@kernel.org>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@bootlin.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 7934e060

drivers/firmware/turris-mox-rwtm.c

+12 −6
Original line number Diff line number Diff line
@@ -191,11 +191,14 @@ static int mox_get_board_info(struct mox_rwtm *rwtm) 
		return ret;



	ret = mox_get_status(MBOX_CMD_BOARD_INFO, reply->retval);

	if (ret < 0 && ret != -ENODATA) {

		return ret;

	} else if (ret == -ENODATA) {

	if (ret == -ENODATA) {

		dev_warn(rwtm->dev,

			 "Board does not have manufacturing information burned!\n");

	} else if (ret == -ENOSYS) {

		dev_notice(rwtm->dev,

			   "Firmware does not support the BOARD_INFO command\n");

	} else if (ret < 0) {

		return ret;

	} else {

		rwtm->serial_number = reply->status[1];

		rwtm->serial_number <<= 32;
@@ -224,10 +227,13 @@ static int mox_get_board_info(struct mox_rwtm *rwtm) 
		return ret;



	ret = mox_get_status(MBOX_CMD_ECDSA_PUB_KEY, reply->retval);

	if (ret < 0 && ret != -ENODATA) {

		return ret;

	} else if (ret == -ENODATA) {

	if (ret == -ENODATA) {

		dev_warn(rwtm->dev, "Board has no public key burned!\n");

	} else if (ret == -ENOSYS) {

		dev_notice(rwtm->dev,

			   "Firmware does not support the ECDSA_PUB_KEY command\n");

	} else if (ret < 0) {

		return ret;

	} else {

		u32 *s = reply->status;