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

Commit ea9b5878 authored by Alexander Usyskin's avatar Alexander Usyskin Committed by Greg Kroah-Hartman
Browse files

mei: bus-fixup:upon error print return values of send and receive 



[ Upstream commit 4b8659e2c258e4fdac9ccdf06cc20c0677894ef9 ]

For easier debugging, upon error, print also return values
from __mei_cl_recv() and __mei_cl_send() functions.

Signed-off-by: default avatarAlexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Link: https://lore.kernel.org/r/20221212214933.275434-1-tomas.winkler@intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c7ca2ca1

drivers/misc/mei/bus-fixup.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -178,7 +178,7 @@ static int mei_fwver(struct mei_cl_device *cldev) 
	ret = __mei_cl_send(cldev->cl, buf, sizeof(struct mkhi_msg_hdr),

	ret = __mei_cl_send(cldev->cl, buf, sizeof(struct mkhi_msg_hdr),

			    MEI_CL_IO_TX_BLOCKING);

			    MEI_CL_IO_TX_BLOCKING);

	if (ret < 0) {

	if (ret < 0) {

		dev_err(&cldev->dev, "Could not send ReqFWVersion cmd\n");

		dev_err(&cldev->dev, "Could not send ReqFWVersion cmd ret = %d\n", ret);

		return ret;

		return ret;

	}

	}
@@ -190,7 +190,7 @@ static int mei_fwver(struct mei_cl_device *cldev) 
		 * Should be at least one version block,

		 * Should be at least one version block,

		 * error out if nothing found

		 * error out if nothing found

		 */

		 */

		dev_err(&cldev->dev, "Could not read FW version\n");

		dev_err(&cldev->dev, "Could not read FW version ret = %d\n", bytes_recv);

		return -EIO;

		return -EIO;

	}

	}
@@ -339,7 +339,7 @@ static int mei_nfc_if_version(struct mei_cl *cl, 
	ret = __mei_cl_send(cl, (u8 *)&cmd, sizeof(struct mei_nfc_cmd),

	ret = __mei_cl_send(cl, (u8 *)&cmd, sizeof(struct mei_nfc_cmd),

			    MEI_CL_IO_TX_BLOCKING);

			    MEI_CL_IO_TX_BLOCKING);

	if (ret < 0) {

	if (ret < 0) {

		dev_err(bus->dev, "Could not send IF version cmd\n");

		dev_err(bus->dev, "Could not send IF version cmd ret = %d\n", ret);

		return ret;

		return ret;

	}

	}
@@ -354,7 +354,7 @@ static int mei_nfc_if_version(struct mei_cl *cl, 
	ret = 0;

	ret = 0;

	bytes_recv = __mei_cl_recv(cl, (u8 *)reply, if_version_length, 0, 0);

	bytes_recv = __mei_cl_recv(cl, (u8 *)reply, if_version_length, 0, 0);

	if (bytes_recv < 0 || (size_t)bytes_recv < if_version_length) {

	if (bytes_recv < 0 || (size_t)bytes_recv < if_version_length) {

		dev_err(bus->dev, "Could not read IF version\n");

		dev_err(bus->dev, "Could not read IF version ret = %d\n", bytes_recv);

		ret = -EIO;

		ret = -EIO;

		goto err;

		goto err;

	}

	}