tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Tzung-Bi Shih 3db0c9e5 b99eb596

+20 -15
-3
drivers/platform/chrome/cros_ec.c
··· 19 19 20 20 #include "cros_ec.h" 21 21 22 - #define CROS_EC_DEV_EC_INDEX 0 23 - #define CROS_EC_DEV_PD_INDEX 1 24 - 25 22 static struct cros_ec_platform ec_p = { 26 23 .ec_name = CROS_EC_DEV_NAME, 27 24 .cmd_offset = EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_EC_INDEX),
+3 -3
drivers/platform/chrome/cros_ec_proto.c
··· 433 433 434 434 /* First try sending with proto v3. */ 435 435 ec_dev->proto_version = 3; 436 - ret = cros_ec_host_command_proto_query(ec_dev, 0, proto_msg); 436 + ret = cros_ec_host_command_proto_query(ec_dev, CROS_EC_DEV_EC_INDEX, proto_msg); 437 437 438 438 if (ret == 0) { 439 439 proto_info = (struct ec_response_get_protocol_info *) ··· 459 459 /* 460 460 * Check for PD 461 461 */ 462 - ret = cros_ec_host_command_proto_query(ec_dev, 1, proto_msg); 462 + ret = cros_ec_host_command_proto_query(ec_dev, CROS_EC_DEV_PD_INDEX, proto_msg); 463 463 464 464 if (ret) { 465 465 dev_dbg(ec_dev->dev, "no PD chip found: %d\n", ret); ··· 609 609 msg->insize = ec_dev->max_response; 610 610 } 611 611 612 - if (msg->command < EC_CMD_PASSTHRU_OFFSET(1)) { 612 + if (msg->command < EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX)) { 613 613 if (msg->outsize > ec_dev->max_request) { 614 614 dev_err(ec_dev->dev, 615 615 "request of size %u is too big (max: %u)\n",
+10 -5
drivers/platform/chrome/cros_ec_proto_test.c
··· 281 281 282 282 KUNIT_EXPECT_EQ(test, mock->msg.version, 0); 283 283 KUNIT_EXPECT_EQ(test, mock->msg.command, 284 - EC_CMD_PASSTHRU_OFFSET(1) | EC_CMD_GET_PROTOCOL_INFO); 284 + EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX) | 285 + EC_CMD_GET_PROTOCOL_INFO); 285 286 KUNIT_EXPECT_EQ(test, mock->msg.insize, 286 287 sizeof(struct ec_response_get_protocol_info)); 287 288 KUNIT_EXPECT_EQ(test, mock->msg.outsize, 0); ··· 397 396 398 397 KUNIT_EXPECT_EQ(test, mock->msg.version, 0); 399 398 KUNIT_EXPECT_EQ(test, mock->msg.command, 400 - EC_CMD_PASSTHRU_OFFSET(1) | EC_CMD_GET_PROTOCOL_INFO); 399 + EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX) | 400 + EC_CMD_GET_PROTOCOL_INFO); 401 401 KUNIT_EXPECT_EQ(test, mock->msg.insize, 402 402 sizeof(struct ec_response_get_protocol_info)); 403 403 KUNIT_EXPECT_EQ(test, mock->msg.outsize, 0); ··· 687 685 688 686 KUNIT_EXPECT_EQ(test, mock->msg.version, 0); 689 687 KUNIT_EXPECT_EQ(test, mock->msg.command, 690 - EC_CMD_PASSTHRU_OFFSET(1) | EC_CMD_GET_PROTOCOL_INFO); 688 + EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX) | 689 + EC_CMD_GET_PROTOCOL_INFO); 691 690 KUNIT_EXPECT_EQ(test, mock->msg.insize, 692 691 sizeof(struct ec_response_get_protocol_info)); 693 692 KUNIT_EXPECT_EQ(test, mock->msg.outsize, 0); ··· 786 783 787 784 KUNIT_EXPECT_EQ(test, mock->msg.version, 0); 788 785 KUNIT_EXPECT_EQ(test, mock->msg.command, 789 - EC_CMD_PASSTHRU_OFFSET(1) | EC_CMD_GET_PROTOCOL_INFO); 786 + EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX) | 787 + EC_CMD_GET_PROTOCOL_INFO); 790 788 KUNIT_EXPECT_EQ(test, mock->msg.insize, 791 789 sizeof(struct ec_response_get_protocol_info)); 792 790 KUNIT_EXPECT_EQ(test, mock->msg.outsize, 0); ··· 893 889 894 890 KUNIT_EXPECT_EQ(test, mock->msg.version, 0); 895 891 KUNIT_EXPECT_EQ(test, mock->msg.command, 896 - EC_CMD_PASSTHRU_OFFSET(1) | EC_CMD_GET_PROTOCOL_INFO); 892 + EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX) | 893 + EC_CMD_GET_PROTOCOL_INFO); 897 894 KUNIT_EXPECT_EQ(test, mock->msg.insize, 898 895 sizeof(struct ec_response_get_protocol_info)); 899 896 KUNIT_EXPECT_EQ(test, mock->msg.outsize, 0);
+4 -4
drivers/platform/chrome/cros_ec_trace.h
··· 30 30 ), 31 31 TP_fast_assign( 32 32 __entry->version = cmd->version; 33 - __entry->offset = cmd->command / EC_CMD_PASSTHRU_OFFSET(1); 34 - __entry->command = cmd->command % EC_CMD_PASSTHRU_OFFSET(1); 33 + __entry->offset = cmd->command / EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX); 34 + __entry->command = cmd->command % EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX); 35 35 __entry->outsize = cmd->outsize; 36 36 __entry->insize = cmd->insize; 37 37 ), ··· 55 55 ), 56 56 TP_fast_assign( 57 57 __entry->version = cmd->version; 58 - __entry->offset = cmd->command / EC_CMD_PASSTHRU_OFFSET(1); 59 - __entry->command = cmd->command % EC_CMD_PASSTHRU_OFFSET(1); 58 + __entry->offset = cmd->command / EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX); 59 + __entry->command = cmd->command % EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX); 60 60 __entry->outsize = cmd->outsize; 61 61 __entry->insize = cmd->insize; 62 62 __entry->result = cmd->result;
+3
include/linux/platform_data/cros_ec_proto.h
··· 21 21 #define CROS_EC_DEV_SCP_NAME "cros_scp" 22 22 #define CROS_EC_DEV_TP_NAME "cros_tp" 23 23 24 + #define CROS_EC_DEV_EC_INDEX 0 25 + #define CROS_EC_DEV_PD_INDEX 1 26 + 24 27 /* 25 28 * The EC is unresponsive for a time after a reboot command. Add a 26 29 * simple delay to make sure that the bus stays locked.