* [PATCH 1/3] dell-wmi: Mask off upper bytes of event response @ 2009-06-01 14:14 Matthew Garrett 2009-06-01 14:14 ` [PATCH 2/3] dell-wmi: Add additional keyboard events Matthew Garrett 2009-06-18 3:45 ` [PATCH 1/3] dell-wmi: Mask off upper bytes of event response Len Brown 0 siblings, 2 replies; 6+ messages in thread From: Matthew Garrett @ 2009-06-01 14:14 UTC (permalink / raw) To: linux-acpi; +Cc: linux-kernel, Mario Limonciello, Matthew Garrett From: Mario Limonciello <mario_limonciello@dell.com> From: Mario Limonciello <mario_limonciello@dell.com> In debugging with some future machines that actually contain BIOS level support for dell-wmi, I've determined that the upper half of the data that comes back from wmi_get_event_data may sometimes contain extra information that isn't currently relevant when pulling scan codes out of the data. This causes dell-wmi to improperly respond to these events. Signed-off-by: Mario Limonciello <mario_limonciello@dell.com> Signed-off-by: Matthew Garrett <mjg@redhat.com> --- drivers/platform/x86/dell-wmi.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c index 2fab941..8a0d39e 100644 --- a/drivers/platform/x86/dell-wmi.c +++ b/drivers/platform/x86/dell-wmi.c @@ -122,7 +122,12 @@ static void dell_wmi_notify(u32 value, void *context) if (obj && obj->type == ACPI_TYPE_BUFFER) { int *buffer = (int *)obj->buffer.pointer; - key = dell_wmi_get_entry_by_scancode(buffer[1]); + /* + * The upper bytes of the event may contain + * additional information, so mask them off for the + * scancode lookup + */ + key = dell_wmi_get_entry_by_scancode(buffer[1] & 0xFFFF); if (key) { input_report_key(dell_wmi_input_dev, key->keycode, 1); input_sync(dell_wmi_input_dev); -- 1.6.2.2 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/3] dell-wmi: Add additional keyboard events 2009-06-01 14:14 [PATCH 1/3] dell-wmi: Mask off upper bytes of event response Matthew Garrett @ 2009-06-01 14:14 ` Matthew Garrett 2009-06-01 14:14 ` [PATCH 3/3] dell-wmi: Don't generate errors on empty messages Matthew Garrett 2009-06-18 3:45 ` [PATCH 2/3] dell-wmi: Add additional keyboard events Len Brown 2009-06-18 3:45 ` [PATCH 1/3] dell-wmi: Mask off upper bytes of event response Len Brown 1 sibling, 2 replies; 6+ messages in thread From: Matthew Garrett @ 2009-06-01 14:14 UTC (permalink / raw) To: linux-acpi; +Cc: linux-kernel, Mario Limonciello, Matthew Garrett From: Mario Limonciello <mario_limonciello@dell.com> From: Mario Limonciello <mario_limonciello@dell.com> Upcoming Dell hardware will send more keyboard events via WMI. Add support for them. Signed-off-by: Mario Limonciello <mario_limonciello@dell.com> Signed-off-by: Matthew Garrett <mjg@redhat.com> --- drivers/platform/x86/dell-wmi.c | 45 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 44 insertions(+), 1 deletions(-) diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c index 8a0d39e..9f345dc 100644 --- a/drivers/platform/x86/dell-wmi.c +++ b/drivers/platform/x86/dell-wmi.c @@ -46,10 +46,53 @@ struct key_entry { u16 keycode; }; -enum { KE_KEY, KE_SW, KE_END }; +enum { KE_KEY, KE_SW, KE_IGNORE, KE_END }; + +/* + * Certain keys are flagged as KE_IGNORE. All of these are either + * notifications (rather than requests for change) or are also sent + * via the keyboard controller so should not be sent again. + */ static struct key_entry dell_wmi_keymap[] = { {KE_KEY, 0xe045, KEY_PROG1}, + {KE_KEY, 0xe009, KEY_EJECTCD}, + + /* These also contain the brightness level at offset 6 */ + {KE_KEY, 0xe006, KEY_BRIGHTNESSUP}, + {KE_KEY, 0xe005, KEY_BRIGHTNESSDOWN}, + + /* Battery health status button */ + {KE_KEY, 0xe007, KEY_BATTERY}, + + /* This is actually for all radios. Although physically a + * switch, the notification does not provide an indication of + * state and so it should be reported as a key */ + {KE_KEY, 0xe008, KEY_WLAN}, + + /* The next device is at offset 6, the active devices are at + offset 8 and the attached devices at offset 10 */ + {KE_KEY, 0xe00b, KEY_DISPLAYTOGGLE}, + + {KE_IGNORE, 0xe00c, KEY_KBDILLUMTOGGLE}, + + /* BIOS error detected */ + {KE_IGNORE, 0xe00d, KEY_RESERVED}, + + /* Wifi Catcher */ + {KE_KEY, 0xe011, KEY_PROG2}, + + /* Ambient light sensor toggle */ + {KE_IGNORE, 0xe013, KEY_RESERVED}, + + {KE_IGNORE, 0xe020, KEY_MUTE}, + {KE_IGNORE, 0xe02e, KEY_VOLUMEDOWN}, + {KE_IGNORE, 0xe030, KEY_VOLUMEUP}, + {KE_IGNORE, 0xe033, KEY_KBDILLUMUP}, + {KE_IGNORE, 0xe034, KEY_KBDILLUMDOWN}, + {KE_IGNORE, 0xe03a, KEY_CAPSLOCK}, + {KE_IGNORE, 0xe045, KEY_NUMLOCK}, + {KE_IGNORE, 0xe046, KEY_SCROLLLOCK}, {KE_END, 0} }; -- 1.6.2.2 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3/3] dell-wmi: Don't generate errors on empty messages 2009-06-01 14:14 ` [PATCH 2/3] dell-wmi: Add additional keyboard events Matthew Garrett @ 2009-06-01 14:14 ` Matthew Garrett 2009-06-18 3:45 ` Len Brown 2009-06-18 3:45 ` [PATCH 2/3] dell-wmi: Add additional keyboard events Len Brown 1 sibling, 1 reply; 6+ messages in thread From: Matthew Garrett @ 2009-06-01 14:14 UTC (permalink / raw) To: linux-acpi; +Cc: linux-kernel, Matthew Garrett There's no point in generating kernel messages if we didn't receive a parsable keyboard event - only do so if there appeared to be a scancode. Signed-off-by: Matthew Garrett <mjg@redhat.com> --- drivers/platform/x86/dell-wmi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c index 9f345dc..0f900cc 100644 --- a/drivers/platform/x86/dell-wmi.c +++ b/drivers/platform/x86/dell-wmi.c @@ -176,9 +176,9 @@ static void dell_wmi_notify(u32 value, void *context) input_sync(dell_wmi_input_dev); input_report_key(dell_wmi_input_dev, key->keycode, 0); input_sync(dell_wmi_input_dev); - } else + } else if (buffer[1] & 0xFFFF) printk(KERN_INFO "dell-wmi: Unknown key %x pressed\n", - buffer[1]); + buffer[1] & 0xFFFF); } } -- 1.6.2.2 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] dell-wmi: Don't generate errors on empty messages 2009-06-01 14:14 ` [PATCH 3/3] dell-wmi: Don't generate errors on empty messages Matthew Garrett @ 2009-06-18 3:45 ` Len Brown 0 siblings, 0 replies; 6+ messages in thread From: Len Brown @ 2009-06-18 3:45 UTC (permalink / raw) To: Matthew Garrett; +Cc: linux-acpi, linux-kernel applied thanks, Len Brown, Intel Open Source Technology Center ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] dell-wmi: Add additional keyboard events 2009-06-01 14:14 ` [PATCH 2/3] dell-wmi: Add additional keyboard events Matthew Garrett 2009-06-01 14:14 ` [PATCH 3/3] dell-wmi: Don't generate errors on empty messages Matthew Garrett @ 2009-06-18 3:45 ` Len Brown 1 sibling, 0 replies; 6+ messages in thread From: Len Brown @ 2009-06-18 3:45 UTC (permalink / raw) To: Matthew Garrett; +Cc: linux-acpi, linux-kernel, Mario Limonciello applied thanks, Len Brown, Intel Open Source Technology Center ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] dell-wmi: Mask off upper bytes of event response 2009-06-01 14:14 [PATCH 1/3] dell-wmi: Mask off upper bytes of event response Matthew Garrett 2009-06-01 14:14 ` [PATCH 2/3] dell-wmi: Add additional keyboard events Matthew Garrett @ 2009-06-18 3:45 ` Len Brown 1 sibling, 0 replies; 6+ messages in thread From: Len Brown @ 2009-06-18 3:45 UTC (permalink / raw) To: Matthew Garrett; +Cc: linux-acpi, linux-kernel, Mario Limonciello applied thanks, Len Brown, Intel Open Source Technology Center ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-06-18 5:22 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2009-06-01 14:14 [PATCH 1/3] dell-wmi: Mask off upper bytes of event response Matthew Garrett 2009-06-01 14:14 ` [PATCH 2/3] dell-wmi: Add additional keyboard events Matthew Garrett 2009-06-01 14:14 ` [PATCH 3/3] dell-wmi: Don't generate errors on empty messages Matthew Garrett 2009-06-18 3:45 ` Len Brown 2009-06-18 3:45 ` [PATCH 2/3] dell-wmi: Add additional keyboard events Len Brown 2009-06-18 3:45 ` [PATCH 1/3] dell-wmi: Mask off upper bytes of event response Len Brown
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®