On Fri, Nov 20, 2015 at 06:12:58PM -0600, Andy Lutomirski wrote:
On Fri, Nov 20, 2015 at 4:06 PM, Darren Hart <dvhart@xxxxxxxxxxxxx> wrote:
On Fri, Nov 13, 2015 at 09:49:30PM -0800, Andy Lutomirski wrote:
The XPS 13 Skylake has an rfkill button and a switchvideomode button
that aren't enumerated in the DMI table AFAICT. Add a table listing
extra un-enumerated hotkeys. To avoid breaking things that worked
before, these un-enumerated hotkeys won't be used if the DMI table
maps them to something else.
This also adds the Fn-lock key as a KE_IGNORE entry.
Signed-off-by: Andy Lutomirski <luto@xxxxxxxxxx>
---
drivers/platform/x86/dell-wmi.c | 48 +++++++++++++++++++++++++++++++++++------
1 file changed, 41 insertions(+), 7 deletions(-)
diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c
index f2d77fe696ac..5be1abec4f64 100644
--- a/drivers/platform/x86/dell-wmi.c
+++ b/drivers/platform/x86/dell-wmi.c
@@ -142,6 +142,16 @@ static const u16 bios_to_linux_keycode[256] __initconst = {
0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_PROG3
};
+/* These are applied if the hk table is present and doesn't override them. */
+static const struct key_entry dell_wmi_extra_keymap[] __initconst = {
+ /* Fn-lock -- no action is required by the kernel. */
+ { KE_IGNORE, 0x151, { KEY_RESERVED } },
+
+ /* Keys that need our help (on XPS 13 Skylake and maybe others. */
+ { KE_KEY, 0x152, { KEY_SWITCHVIDEOMODE } },
+ { KE_KEY, 0x153, { KEY_RFKILL } },
+};
+
static struct input_dev *dell_wmi_input_dev;
static void dell_wmi_process_key(int reported_key)
@@ -300,9 +310,10 @@ static const struct key_entry * __init dell_wmi_prepare_new_keymap(void)
int hotkey_num = (dell_bios_hotkey_table->header.length - 4) /
sizeof(struct dell_bios_keymap_entry);
struct key_entry *keymap;
- int i;
+ int i, pos = 0, num_bios_keys;
Just a nit, "reverse christmas tree" order (longest line length first) please.
(only if you resend after this review for other reasons)
Will do if I resubmit.
- keymap = kcalloc(hotkey_num + 1, sizeof(struct key_entry), GFP_KERNEL);
+ keymap = kcalloc(hotkey_num + ARRAY_SIZE(dell_wmi_extra_keymap),
This previously allocated kotkey_num + 1, but you dropeed the +1, making it
eactly the size of hotkey_num + the new entries you added.
Why don't we need the +1 anymore? (it isn't clear to me why we needed to before
actually, but I want to confirm you considered it).
Whoops! It's for the KE_END entry.
Jared, want to give us some guidance as to whether this code is
correct at all and, if so, whether we should actually send a
KEY_RFKILL event from dell-wmi when the key is pressed?
IOW, should we allow dell-wmi to handle rfkill or should we wait for
the other mechanism?
--Andy
I'm adding Mario since he's worked on our client systems much longer and
knows more about the correct behavior for our hotkeys. I've not yet read
through any of our documentation about our hotkey behavior so wouldn't
be as qualified to answer that. Note that both Mario and I are on
vacation until the 30th, so he may not reply until then.
--Jared
--
Jared Domínguez
OS Architect
Linux Engineering
Dell | Client Software Group
--
To unsubscribe from this list: send the line "unsubscribe platform-driver-x86" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
