| Message ID | 20190813093821.74158-1-fshao@chromium.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 62c3801619e16b68a37ea899b76572145dfe41c9 |
| Headers | show |
| Series | Input: cros_ec_keyb: Add back missing mask for event_type | expand |
On Tue, Aug 13, 2019 at 5:38 PM Fei Shao <fshao@chromium.org> wrote: > > In the previous patch we didn't mask out event_type in case statement, > so switches are always picked instead of buttons, which results in > ChromeOS devices misbehaving when power button is pressed. > This patch adds back the missing mask. > > Fixes: d096aa3eb604 ("Input: cros_ec_keyb: mask out extra flags in event_type") > Signed-off-by: Fei Shao <fshao@chromium.org> Reviewed-by: Nicolas Boichat <drinkcat@chromium.org> > --- > drivers/input/keyboard/cros_ec_keyb.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c > index 38cb6d82d8fe..bef7bee6f05e 100644 > --- a/drivers/input/keyboard/cros_ec_keyb.c > +++ b/drivers/input/keyboard/cros_ec_keyb.c > @@ -226,6 +226,8 @@ static int cros_ec_keyb_work(struct notifier_block *nb, > { > struct cros_ec_keyb *ckdev = container_of(nb, struct cros_ec_keyb, > notifier); > + uint8_t mkbp_event_type = ckdev->ec->event_data.event_type & > + EC_MKBP_EVENT_TYPE_MASK; > u32 val; > unsigned int ev_type; > > @@ -237,7 +239,7 @@ static int cros_ec_keyb_work(struct notifier_block *nb, > if (queued_during_suspend && !device_may_wakeup(ckdev->dev)) > return NOTIFY_OK; > > - switch (ckdev->ec->event_data.event_type & EC_MKBP_EVENT_TYPE_MASK) { > + switch (mkbp_event_type) { > case EC_MKBP_EVENT_KEY_MATRIX: > pm_wakeup_event(ckdev->dev, 0); > > @@ -264,7 +266,7 @@ static int cros_ec_keyb_work(struct notifier_block *nb, > case EC_MKBP_EVENT_SWITCH: > pm_wakeup_event(ckdev->dev, 0); > > - if (ckdev->ec->event_data.event_type == EC_MKBP_EVENT_BUTTON) { > + if (mkbp_event_type == EC_MKBP_EVENT_BUTTON) { > val = get_unaligned_le32( > &ckdev->ec->event_data.data.buttons); > ev_type = EV_KEY; > -- > 2.23.0.rc1.153.gdeed80330f-goog
On Tue, Aug 13, 2019 at 05:47:22PM +0800, Nicolas Boichat wrote: > On Tue, Aug 13, 2019 at 5:38 PM Fei Shao <fshao@chromium.org> wrote: > > > > In the previous patch we didn't mask out event_type in case statement, > > so switches are always picked instead of buttons, which results in > > ChromeOS devices misbehaving when power button is pressed. > > This patch adds back the missing mask. > > > > Fixes: d096aa3eb604 ("Input: cros_ec_keyb: mask out extra flags in event_type") > > Signed-off-by: Fei Shao <fshao@chromium.org> > > Reviewed-by: Nicolas Boichat <drinkcat@chromium.org> Applied, thank you. > > > --- > > drivers/input/keyboard/cros_ec_keyb.c | 6 ++++-- > > 1 file changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c > > index 38cb6d82d8fe..bef7bee6f05e 100644 > > --- a/drivers/input/keyboard/cros_ec_keyb.c > > +++ b/drivers/input/keyboard/cros_ec_keyb.c > > @@ -226,6 +226,8 @@ static int cros_ec_keyb_work(struct notifier_block *nb, > > { > > struct cros_ec_keyb *ckdev = container_of(nb, struct cros_ec_keyb, > > notifier); > > + uint8_t mkbp_event_type = ckdev->ec->event_data.event_type & > > + EC_MKBP_EVENT_TYPE_MASK; > > u32 val; > > unsigned int ev_type; > > > > @@ -237,7 +239,7 @@ static int cros_ec_keyb_work(struct notifier_block *nb, > > if (queued_during_suspend && !device_may_wakeup(ckdev->dev)) > > return NOTIFY_OK; > > > > - switch (ckdev->ec->event_data.event_type & EC_MKBP_EVENT_TYPE_MASK) { > > + switch (mkbp_event_type) { > > case EC_MKBP_EVENT_KEY_MATRIX: > > pm_wakeup_event(ckdev->dev, 0); > > > > @@ -264,7 +266,7 @@ static int cros_ec_keyb_work(struct notifier_block *nb, > > case EC_MKBP_EVENT_SWITCH: > > pm_wakeup_event(ckdev->dev, 0); > > > > - if (ckdev->ec->event_data.event_type == EC_MKBP_EVENT_BUTTON) { > > + if (mkbp_event_type == EC_MKBP_EVENT_BUTTON) { > > val = get_unaligned_le32( > > &ckdev->ec->event_data.data.buttons); > > ev_type = EV_KEY; > > -- > > 2.23.0.rc1.153.gdeed80330f-goog
diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c index 38cb6d82d8fe..bef7bee6f05e 100644 --- a/drivers/input/keyboard/cros_ec_keyb.c +++ b/drivers/input/keyboard/cros_ec_keyb.c @@ -226,6 +226,8 @@ static int cros_ec_keyb_work(struct notifier_block *nb, { struct cros_ec_keyb *ckdev = container_of(nb, struct cros_ec_keyb, notifier); + uint8_t mkbp_event_type = ckdev->ec->event_data.event_type & + EC_MKBP_EVENT_TYPE_MASK; u32 val; unsigned int ev_type; @@ -237,7 +239,7 @@ static int cros_ec_keyb_work(struct notifier_block *nb, if (queued_during_suspend && !device_may_wakeup(ckdev->dev)) return NOTIFY_OK; - switch (ckdev->ec->event_data.event_type & EC_MKBP_EVENT_TYPE_MASK) { + switch (mkbp_event_type) { case EC_MKBP_EVENT_KEY_MATRIX: pm_wakeup_event(ckdev->dev, 0); @@ -264,7 +266,7 @@ static int cros_ec_keyb_work(struct notifier_block *nb, case EC_MKBP_EVENT_SWITCH: pm_wakeup_event(ckdev->dev, 0); - if (ckdev->ec->event_data.event_type == EC_MKBP_EVENT_BUTTON) { + if (mkbp_event_type == EC_MKBP_EVENT_BUTTON) { val = get_unaligned_le32( &ckdev->ec->event_data.data.buttons); ev_type = EV_KEY;
In the previous patch we didn't mask out event_type in case statement, so switches are always picked instead of buttons, which results in ChromeOS devices misbehaving when power button is pressed. This patch adds back the missing mask. Fixes: d096aa3eb604 ("Input: cros_ec_keyb: mask out extra flags in event_type") Signed-off-by: Fei Shao <fshao@chromium.org> --- drivers/input/keyboard/cros_ec_keyb.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.23.0.rc1.153.gdeed80330f-goog