Consolidate struct ec_response_get_next_event_v*.
Let X->Y indicate kernel X sending EC_CMD_GET_NEXT_EVENT to FW Y.
Old->New:
Existing kernels send a smaller container (e.g.
ec_response_get_next_data) which may or may not fit the last few
bytes. The FW copies as many bytes as possible to the container. The
kernel processes as many leading bytes as it can understand.
New->Old:
New kernels send a bigger container. Existing FW copies as many bytes
as it wants, leaving the last few bytes empty. The kernel knows it
didn't receive full size data from the returned data length.
Signed-off-by: Daisuke Nojiri <dnojiri@xxxxxxxxxxxx>
---
drivers/platform/chrome/cros_ec_proto.c | 16 ++++-----
drivers/platform/chrome/cros_ec_proto_test.c | 28 +++++++--------
.../linux/platform_data/cros_ec_commands.h | 34 +------------------
include/linux/platform_data/cros_ec_proto.h | 2 +-
4 files changed, 24 insertions(+), 56 deletions(-)
diff --git a/drivers/platform/chrome/cros_ec_proto.c b/drivers/platform/chrome/cros_ec_proto.c
index 945b1b15a04c..a849c29f125b 100644
--- a/drivers/platform/chrome/cros_ec_proto.c
+++ b/drivers/platform/chrome/cros_ec_proto.c
@@ -686,7 +686,7 @@ EXPORT_SYMBOL(cros_ec_cmd_xfer_status);
static int get_next_event_xfer(struct cros_ec_device *ec_dev,
struct cros_ec_command *msg,
- struct ec_response_get_next_event_v1 *event,
+ struct ec_response_get_next_event *event,
int version, uint32_t size)
{
int ret;
@@ -709,11 +709,11 @@ static int get_next_event(struct cros_ec_device *ec_dev)
{
struct {
struct cros_ec_command msg;
- struct ec_response_get_next_event_v1 event;
+ struct ec_response_get_next_event event;
} __packed buf;
struct cros_ec_command *msg = &buf.msg;
- struct ec_response_get_next_event_v1 *event = &buf.event;
- const int cmd_version = ec_dev->mkbp_event_supported - 1;
+ struct ec_response_get_next_event *event = &buf.event;
+ int cmd_version = ec_dev->mkbp_event_supported - 1;
memset(msg, 0, sizeof(*msg));
if (ec_dev->suspended) {
@@ -721,12 +721,12 @@ static int get_next_event(struct cros_ec_device *ec_dev)
return -EHOSTDOWN;
}
- if (cmd_version == 0)
- return get_next_event_xfer(ec_dev, msg, event, 0,
- sizeof(struct ec_response_get_next_event));
+ /* The max version we support is v3 */
+ if (cmd_version > 3)
+ cmd_version = 3;
return get_next_event_xfer(ec_dev, msg, event, cmd_version,
- sizeof(struct ec_response_get_next_event_v1));
+ sizeof(*event));
}
static int get_keyboard_state_event(struct cros_ec_device *ec_dev)
diff --git a/drivers/platform/chrome/cros_ec_proto_test.c b/drivers/platform/chrome/cros_ec_proto_test.c
index b6169d6f2467..4d5306ea27e4 100644
--- a/drivers/platform/chrome/cros_ec_proto_test.c
+++ b/drivers/platform/chrome/cros_ec_proto_test.c
@@ -2072,17 +2072,17 @@ static void cros_ec_proto_test_get_next_event_no_mkbp_event(struct kunit *test)
/* For get_keyboard_state_event(). */
{
- union ec_response_get_next_data_v1 *data;
+ union ec_response_get_next_data *data;
mock = cros_kunit_ec_xfer_mock_add(test, sizeof(*data));
KUNIT_ASSERT_PTR_NE(test, mock, NULL);
- data = (union ec_response_get_next_data_v1 *)mock->o_data;
+ data = (union ec_response_get_next_data *)mock->o_data;
data->host_event = 0xbeef;
}
ret = cros_ec_get_next_event(ec_dev, &wake_event, &more_events);
- KUNIT_EXPECT_EQ(test, ret, sizeof(union ec_response_get_next_data_v1));
+ KUNIT_EXPECT_EQ(test, ret, sizeof(union ec_response_get_next_data));
KUNIT_EXPECT_EQ(test, ec_dev->event_data.event_type, EC_MKBP_EVENT_KEY_MATRIX);
KUNIT_EXPECT_EQ(test, ec_dev->event_data.data.host_event, 0xbeef);
@@ -2097,7 +2097,7 @@ static void cros_ec_proto_test_get_next_event_no_mkbp_event(struct kunit *test)
KUNIT_EXPECT_EQ(test, mock->msg.version, 0);
KUNIT_EXPECT_EQ(test, mock->msg.command, EC_CMD_MKBP_STATE);
- KUNIT_EXPECT_EQ(test, mock->msg.insize, sizeof(union ec_response_get_next_data_v1));
+ KUNIT_EXPECT_EQ(test, mock->msg.insize, sizeof(union ec_response_get_next_data));
KUNIT_EXPECT_EQ(test, mock->msg.outsize, 0);
}
}
@@ -2182,18 +2182,18 @@ static void cros_ec_proto_test_get_next_event_mkbp_event_version2(struct kunit *
/* For get_next_event_xfer(). */
{
- struct ec_response_get_next_event_v1 *data;
+ struct ec_response_get_next_event *data;
mock = cros_kunit_ec_xfer_mock_add(test, sizeof(*data));
KUNIT_ASSERT_PTR_NE(test, mock, NULL);
- data = (struct ec_response_get_next_event_v1 *)mock->o_data;
+ data = (struct ec_response_get_next_event *)mock->o_data;
data->event_type = EC_MKBP_EVENT_FINGERPRINT;
data->data.sysrq = 0xbeef;
}
ret = cros_ec_get_next_event(ec_dev, &wake_event, &more_events);
- KUNIT_EXPECT_EQ(test, ret, sizeof(struct ec_response_get_next_event_v1));
+ KUNIT_EXPECT_EQ(test, ret, sizeof(struct ec_response_get_next_event));
KUNIT_EXPECT_EQ(test, ec_dev->event_data.event_type, EC_MKBP_EVENT_FINGERPRINT);
KUNIT_EXPECT_EQ(test, ec_dev->event_data.data.sysrq, 0xbeef);
@@ -2209,7 +2209,7 @@ static void cros_ec_proto_test_get_next_event_mkbp_event_version2(struct kunit *
KUNIT_EXPECT_EQ(test, mock->msg.version, 2);
KUNIT_EXPECT_EQ(test, mock->msg.command, EC_CMD_GET_NEXT_EVENT);
KUNIT_EXPECT_EQ(test, mock->msg.insize,
- sizeof(struct ec_response_get_next_event_v1));
+ sizeof(struct ec_response_get_next_event));
KUNIT_EXPECT_EQ(test, mock->msg.outsize, 0);
}
}
@@ -2221,7 +2221,7 @@ static void cros_ec_proto_test_get_next_event_mkbp_event_host_event_rtc(struct k
struct ec_xfer_mock *mock;
int ret;
bool wake_event;
- struct ec_response_get_next_event_v1 *data;
+ struct ec_response_get_next_event *data;
ec_dev->max_request = 0xff;
ec_dev->max_response = 0xee;
@@ -2238,7 +2238,7 @@ static void cros_ec_proto_test_get_next_event_mkbp_event_host_event_rtc(struct k
sizeof(data->data.host_event));
KUNIT_ASSERT_PTR_NE(test, mock, NULL);
- data = (struct ec_response_get_next_event_v1 *)mock->o_data;
+ data = (struct ec_response_get_next_event *)mock->o_data;
data->event_type = EC_MKBP_EVENT_HOST_EVENT;
put_unaligned_le32(EC_HOST_EVENT_MASK(EC_HOST_EVENT_RTC), &data->data.host_event);
}
@@ -2258,7 +2258,7 @@ static void cros_ec_proto_test_get_next_event_mkbp_event_host_event_rtc(struct k
KUNIT_EXPECT_EQ(test, mock->msg.version, 2);
KUNIT_EXPECT_EQ(test, mock->msg.command, EC_CMD_GET_NEXT_EVENT);
KUNIT_EXPECT_EQ(test, mock->msg.insize,
- sizeof(struct ec_response_get_next_event_v1));
+ sizeof(struct ec_response_get_next_event));
KUNIT_EXPECT_EQ(test, mock->msg.outsize, 0);
}
}
@@ -2270,7 +2270,7 @@ static void cros_ec_proto_test_get_next_event_mkbp_event_host_event_masked(struc
struct ec_xfer_mock *mock;
int ret;
bool wake_event;
- struct ec_response_get_next_event_v1 *data;
+ struct ec_response_get_next_event *data;
ec_dev->max_request = 0xff;
ec_dev->max_response = 0xee;
@@ -2287,7 +2287,7 @@ static void cros_ec_proto_test_get_next_event_mkbp_event_host_event_masked(struc
sizeof(data->data.host_event));
KUNIT_ASSERT_PTR_NE(test, mock, NULL);
- data = (struct ec_response_get_next_event_v1 *)mock->o_data;
+ data = (struct ec_response_get_next_event *)mock->o_data;
data->event_type = EC_MKBP_EVENT_HOST_EVENT;
put_unaligned_le32(EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_DISCONNECTED),
&data->data.host_event);
@@ -2308,7 +2308,7 @@ static void cros_ec_proto_test_get_next_event_mkbp_event_host_event_masked(struc
KUNIT_EXPECT_EQ(test, mock->msg.version, 2);
KUNIT_EXPECT_EQ(test, mock->msg.command, EC_CMD_GET_NEXT_EVENT);
KUNIT_EXPECT_EQ(test, mock->msg.insize,
- sizeof(struct ec_response_get_next_event_v1));
+ sizeof(struct ec_response_get_next_event));
KUNIT_EXPECT_EQ(test, mock->msg.outsize, 0);
}
}
diff --git a/include/linux/platform_data/cros_ec_commands.h b/include/linux/platform_data/cros_ec_commands.h
index 070e49c5381e..00c06c130dd5 100644
--- a/include/linux/platform_data/cros_ec_commands.h
+++ b/include/linux/platform_data/cros_ec_commands.h
@@ -3475,32 +3475,7 @@ enum ec_mkbp_event {
BUILD_ASSERT(EC_MKBP_EVENT_COUNT <= EC_MKBP_EVENT_TYPE_MASK);
union __ec_align_offset1 ec_response_get_next_data {
- uint8_t key_matrix[13];
-
- /* Unaligned */
- uint32_t host_event;
- uint64_t host_event64;
-
- struct __ec_todo_unpacked {
- /* For aligning the fifo_info */
- uint8_t reserved[3];
- struct ec_response_motion_sense_fifo_info info;
- } sensor_fifo;
-
- uint32_t buttons;
-
- uint32_t switches;
-
- uint32_t fp_events;
-
- uint32_t sysrq;
-
- /* CEC events from enum mkbp_cec_event */
- uint32_t cec_events;
-};
-
-union __ec_align_offset1 ec_response_get_next_data_v1 {
- uint8_t key_matrix[16];
+ uint8_t key_matrix[18];
/* Unaligned */
uint32_t host_event;
@@ -3525,7 +3500,6 @@ union __ec_align_offset1 ec_response_get_next_data_v1 {
uint8_t cec_message[16];
};
-BUILD_ASSERT(sizeof(union ec_response_get_next_data_v1) == 16);
struct ec_response_get_next_event {
uint8_t event_type;
@@ -3533,12 +3507,6 @@ struct ec_response_get_next_event {
union ec_response_get_next_data data;
} __ec_align1;
-struct ec_response_get_next_event_v1 {
- uint8_t event_type;
- /* Followed by event data if any */
- union ec_response_get_next_data_v1 data;
-} __ec_align1;
-
/* Bit indices for buttons and switches.*/
/* Buttons */
#define EC_MKBP_POWER_BUTTON 0
diff --git a/include/linux/platform_data/cros_ec_proto.h b/include/linux/platform_data/cros_ec_proto.h
index 8865e350c12a..a795fe260a38 100644
--- a/include/linux/platform_data/cros_ec_proto.h
+++ b/include/linux/platform_data/cros_ec_proto.h
@@ -185,7 +185,7 @@ struct cros_ec_device {
bool host_sleep_v1;
struct blocking_notifier_head event_notifier;
- struct ec_response_get_next_event_v1 event_data;
+ struct ec_response_get_next_event event_data;
int event_size;
u32 host_event_wake_mask;
u32 last_resume_result;
--
2.45.2.803.g4e1b14247a-goog
