niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

platform/chrome: cros_ec_proto: Upgrade get_next_event to v3

Browse source 
Upgrade EC_CMD_GET_NEXT_EVENT to version 3.

The max supported version will be v3. So, we speak v3 even if the EC
says it supports v4+.

Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Link: https://lore.kernel.org/r/20240604230837.2878737-1-dnojiri@chromium.org
[tzungbi: uint32_t -> u32 per suggested by checkpatch.pl]
Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org>
This commit is contained in:
Daisuke Nojiri 2024-06-04 16:08:25 -07:00 • committed by Tzung-Bi Shih
parent ba098ed982
commit 106d673982
2 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
drivers/platform/chrome/cros_ec_proto.c
View file

@ -684,7 +684,7 @@ EXPORT_SYMBOL(cros_ec_cmd_xfer_status);
static int get_next_event_xfer(struct cros_ec_device *ec_dev, static int get_next_event_xfer(struct cros_ec_device *ec_dev,
struct cros_ec_command *msg, struct cros_ec_command *msg,
struct ec_response_get_next_event_v1 *event, struct ec_response_get_next_event_v3 *event,
int version, uint32_t size) int version, uint32_t size)
{ {
int ret; int ret;
@ -707,11 +707,12 @@ static int get_next_event(struct cros_ec_device *ec_dev)
{ {
struct { struct {
struct cros_ec_command msg; struct cros_ec_command msg;
struct ec_response_get_next_event_v1 event; struct ec_response_get_next_event_v3 event;
} __packed buf; } __packed buf;
struct cros_ec_command *msg = &buf.msg; struct cros_ec_command *msg = &buf.msg;
struct ec_response_get_next_event_v1 *event = &buf.event; struct ec_response_get_next_event_v3 *event = &buf.event;
const int cmd_version = ec_dev->mkbp_event_supported - 1; int cmd_version = ec_dev->mkbp_event_supported - 1;
u32 size;
memset(msg, 0, sizeof(*msg)); memset(msg, 0, sizeof(*msg));
if (ec_dev->suspended) { if (ec_dev->suspended) {
@ -719,12 +720,20 @@ static int get_next_event(struct cros_ec_device *ec_dev)
return -EHOSTDOWN; return -EHOSTDOWN;
} }
if (cmd_version == 0) if (cmd_version == 0) {
return get_next_event_xfer(ec_dev, msg, event, 0, size = sizeof(struct ec_response_get_next_event);
sizeof(struct ec_response_get_next_event)); } else if (cmd_version < 3) {
size = sizeof(struct ec_response_get_next_event_v1);
} else {
/*
* The max version we support is v3. So, we speak v3 even if the
* EC says it supports v4+.
*/
cmd_version = 3;
size = sizeof(struct ec_response_get_next_event_v3);
}
return get_next_event_xfer(ec_dev, msg, event, cmd_version, return get_next_event_xfer(ec_dev, msg, event, cmd_version, size);
sizeof(struct ec_response_get_next_event_v1));
} }
static int get_keyboard_state_event(struct cros_ec_device *ec_dev) static int get_keyboard_state_event(struct cros_ec_device *ec_dev)

2
include/linux/platform_data/cros_ec_proto.h
View file

@ -185,7 +185,7 @@ struct cros_ec_device {
bool host_sleep_v1; bool host_sleep_v1;
struct blocking_notifier_head event_notifier; struct blocking_notifier_head event_notifier;
struct ec_response_get_next_event_v1 event_data; struct ec_response_get_next_event_v3 event_data;
int event_size; int event_size;
u32 host_event_wake_mask; u32 host_event_wake_mask;
u32 last_resume_result; u32 last_resume_result;