Commit 6db07b63 authored by Bill Richardson's avatar Bill Richardson Committed by Lee Jones
Browse files

mfd: cros_ec: Check result code from EC messages 



Just because the host was able to talk to the EC doesn't mean that the EC
was happy with what it was told. Errors in communincation are not the same
as error messages from the EC itself.

This change lets the EC report its errors separately.

[dianders: Added common function to cros_ec.c]

Signed-off-by: default avatarBill Richardson <wfrichar@chromium.org>
Signed-off-by: default avatarDoug Anderson <dianders@chromium.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 5799f95a

drivers/mfd/cros_ec.c

+18 −0
Original line number Diff line number Diff line
@@ -44,6 +44,24 @@ int cros_ec_prepare_tx(struct cros_ec_device *ec_dev, 
}

EXPORT_SYMBOL(cros_ec_prepare_tx);



int cros_ec_check_result(struct cros_ec_device *ec_dev,

			 struct cros_ec_command *msg)

{

	switch (msg->result) {

	case EC_RES_SUCCESS:

		return 0;

	case EC_RES_IN_PROGRESS:

		dev_dbg(ec_dev->dev, "command 0x%02x in progress\n",

			msg->command);

		return -EAGAIN;

	default:

		dev_dbg(ec_dev->dev, "command 0x%02x returned %d\n",

			msg->command, msg->result);

		return 0;

	}

}

EXPORT_SYMBOL(cros_ec_check_result);



static irqreturn_t ec_irq_thread(int irq, void *data)

{

	struct cros_ec_device *ec_dev = data;

drivers/mfd/cros_ec_i2c.c

+3 −5
Original line number Diff line number Diff line
@@ -92,12 +92,10 @@ static int cros_ec_cmd_xfer_i2c(struct cros_ec_device *ec_dev, 
	}



	/* check response error code */

	if (i2c_msg[1].buf[0]) {

		dev_warn(ec_dev->dev, "command 0x%02x returned an error %d\n",

			 msg->command, i2c_msg[1].buf[0]);

		ret = -EINVAL;

	msg->result = i2c_msg[1].buf[0];

	ret = cros_ec_check_result(ec_dev, msg);

	if (ret)

		goto done;

	}



	/* copy response packet payload and compute checksum */

	sum = in_buf[0] + in_buf[1];

drivers/mfd/cros_ec_spi.c

+6 −13
Original line number Diff line number Diff line
@@ -285,21 +285,14 @@ static int cros_ec_cmd_xfer_spi(struct cros_ec_device *ec_dev, 
		goto exit;

	}



	/* check response error code */

	ptr = ec_dev->din;

	if (ptr[0]) {

		if (ptr[0] == EC_RES_IN_PROGRESS) {

			dev_dbg(ec_dev->dev, "command 0x%02x in progress\n",

				ec_msg->command);

			ret = -EAGAIN;

			goto exit;

		}

		dev_warn(ec_dev->dev, "command 0x%02x returned an error %d\n",

			 ec_msg->command, ptr[0]);

		debug_packet(ec_dev->dev, "in_err", ptr, len);

		ret = -EINVAL;



	/* check response error code */

	ec_msg->result = ptr[0];

	ret = cros_ec_check_result(ec_dev, ec_msg);

	if (ret)

		goto exit;

	}



	len = ptr[1];

	sum = ptr[0] + ptr[1];

	if (len > ec_msg->insize) {

include/linux/mfd/cros_ec.h

+12 −0
Original line number Diff line number Diff line
@@ -142,6 +142,18 @@ int cros_ec_resume(struct cros_ec_device *ec_dev); 
int cros_ec_prepare_tx(struct cros_ec_device *ec_dev,

		       struct cros_ec_command *msg);



/**

 * cros_ec_check_result - Check ec_msg->result

 *

 * This is used by ChromeOS EC drivers to check the ec_msg->result for

 * errors and to warn about them.

 *

 * @ec_dev: EC device

 * @msg: Message to check

 */

int cros_ec_check_result(struct cros_ec_device *ec_dev,

			 struct cros_ec_command *msg);



/**

 * cros_ec_remove - Remove a ChromeOS EC

 *

CRA Git | Maintained and supported by SUSTech CRA and CCSE