| Message ID | 20180601032322.3768-1-kai.heng.feng@canonical.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Andy Shevchenko |
| Headers | show |
On Fri, Jun 1, 2018 at 6:23 AM, Kai-Heng Feng <kai.heng.feng@canonical.com> wrote: > There are two new events generated by dell-wmi, rfkill and fn-lock, from > Dell Systems. > > When Fn-lock hotkey gets pressed to switch to function mode: > [85951.591542] dell_wmi: Unknown key with type 0x0010 and code 0xe035 > pressed > [85951.591546] dell_wmi: Unknown key with type 0x0010 and code 0x0000 > pressed > > When Fn-lock hotkey gets pressed to switch to multimedia mode: > [85956.667686] dell_wmi: Unknown key with type 0x0010 and code 0xe035 > pressed > [85956.667690] dell_wmi: Unknown key with type 0x0010 and code 0x0001 > pressed > > When radio hotkey gets pressed: > [85974.430220] dell_wmi: Unknown key with type 0x0010 and code 0xe008 > pressed > > These events are for notification purpose, so we can ignore them. > > This patch is tested on XPS 9370. > Pushed to my review and testing queue, thanks! P.S. There are some patches under Darren's queue, but for some reason didn't processed yet. > Reviewed-by: Pali Rohár <pali.rohar@gmail.com> > Reviewed-by: Mario Limonciello <mario.limonciello@dell.com> > Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> > --- > drivers/platform/x86/dell-wmi.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c > index 8d102195a392..ba8e6725d7ac 100644 > --- a/drivers/platform/x86/dell-wmi.c > +++ b/drivers/platform/x86/dell-wmi.c > @@ -261,6 +261,12 @@ static const u16 bios_to_linux_keycode[256] = { > * override them. > */ > static const struct key_entry dell_wmi_keymap_type_0010[] = { > + /* Fn-lock switched to function keys */ > + { KE_IGNORE, 0x0, { KEY_RESERVED } }, > + > + /* Fn-lock switched to multimedia keys */ > + { KE_IGNORE, 0x1, { KEY_RESERVED } }, > + > /* Mic mute */ > { KE_KEY, 0x150, { KEY_MICMUTE } }, > > @@ -296,6 +302,14 @@ static const struct key_entry dell_wmi_keymap_type_0010[] = { > { KE_KEY, 0x851, { KEY_PROG2 } }, > { KE_KEY, 0x852, { KEY_PROG3 } }, > > + /* > + * Radio disable (notify only -- there is no model for which the > + * WMI event is supposed to trigger an action). > + */ > + { KE_IGNORE, 0xe008, { KEY_RFKILL } }, > + > + /* Fn-lock */ > + { KE_IGNORE, 0xe035, { KEY_RESERVED } }, > }; > > /* > -- > 2.17.0 >
On Fri, Jun 01, 2018 at 11:20:39AM +0300, Andy Shevchenko wrote: > On Fri, Jun 1, 2018 at 6:23 AM, Kai-Heng Feng > <kai.heng.feng@canonical.com> wrote: > > There are two new events generated by dell-wmi, rfkill and fn-lock, from > > Dell Systems. > > > > When Fn-lock hotkey gets pressed to switch to function mode: > > [85951.591542] dell_wmi: Unknown key with type 0x0010 and code 0xe035 > > pressed > > [85951.591546] dell_wmi: Unknown key with type 0x0010 and code 0x0000 > > pressed > > > > When Fn-lock hotkey gets pressed to switch to multimedia mode: > > [85956.667686] dell_wmi: Unknown key with type 0x0010 and code 0xe035 > > pressed > > [85956.667690] dell_wmi: Unknown key with type 0x0010 and code 0x0001 > > pressed > > > > When radio hotkey gets pressed: > > [85974.430220] dell_wmi: Unknown key with type 0x0010 and code 0xe008 > > pressed > > > > These events are for notification purpose, so we can ignore them. > > > > This patch is tested on XPS 9370. > > > > Pushed to my review and testing queue, thanks! > > P.S. There are some patches under Darren's queue, but for some reason > didn't processed yet. Thanks for getting this one Andy. I'm traveling, but am working through these currently. I'll assume you are handling this one.
On Fri, Jun 1, 2018 at 7:47 PM, Darren Hart <dvhart@infradead.org> wrote: > On Fri, Jun 01, 2018 at 11:20:39AM +0300, Andy Shevchenko wrote: >> On Fri, Jun 1, 2018 at 6:23 AM, Kai-Heng Feng >> <kai.heng.feng@canonical.com> wrote: >> Pushed to my review and testing queue, thanks! >> >> P.S. There are some patches under Darren's queue, but for some reason >> didn't processed yet. > > Thanks for getting this one Andy. I'm traveling, but am working through these > currently. I'll assume you are handling this one. Correct.
diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c index 8d102195a392..ba8e6725d7ac 100644 --- a/drivers/platform/x86/dell-wmi.c +++ b/drivers/platform/x86/dell-wmi.c @@ -261,6 +261,12 @@ static const u16 bios_to_linux_keycode[256] = { * override them. */ static const struct key_entry dell_wmi_keymap_type_0010[] = { + /* Fn-lock switched to function keys */ + { KE_IGNORE, 0x0, { KEY_RESERVED } }, + + /* Fn-lock switched to multimedia keys */ + { KE_IGNORE, 0x1, { KEY_RESERVED } }, + /* Mic mute */ { KE_KEY, 0x150, { KEY_MICMUTE } }, @@ -296,6 +302,14 @@ static const struct key_entry dell_wmi_keymap_type_0010[] = { { KE_KEY, 0x851, { KEY_PROG2 } }, { KE_KEY, 0x852, { KEY_PROG3 } }, + /* + * Radio disable (notify only -- there is no model for which the + * WMI event is supposed to trigger an action). + */ + { KE_IGNORE, 0xe008, { KEY_RFKILL } }, + + /* Fn-lock */ + { KE_IGNORE, 0xe035, { KEY_RESERVED } }, }; /*