platform/chrome: use macros for passthru indexes

Move passthru indexes for EC and PD devices to common header.  Also use
them instead of literal constants.

Reviewed-by: Guenter Roeck <groeck@chromium.org>
Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org>
Link: https://lore.kernel.org/r/20220609084957.3684698-4-tzungbi@kernel.org

diff --git a/drivers/platform/chrome/cros_ec.c b/drivers/platform/chrome/cros_ec.c
index b3e94cdf7d1af56d13d8e81e0f12f7c5bb3b862e..e51a3f2176c7343df3426cd23bac7f8a655b82cb 100644 (file)
--- a/drivers/platform/chrome/cros_ec.c
+++ b/drivers/platform/chrome/cros_ec.c
@@ -19,9 +19,6 @@
 
 #include "cros_ec.h"
 
-#define CROS_EC_DEV_EC_INDEX 0
-#define CROS_EC_DEV_PD_INDEX 1
-
 static struct cros_ec_platform ec_p = {
        .ec_name = CROS_EC_DEV_NAME,
        .cmd_offset = EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_EC_INDEX),

diff --git a/drivers/platform/chrome/cros_ec_proto.c b/drivers/platform/chrome/cros_ec_proto.c
index cefabfe45551927ef3c8c9d9088de924ca7a9352..cfa3dacce4e568eced1bb9c2ebff220de5caedd8 100644 (file)
--- a/drivers/platform/chrome/cros_ec_proto.c
+++ b/drivers/platform/chrome/cros_ec_proto.c
@@ -433,7 +433,7 @@ int cros_ec_query_all(struct cros_ec_device *ec_dev)
 
        /* First try sending with proto v3. */
        ec_dev->proto_version = 3;
-       ret = cros_ec_host_command_proto_query(ec_dev, 0, proto_msg);
+       ret = cros_ec_host_command_proto_query(ec_dev, CROS_EC_DEV_EC_INDEX, proto_msg);
 
        if (ret == 0) {
                proto_info = (struct ec_response_get_protocol_info *)
@@ -459,7 +459,7 @@ int cros_ec_query_all(struct cros_ec_device *ec_dev)
                /*
                 * Check for PD
                 */
-               ret = cros_ec_host_command_proto_query(ec_dev, 1, proto_msg);
+               ret = cros_ec_host_command_proto_query(ec_dev, CROS_EC_DEV_PD_INDEX, proto_msg);
 
                if (ret) {
                        dev_dbg(ec_dev->dev, "no PD chip found: %d\n", ret);
@@ -609,7 +609,7 @@ int cros_ec_cmd_xfer(struct cros_ec_device *ec_dev, struct cros_ec_command *msg)
                msg->insize = ec_dev->max_response;
        }
 
-       if (msg->command < EC_CMD_PASSTHRU_OFFSET(1)) {
+       if (msg->command < EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX)) {
                if (msg->outsize > ec_dev->max_request) {
                        dev_err(ec_dev->dev,
                                "request of size %u is too big (max: %u)\n",

diff --git a/drivers/platform/chrome/cros_ec_proto_test.c b/drivers/platform/chrome/cros_ec_proto_test.c
index 675306c16d47227c6f2cf70262ed948d54b5c54f..f8dbfb0d8dc8f31b624fe367cc09d373680ab16c 100644 (file)
--- a/drivers/platform/chrome/cros_ec_proto_test.c
+++ b/drivers/platform/chrome/cros_ec_proto_test.c
@@ -281,7 +281,8 @@ static void cros_ec_proto_test_query_all_normal(struct kunit *test)
 
                KUNIT_EXPECT_EQ(test, mock->msg.version, 0);
                KUNIT_EXPECT_EQ(test, mock->msg.command,
-                               EC_CMD_PASSTHRU_OFFSET(1) | EC_CMD_GET_PROTOCOL_INFO);
+                               EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX) |
+                               EC_CMD_GET_PROTOCOL_INFO);
                KUNIT_EXPECT_EQ(test, mock->msg.insize,
                                sizeof(struct ec_response_get_protocol_info));
                KUNIT_EXPECT_EQ(test, mock->msg.outsize, 0);
@@ -396,7 +397,8 @@ static void cros_ec_proto_test_query_all_no_pd_return_error(struct kunit *test)
 
                KUNIT_EXPECT_EQ(test, mock->msg.version, 0);
                KUNIT_EXPECT_EQ(test, mock->msg.command,
-                               EC_CMD_PASSTHRU_OFFSET(1) | EC_CMD_GET_PROTOCOL_INFO);
+                               EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX) |
+                               EC_CMD_GET_PROTOCOL_INFO);
                KUNIT_EXPECT_EQ(test, mock->msg.insize,
                                sizeof(struct ec_response_get_protocol_info));
                KUNIT_EXPECT_EQ(test, mock->msg.outsize, 0);
