Skip to content

Commit 9984fbf

Browse files
dtorJiri Kosina
authored andcommitted
HID: i2c: let RMI devices decide what constitutes wakeup event
HID-RMI is special in the sense that it does not carry HID events directly, but rather uses HID protocol as a wrapper/transport for RMI protocol. Therefore we should not assume that all data coming from the device via interrupt is associated with user activity and report wakeup event indiscriminately, but rather let HID-RMI do that when appropriate. HID-RMI devices tag responses to the commands issued by the host as RMI_READ_DATA_REPORT_ID whereas motion and other input events from the device are tagged as RMI_ATTN_REPORT_ID. Change hid-rmi to report wakeup events when receiving the latter packets. This allows ChromeOS to accurately identify wakeup source and make correct decision on the mode of the resume the system should take ("dark" where the display stays off vs normal one). Fixes: d951ae1 ("HID: i2c-hid: Report wakeup events") Signed-off-by: Dmitry Torokhov <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
1 parent 9c730fe commit 9984fbf

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

drivers/hid/hid-rmi.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,8 @@ static int rmi_input_event(struct hid_device *hdev, u8 *data, int size)
326326
if (!(test_bit(RMI_STARTED, &hdata->flags)))
327327
return 0;
328328

329+
pm_wakeup_event(hdev->dev.parent, 0);
330+
329331
local_irq_save(flags);
330332

331333
rmi_set_attn_data(rmi_dev, data[1], &data[2], size - 2);

drivers/hid/i2c-hid/i2c-hid-core.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,8 @@ static void i2c_hid_get_input(struct i2c_hid *ihid)
554554
i2c_hid_dbg(ihid, "input: %*ph\n", ret_size, ihid->inbuf);
555555

556556
if (test_bit(I2C_HID_STARTED, &ihid->flags)) {
557-
pm_wakeup_event(&ihid->client->dev, 0);
557+
if (ihid->hid->group != HID_GROUP_RMI)
558+
pm_wakeup_event(&ihid->client->dev, 0);
558559

559560
hid_input_report(ihid->hid, HID_INPUT_REPORT,
560561
ihid->inbuf + sizeof(__le16),

0 commit comments

Comments
 (0)