platform/chrome: cros_ec_sysfs: Report range of error codes from EC

Since commit c5cd2b47b203 ("platform/chrome: cros_ec_proto: Report command
not supported") we can no longer assume that cros_ec_cmd_xfer_status()
reports -EPROTO for all errors returned by the EC itself. A follow-up
patch will change cros_ec_cmd_xfer_status() to report additional errors
reported by the EC as distinguished Linux error codes.

Prepare for this change by always reporting both the Linux error code
and the EC error code in sysfs attributes.

Cc: Gwendal Grignou <gwendal@chromium.org>
Cc: Yu-Hsuan Hsu <yuhsuan@chromium.org>
Cc: Prashant Malani <pmalani@chromium.org>
Cc: Brian Norris <briannorris@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>

diff --git a/drivers/platform/chrome/cros_ec_sysfs.c b/drivers/platform/chrome/cros_ec_sysfs.c
index d45ea5d5bfa49749e2089d53fb049b78e48099ca..9c1e0998a721d71ca42bb12124596979c7103621 100644 (file)
--- a/drivers/platform/chrome/cros_ec_sysfs.c
+++ b/drivers/platform/chrome/cros_ec_sysfs.c
@@ -150,12 +150,10 @@ static ssize_t version_show(struct device *dev,
        msg->command = EC_CMD_GET_BUILD_INFO + ec->cmd_offset;
        msg->insize = EC_HOST_PARAM_SIZE;
        ret = cros_ec_cmd_xfer_status(ec->ec_dev, msg);
-       if (ret == -EPROTO) {
-               count += scnprintf(buf + count, PAGE_SIZE - count,
-                                  "Build info:    EC error %d\n", msg->result);
-       } else if (ret < 0) {
+       if (ret < 0) {
                count += scnprintf(buf + count, PAGE_SIZE - count,
-                                  "Build info:    XFER ERROR %d\n", ret);
+                                  "Build info:    XFER / EC ERROR %d / %d\n",
+                                  ret, msg->result);
        } else {
                msg->data[EC_HOST_PARAM_SIZE - 1] = '\0';
                count += scnprintf(buf + count, PAGE_SIZE - count,
@@ -166,12 +164,10 @@ static ssize_t version_show(struct device *dev,
        msg->command = EC_CMD_GET_CHIP_INFO + ec->cmd_offset;
        msg->insize = sizeof(*r_chip);
        ret = cros_ec_cmd_xfer_status(ec->ec_dev, msg);
-       if (ret == -EPROTO) {
-               count += scnprintf(buf + count, PAGE_SIZE - count,
-                                  "Chip info:     EC error %d\n", msg->result);
-       } else if (ret < 0) {
+       if (ret < 0) {
                count += scnprintf(buf + count, PAGE_SIZE - count,
-                                  "Chip info:     XFER ERROR %d\n", ret);
+                                  "Chip info:     XFER / EC ERROR %d / %d\n",
+                                  ret, msg->result);
        } else {
                r_chip = (struct ec_response_get_chip_info *)msg->data;
 
@@ -190,12 +186,10 @@ static ssize_t version_show(struct device *dev,
        msg->command = EC_CMD_GET_BOARD_VERSION + ec->cmd_offset;
        msg->insize = sizeof(*r_board);
        ret = cros_ec_cmd_xfer_status(ec->ec_dev, msg);
-       if (ret == -EPROTO) {
-               count += scnprintf(buf + count, PAGE_SIZE - count,
-                                  "Board version: EC error %d\n", msg->result);
-       } else if (ret < 0) {
+       if (ret < 0) {
                count += scnprintf(buf + count, PAGE_SIZE - count,
-                                  "Board version: XFER ERROR %d\n", ret);
+                                  "Board version: XFER / EC ERROR %d / %d\n",
+                                  ret, msg->result);
        } else {
                r_board = (struct ec_response_board_version *)msg->data;