@@ -685,7 +687,8 @@ static void cros_ec_proto_test_query_all_no_mkbp(struct kunit *test)
 
                KUNIT_EXPECT_EQ(test, mock->msg.version, 0);
                KUNIT_EXPECT_EQ(test, mock->msg.command,
-                               EC_CMD_PASSTHRU_OFFSET(1) | EC_CMD_GET_PROTOCOL_INFO);
+                               EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX) |
+                               EC_CMD_GET_PROTOCOL_INFO);
                KUNIT_EXPECT_EQ(test, mock->msg.insize,
                                sizeof(struct ec_response_get_protocol_info));
                KUNIT_EXPECT_EQ(test, mock->msg.outsize, 0);
@@ -783,7 +786,8 @@ static void cros_ec_proto_test_query_all_no_host_sleep(struct kunit *test)
 
                KUNIT_EXPECT_EQ(test, mock->msg.version, 0);
                KUNIT_EXPECT_EQ(test, mock->msg.command,
-                               EC_CMD_PASSTHRU_OFFSET(1) | EC_CMD_GET_PROTOCOL_INFO);
+                               EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX) |
+                               EC_CMD_GET_PROTOCOL_INFO);
                KUNIT_EXPECT_EQ(test, mock->msg.insize,
                                sizeof(struct ec_response_get_protocol_info));
                KUNIT_EXPECT_EQ(test, mock->msg.outsize, 0);
@@ -889,7 +893,8 @@ static void cros_ec_proto_test_query_all_default_wake_mask_return_error(struct k
 
                KUNIT_EXPECT_EQ(test, mock->msg.version, 0);
                KUNIT_EXPECT_EQ(test, mock->msg.command,
-                               EC_CMD_PASSTHRU_OFFSET(1) | EC_CMD_GET_PROTOCOL_INFO);
+                               EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX) |
+                               EC_CMD_GET_PROTOCOL_INFO);
                KUNIT_EXPECT_EQ(test, mock->msg.insize,
                                sizeof(struct ec_response_get_protocol_info));
                KUNIT_EXPECT_EQ(test, mock->msg.outsize, 0);

diff --git a/drivers/platform/chrome/cros_ec_trace.h b/drivers/platform/chrome/cros_ec_trace.h
index 9bb5cd2c98b8b4690f4633883103c21a801ba04d..d7e407de88df0b44d54e445d42ed72d52bbb47b2 100644 (file)
--- a/drivers/platform/chrome/cros_ec_trace.h
+++ b/drivers/platform/chrome/cros_ec_trace.h
@@ -30,8 +30,8 @@ TRACE_EVENT(cros_ec_request_start,
        ),
        TP_fast_assign(
                __entry->version = cmd->version;
-               __entry->offset = cmd->command / EC_CMD_PASSTHRU_OFFSET(1);
-               __entry->command = cmd->command % EC_CMD_PASSTHRU_OFFSET(1);
+               __entry->offset = cmd->command / EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX);
+               __entry->command = cmd->command % EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX);
                __entry->outsize = cmd->outsize;
                __entry->insize = cmd->insize;
        ),
@@ -55,8 +55,8 @@ TRACE_EVENT(cros_ec_request_done,
        ),
        TP_fast_assign(
                __entry->version = cmd->version;
-               __entry->offset = cmd->command / EC_CMD_PASSTHRU_OFFSET(1);
-               __entry->command = cmd->command % EC_CMD_PASSTHRU_OFFSET(1);
+               __entry->offset = cmd->command / EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX);
+               __entry->command = cmd->command % EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX);
                __entry->outsize = cmd->outsize;
                __entry->insize = cmd->insize;
                __entry->result = cmd->result;

diff --git a/include/linux/platform_data/cros_ec_proto.h b/include/linux/platform_data/cros_ec_proto.h
index 85e29300f63d99ae4e0ecad5bba7a3ef0fd08f62..c82a8285d936fa9b567bd115b944b1a2f3c212a6 100644 (file)
--- a/include/linux/platform_data/cros_ec_proto.h
+++ b/include/linux/platform_data/cros_ec_proto.h
@@ -21,6 +21,9 @@
 #define CROS_EC_DEV_SCP_NAME   "cros_scp"
 #define CROS_EC_DEV_TP_NAME    "cros_tp"
 
+#define CROS_EC_DEV_EC_INDEX 0
+#define CROS_EC_DEV_PD_INDEX 1
+
 /*
  * The EC is unresponsive for a time after a reboot command.  Add a
  * simple delay to make sure that the bus stays locked.