* [PATCH] Input: cros_ec_keyb: mask out extra flags in event_type
@ 2019-06-14 6:54 Ting Shen
2019-06-14 18:27 ` Enrico Granata
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Ting Shen @ 2019-06-14 6:54 UTC (permalink / raw)
To: LKML
Cc: Nicolas Boichat, Pi-Hsun Shih, Enrico Granata, Ting Shen,
Enric Balletbo i Serra, Heiko Stuebner, Guenter Roeck,
Brian Norris, Benson Leung, Dmitry Torokhov, linux-input,
Colin Ian King
http://crosreview.com/1341159 added a EC_MKBP_HAS_MORE_EVENTS flag to
the event_type field, the receiver side should mask out this extra bit when
processing the event.
Signed-off-by: Ting Shen <phoenixshen@chromium.org>
---
drivers/input/keyboard/cros_ec_keyb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c
index d5600118159835..38cb6d82d8fe67 100644
--- a/drivers/input/keyboard/cros_ec_keyb.c
+++ b/drivers/input/keyboard/cros_ec_keyb.c
@@ -237,7 +237,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) {
+ switch (ckdev->ec->event_data.event_type & EC_MKBP_EVENT_TYPE_MASK) {
case EC_MKBP_EVENT_KEY_MATRIX:
pm_wakeup_event(ckdev->dev, 0);
--
2.22.0.rc2.383.gf4fbbf30c2-goog
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] Input: cros_ec_keyb: mask out extra flags in event_type
2019-06-14 6:54 [PATCH] Input: cros_ec_keyb: mask out extra flags in event_type Ting Shen
@ 2019-06-14 18:27 ` Enrico Granata
2019-06-14 18:55 ` Dmitry Torokhov
2019-06-14 19:32 ` Benson Leung
2019-06-18 8:43 ` Enric Balletbo i Serra
2 siblings, 1 reply; 7+ messages in thread
From: Enrico Granata @ 2019-06-14 18:27 UTC (permalink / raw)
To: Ting Shen
Cc: LKML, Nicolas Boichat, Pi-Hsun Shih, Enrico Granata,
Enric Balletbo i Serra, Heiko Stuebner, Guenter Roeck,
Brian Norris, Benson Leung, Dmitry Torokhov, linux-input,
Colin Ian King
On Thu, Jun 13, 2019 at 11:54 PM Ting Shen <phoenixshen@chromium.org> wrote:
>
> http://crosreview.com/1341159 added a EC_MKBP_HAS_MORE_EVENTS flag to
> the event_type field, the receiver side should mask out this extra bit when
> processing the event.
>
> Signed-off-by: Ting Shen <phoenixshen@chromium.org>
Reviewed-by: Enrico Granata <egranata@google.com>
>
> ---
>
> drivers/input/keyboard/cros_ec_keyb.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c
> index d5600118159835..38cb6d82d8fe67 100644
> --- a/drivers/input/keyboard/cros_ec_keyb.c
> +++ b/drivers/input/keyboard/cros_ec_keyb.c
> @@ -237,7 +237,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) {
> + switch (ckdev->ec->event_data.event_type & EC_MKBP_EVENT_TYPE_MASK) {
> case EC_MKBP_EVENT_KEY_MATRIX:
> pm_wakeup_event(ckdev->dev, 0);
>
> --
> 2.22.0.rc2.383.gf4fbbf30c2-goog
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Input: cros_ec_keyb: mask out extra flags in event_type
2019-06-14 18:27 ` Enrico Granata
@ 2019-06-14 18:55 ` Dmitry Torokhov
2019-06-14 19:09 ` Benson Leung
0 siblings, 1 reply; 7+ messages in thread
From: Dmitry Torokhov @ 2019-06-14 18:55 UTC (permalink / raw)
To: Enrico Granata
Cc: Ting Shen, LKML, Nicolas Boichat, Pi-Hsun Shih, Enrico Granata,
Enric Balletbo i Serra, Heiko Stuebner, Guenter Roeck,
Brian Norris, Benson Leung, linux-input, Colin Ian King
On Fri, Jun 14, 2019 at 11:27:03AM -0700, Enrico Granata wrote:
> On Thu, Jun 13, 2019 at 11:54 PM Ting Shen <phoenixshen@chromium.org> wrote:
> >
> > http://crosreview.com/1341159 added a EC_MKBP_HAS_MORE_EVENTS flag to
> > the event_type field, the receiver side should mask out this extra bit when
> > processing the event.
> >
> > Signed-off-by: Ting Shen <phoenixshen@chromium.org>
>
> Reviewed-by: Enrico Granata <egranata@google.com>
EC_MKBP_EVENT_TYPE_MASK is not in Linus' tree. It would be better to
merge this path through whatever tree that is bringing in that
definition.
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Thanks.
--
Dmitry
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Input: cros_ec_keyb: mask out extra flags in event_type
2019-06-14 18:55 ` Dmitry Torokhov
@ 2019-06-14 19:09 ` Benson Leung
2019-06-14 19:19 ` Dmitry Torokhov
0 siblings, 1 reply; 7+ messages in thread
From: Benson Leung @ 2019-06-14 19:09 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Enrico Granata, Ting Shen, LKML, Nicolas Boichat, Pi-Hsun Shih,
Enrico Granata, Enric Balletbo i Serra, Heiko Stuebner,
Guenter Roeck, Brian Norris, Benson Leung, linux-input,
Colin Ian King, gwendal, Lee Jones
[-- Attachment #1: Type: text/plain, Size: 1399 bytes --]
Hi Dmitry,
On Fri, Jun 14, 2019 at 11:55:33AM -0700, Dmitry Torokhov wrote:
> On Fri, Jun 14, 2019 at 11:27:03AM -0700, Enrico Granata wrote:
> > On Thu, Jun 13, 2019 at 11:54 PM Ting Shen <phoenixshen@chromium.org> wrote:
> > >
> > > http://crosreview.com/1341159 added a EC_MKBP_HAS_MORE_EVENTS flag to
> > > the event_type field, the receiver side should mask out this extra bit when
> > > processing the event.
> > >
> > > Signed-off-by: Ting Shen <phoenixshen@chromium.org>
> >
> > Reviewed-by: Enrico Granata <egranata@google.com>
>
> EC_MKBP_EVENT_TYPE_MASK is not in Linus' tree. It would be better to
> merge this path through whatever tree that is bringing in that
> definition.
>
> Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Yup, this looks like it's coming in through Lee's MFD tree, a series from
Gwendal to update cros_ec_commands.h.
784dd15c930f mfd: cros_ec: Fix event processing API
That commit is in the immutable branch for v5.3 here:
git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-cros-v5.3
I'd recommend the chrome-platform tree since we'll be pulling in that IB too
for some other refactoring Enric is working on.
Thanks,
Benson
>
> Thanks.
>
> --
> Dmitry
--
Benson Leung
Staff Software Engineer
Chrome OS Kernel
Google Inc.
bleung@google.com
Chromium OS Project
bleung@chromium.org
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Input: cros_ec_keyb: mask out extra flags in event_type
2019-06-14 19:09 ` Benson Leung
@ 2019-06-14 19:19 ` Dmitry Torokhov
0 siblings, 0 replies; 7+ messages in thread
From: Dmitry Torokhov @ 2019-06-14 19:19 UTC (permalink / raw)
To: Benson Leung
Cc: Enrico Granata, Ting Shen, LKML, Nicolas Boichat, Pi-Hsun Shih,
Enrico Granata, Enric Balletbo i Serra, Heiko Stuebner,
Guenter Roeck, Brian Norris, Benson Leung, linux-input,
Colin Ian King, gwendal, Lee Jones
On Fri, Jun 14, 2019 at 12:09:57PM -0700, Benson Leung wrote:
> Hi Dmitry,
>
> On Fri, Jun 14, 2019 at 11:55:33AM -0700, Dmitry Torokhov wrote:
> > On Fri, Jun 14, 2019 at 11:27:03AM -0700, Enrico Granata wrote:
> > > On Thu, Jun 13, 2019 at 11:54 PM Ting Shen <phoenixshen@chromium.org> wrote:
> > > >
> > > > http://crosreview.com/1341159 added a EC_MKBP_HAS_MORE_EVENTS flag to
> > > > the event_type field, the receiver side should mask out this extra bit when
> > > > processing the event.
> > > >
> > > > Signed-off-by: Ting Shen <phoenixshen@chromium.org>
> > >
> > > Reviewed-by: Enrico Granata <egranata@google.com>
> >
> > EC_MKBP_EVENT_TYPE_MASK is not in Linus' tree. It would be better to
> > merge this path through whatever tree that is bringing in that
> > definition.
> >
> > Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
>
> Yup, this looks like it's coming in through Lee's MFD tree, a series from
> Gwendal to update cros_ec_commands.h.
>
> 784dd15c930f mfd: cros_ec: Fix event processing API
>
> That commit is in the immutable branch for v5.3 here:
> git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-cros-v5.3
>
> I'd recommend the chrome-platform tree since we'll be pulling in that IB too
> for some other refactoring Enric is working on.
Yeah, I'm fine with this going through chrome-platform.
Thanks.
--
Dmitry
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Input: cros_ec_keyb: mask out extra flags in event_type
2019-06-14 6:54 [PATCH] Input: cros_ec_keyb: mask out extra flags in event_type Ting Shen
2019-06-14 18:27 ` Enrico Granata
@ 2019-06-14 19:32 ` Benson Leung
2019-06-18 8:43 ` Enric Balletbo i Serra
2 siblings, 0 replies; 7+ messages in thread
From: Benson Leung @ 2019-06-14 19:32 UTC (permalink / raw)
To: Ting Shen
Cc: LKML, Nicolas Boichat, Pi-Hsun Shih, Enrico Granata,
Enric Balletbo i Serra, Heiko Stuebner, Guenter Roeck,
Brian Norris, Benson Leung, Dmitry Torokhov, linux-input,
Colin Ian King
[-- Attachment #1: Type: text/plain, Size: 584 bytes --]
Hi Ting,
On Fri, Jun 14, 2019 at 02:54:38PM +0800, Ting Shen wrote:
> http://crosreview.com/1341159 added a EC_MKBP_HAS_MORE_EVENTS flag to
> the event_type field, the receiver side should mask out this extra bit when
> processing the event.
>
> Signed-off-by: Ting Shen <phoenixshen@chromium.org>
>
Reviewed-by: Benson Leung <bleung@chromium.org>
Looks good for chrome-platform, once ib-mfd-cros-v5.3 is merged.
Thanks,
Benson
--
Benson Leung
Staff Software Engineer
Chrome OS Kernel
Google Inc.
bleung@google.com
Chromium OS Project
bleung@chromium.org
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Input: cros_ec_keyb: mask out extra flags in event_type
2019-06-14 6:54 [PATCH] Input: cros_ec_keyb: mask out extra flags in event_type Ting Shen
2019-06-14 18:27 ` Enrico Granata
2019-06-14 19:32 ` Benson Leung
@ 2019-06-18 8:43 ` Enric Balletbo i Serra
2 siblings, 0 replies; 7+ messages in thread
From: Enric Balletbo i Serra @ 2019-06-18 8:43 UTC (permalink / raw)
To: Ting Shen, LKML
Cc: Nicolas Boichat, Pi-Hsun Shih, Enrico Granata, Heiko Stuebner,
Guenter Roeck, Brian Norris, Benson Leung, Dmitry Torokhov,
linux-input, Colin Ian King
On 14/6/19 8:54, Ting Shen wrote:
> http://crosreview.com/1341159 added a EC_MKBP_HAS_MORE_EVENTS flag to
> the event_type field, the receiver side should mask out this extra bit when
> processing the event.
>
> Signed-off-by: Ting Shen <phoenixshen@chromium.org>
>
> ---
>
> drivers/input/keyboard/cros_ec_keyb.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c
> index d5600118159835..38cb6d82d8fe67 100644
> --- a/drivers/input/keyboard/cros_ec_keyb.c
> +++ b/drivers/input/keyboard/cros_ec_keyb.c
> @@ -237,7 +237,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) {
> + switch (ckdev->ec->event_data.event_type & EC_MKBP_EVENT_TYPE_MASK) {
> case EC_MKBP_EVENT_KEY_MATRIX:
> pm_wakeup_event(ckdev->dev, 0);
>
>
Applied for chrome-platform-5.3
Thanks,
~ Enric
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-06-18 8:43 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-14 6:54 [PATCH] Input: cros_ec_keyb: mask out extra flags in event_type Ting Shen
2019-06-14 18:27 ` Enrico Granata
2019-06-14 18:55 ` Dmitry Torokhov
2019-06-14 19:09 ` Benson Leung
2019-06-14 19:19 ` Dmitry Torokhov
2019-06-14 19:32 ` Benson Leung
2019-06-18 8:43 ` Enric Balletbo i Serra
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).