Support for T470s hotkeys
cover Support for T470s hotkeys
Hi!
On the new Levnovo T470s there are 4 hotkeys that emit currently unsupported hkey event (0x1311 .. 0x1315). According to the manual they are 'lanuch user selected fav. application' (0x1311), the 'snipping tool' (0x1312), 'enable/disable bluetooth' (0x1314) and launch the keyboard settings dialog (0x1315). I tried to map them to the corresponding input event codes, although I have to say I am not 100% sure about the user selected fav app (KEY_FAVORITES).
Hans already did a round of review of it (thanks very much!), comments are of course welcome!
Cheers,
Ck
Christian Kellner (2):
platform/x86: thinkpad_acpi: guard generic hotkey case platform/x86: thinkpad_acpi: add mapping for new hotkeys on T470
drivers/platform/x86/thinkpad_acpi.c | 97 ++++++++++++++++++++++++++++++------ 1 file changed, 82 insertions(+), 15 deletions(-)
Signature · 3 lines
Dr. Christian J. Kellner Desktop Hardware Enablement Red Hat
PATCH 1/2 platform/x86: thinkpad_acpi: guard generic hotkey case
Currently when dispatching hotkeys we check if the scancode is in the range of 0 and TPACPI_HOTKEY_MAP_LEN, although the bottom 20 entries in the hotkey keymap are already adaptive keycodes. Therefore we introduce a TP_ACPI_HOTKEYSCAN_ADAPTIVE_START and ensure that we are in the range 0 and ADAPTIVE_START for the generic keycode case.
--- drivers/platform/x86/thinkpad_acpi.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/platform/x86/thinkpad_acpi.c +6 -5
@@ -1923,7 +1923,8 @@ enum { /* hot key scan codes (derived from ACPI DSDT) */TP_ACPI_HOTKEYSCAN_UNK7 ,TP_ACPI_HOTKEYSCAN_UNK8 , -TP_ACPI_HOTKEYSCAN_MUTE2 , +TP_ACPI_HOTKEYSCAN_ADAPTIVE_START =32 , +TP_ACPI_HOTKEYSCAN_MUTE2 =32 ,TP_ACPI_HOTKEYSCAN_BRIGHTNESS_ZERO ,TP_ACPI_HOTKEYSCAN_CLIPPING_TOOL , TP_ACPI_HOTKEYSCAN_CLOUD,
@@ -3657,7 +3658,6 @@ static const int adaptive_keyboard_modes[] = {#define DFR_CHANGE_ROW 0x101#define DFR_SHOW_QUICKVIEW_ROW 0x102#define FIRST_ADAPTIVE_KEY 0x103 -#define ADAPTIVE_KEY_OFFSET 0x020/* press Fn key a while second, it will switch to Function Mode. Then * release Fn key, previous mode be restored.
@@ -3748,12 +3748,13 @@ static bool adaptive_keyboard_hotkey_notify_hotkey(unsigned int scancode)default :if (scancode <FIRST_ADAPTIVE_KEY || scancode >=FIRST_ADAPTIVE_KEY +TPACPI_HOTKEY_MAP_LEN - -ADAPTIVE_KEY_OFFSET ) { +TP_ACPI_HOTKEYSCAN_ADAPTIVE_START ) {pr_info ("Unhandled adaptive keyboard key: 0x%x\n" , scancode);return false; } - keycode = hotkey_keycode_map[scancode -FIRST_ADAPTIVE_KEY +ADAPTIVE_KEY_OFFSET ]; + keycode = hotkey_keycode_map[scancode -FIRST_ADAPTIVE_KEY + +TP_ACPI_HOTKEYSCAN_ADAPTIVE_START ];if (keycode !=KEY_RESERVED ) {mutex_lock (&tpacpi_inputdev_send_mutex);
@@ -3779,7 +3780,7 @@ static bool hotkey_notify_hotkey(const u32 hkey, *ignore_acpi_ev = false;/* HKEY event 0x1001 is scancode 0x00 */ -if (scancode >0 && scancode <=TPACPI_HOTKEY_MAP_LEN ) { +if (scancode >0 && scancode <=TP_ACPI_HOTKEYSCAN_ADAPTIVE_START ) { scancode--;if (!(hotkey_source_mask & (1 << scancode))) {tpacpi_input_send_key_masked (scancode);
Signature · 1 line
2.11.1
PATCH 2/2 platform/x86: thinkpad_acpi: add mapping for new hotkeys on T470
In reply to Christian KellnerThe T470 emits new hkey events in the 0x1311 - 0x1315 range. According to the user manual they should launch a user selected favorite application (star icon, 0x1311), snipping tool (0x1312, currently ignored), enable/disable bluetooth (0x1314) and open they keyboard settings (0x1315).
The third nibble (0xf00) is used to differentiate between the original hotkeys, the adaptive keyboard codes and the new, additional ones.
--- drivers/platform/x86/thinkpad_acpi.c | 90 +++++++++++++++++++++++++++++++----- 1 file changed, 78 insertions(+), 12 deletions(-)
drivers/platform/x86/thinkpad_acpi.c +78 -12
@@ -1945,6 +1945,15 @@ enum { /* hot key scan codes (derived from ACPI DSDT) */TP_ACPI_HOTKEYSCAN_CAMERA_MODE ,TP_ACPI_HOTKEYSCAN_ROTATE_DISPLAY , +/* Lenovo extended keymap, starting at 0x1300 */ +TP_ACPI_HOTKEYSCAN_EXTENDED_START =52 , +/* first new observed key (star, favorites) is 0x1311 */ +TP_ACPI_HOTKEYSCAN_STAR =69 , +TP_ACPI_HOTKEYSCAN_CLIPPING_TOOL2 , +TP_ACPI_HOTKEYSCAN_UNK25 , +TP_ACPI_HOTKEYSCAN_BLUETOOTH , +TP_ACPI_HOTKEYSCAN_KEYBOARD , +/* Hotkey keymap size */ TPACPI_HOTKEY_MAP_LEN };
@@ -3252,6 +3261,15 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)KEY_UNKNOWN ,KEY_UNKNOWN ,KEY_UNKNOWN ,KEY_UNKNOWN ,KEY_UNKNOWN ,KEY_UNKNOWN ,KEY_UNKNOWN ,KEY_UNKNOWN ,KEY_UNKNOWN ,KEY_UNKNOWN ,KEY_UNKNOWN , + +/* No assignment, used for newer Lenovo models */ +KEY_UNKNOWN ,KEY_UNKNOWN ,KEY_UNKNOWN ,KEY_UNKNOWN , +KEY_UNKNOWN ,KEY_UNKNOWN ,KEY_UNKNOWN ,KEY_UNKNOWN , +KEY_UNKNOWN ,KEY_UNKNOWN ,KEY_UNKNOWN ,KEY_UNKNOWN , +KEY_UNKNOWN ,KEY_UNKNOWN ,KEY_UNKNOWN ,KEY_UNKNOWN , +KEY_UNKNOWN ,KEY_UNKNOWN ,KEY_UNKNOWN ,KEY_UNKNOWN , +KEY_UNKNOWN ,KEY_UNKNOWN + }, /* Generic keymap for Lenovo ThinkPads */
@@ -3337,6 +3355,28 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) KEY_RESERVED, /* Microphone cancellation */KEY_RESERVED ,/* Camera mode */ KEY_RESERVED ,/* Rotate display, 0x116 */ + +/* +* These are found in 2017 models (e.g. T470s). The lowest +* known value is 0x311, which according to the manual should +* launch a user defined favorite application. +* +* The offset for these is TP_ACPI_HOTKEYSCAN_EXTENDED_START, +* corresponding to 0x34. +*/ + +/* (assignments unknown, please report if found) */ +KEY_UNKNOWN ,KEY_UNKNOWN ,KEY_UNKNOWN ,KEY_UNKNOWN , +KEY_UNKNOWN ,KEY_UNKNOWN ,KEY_UNKNOWN ,KEY_UNKNOWN , +KEY_UNKNOWN ,KEY_UNKNOWN ,KEY_UNKNOWN ,KEY_UNKNOWN , +KEY_UNKNOWN ,KEY_UNKNOWN ,KEY_UNKNOWN ,KEY_UNKNOWN , +KEY_UNKNOWN , + +KEY_FAVORITES ,/* Favorite app, 0x311 */ +KEY_RESERVED ,/* Clipping tool */ +KEY_RESERVED , +KEY_BLUETOOTH ,/* Bluetooth */ +KEY_KEYBOARD /* Keyboard, 0x315 */ }, };
@@ -3747,8 +3787,9 @@ static bool adaptive_keyboard_hotkey_notify_hotkey(unsigned int scancode)default :if (scancode <FIRST_ADAPTIVE_KEY || - scancode >=FIRST_ADAPTIVE_KEY +TPACPI_HOTKEY_MAP_LEN - -TP_ACPI_HOTKEYSCAN_ADAPTIVE_START ) { + scancode >=FIRST_ADAPTIVE_KEY + +TP_ACPI_HOTKEYSCAN_EXTENDED_START - +TP_ACPI_HOTKEYSCAN_ADAPTIVE_START ) {pr_info ("Unhandled adaptive keyboard key: 0x%x\n" , scancode);return false;
@@ -3779,19 +3820,44 @@ static bool hotkey_notify_hotkey(const u32 hkey, *send_acpi_ev = true; *ignore_acpi_ev = false; -/* HKEY event 0x1001 is scancode 0x00 */ -if (scancode >0 && scancode <=TP_ACPI_HOTKEYSCAN_ADAPTIVE_START ) { - scancode--; -if (!(hotkey_source_mask & (1 << scancode))) { -tpacpi_input_send_key_masked (scancode); - *send_acpi_ev = false; - }else { - *ignore_acpi_ev = true; +/* +* Original events are in the 0x10XX range, the adaptive keyboard +* found in 2014 X1 Carbon emits events are of 0x11XX. In 2017 +* models, additional keys are emitted through 0x13XX. +*/ +switch ((hkey >>8 ) &0xf ) { +case 0 : +if (scancode >0 && + scancode <=TP_ACPI_HOTKEYSCAN_ADAPTIVE_START ) { +/* HKEY event 0x1001 is scancode 0x00 */ + scancode--; +if (!(hotkey_source_mask & (1 << scancode))) { +tpacpi_input_send_key_masked (scancode); + *send_acpi_ev = false; + }else { + *ignore_acpi_ev = true; + } +return true; } -return true; - }else { +break ; + +case 1 :return adaptive_keyboard_hotkey_notify_hotkey (scancode); + +case 3 : +/* Extended keycodes start at 0x300 and our offset into the map +* TP_ACPI_HOTKEYSCAN_EXTENDED_START. The calculated scancode +* will be positive, but might not be in the correct range. +*/ + scancode -= (0x300 -TP_ACPI_HOTKEYSCAN_EXTENDED_START ); +if (scancode >=TP_ACPI_HOTKEYSCAN_EXTENDED_START && + scancode <TPACPI_HOTKEY_MAP_LEN ) { +tpacpi_input_send_key (scancode); +return true; + } +break ; } +return false; }
Signature · 1 line
2.11.1
Re: [PATCH 1/2] platform/x86: thinkpad_acpi: guard generic hotkey case
In reply to a message not in the archivedrivers/platform/x86/thinkpad_acpi.c enum { /* hot key scan codes (derived from ACPI DSDT) */ · line 1930
Quoted 10 lines · Christian Kellner
drivers/platform/x86/thinkpad_acpi.c +2
-1@@ -1923,7 +1923,8 @@ enum { /* hot key scan codes (derived from ACPI DSDT) */TP_ACPI_HOTKEYSCAN_UNK7 ,TP_ACPI_HOTKEYSCAN_UNK8 , -TP_ACPI_HOTKEYSCAN_MUTE2 , +TP_ACPI_HOTKEYSCAN_ADAPTIVE_START =32 , +TP_ACPI_HOTKEYSCAN_MUTE2 =32 ,TP_ACPI_HOTKEYSCAN_BRIGHTNESS_ZERO ,TP_ACPI_HOTKEYSCAN_CLIPPING_TOOL , TP_ACPI_HOTKEYSCAN_CLOUD,
This works, but...
enum {
TP_ACPI_HOTKEYSCAN_ADAPTIVE_START, TP_ACPI_HOTKEYSCAN_MUTE2 = TP_ACPI_HOTKEYSCAN_ADAPTIVE_START, TP_ACPI_HOTKEYSCAN_BRIGHTNESS_ZERO,
...
}
or something to that effect might be better. Either that or an compile-time assert that the block boundaries are where we expect them to be.
Feel free to use formatting tricks with whitespace to make it create visual blocks in the enum {} definition, or use comments as spacers... ;-)
Quoted 25 lines
drivers/platform/x86/thinkpad_acpi.c +3
-3@@ -3657,7 +3658,6 @@ static const int adaptive_keyboard_modes[] = {#define DFR_CHANGE_ROW 0x101#define DFR_SHOW_QUICKVIEW_ROW 0x102#define FIRST_ADAPTIVE_KEY 0x103 -#define ADAPTIVE_KEY_OFFSET 0x020/* press Fn key a while second, it will switch to Function Mode. Then * release Fn key, previous mode be restored. @@ -3748,12 +3748,13 @@ static bool adaptive_keyboard_hotkey_notify_hotkey(unsigned int scancode)default :if (scancode <FIRST_ADAPTIVE_KEY || scancode >=FIRST_ADAPTIVE_KEY +TPACPI_HOTKEY_MAP_LEN - -ADAPTIVE_KEY_OFFSET ) { +TP_ACPI_HOTKEYSCAN_ADAPTIVE_START ) {pr_info ("Unhandled adaptive keyboard key: 0x%x\n" , scancode);return false; } - keycode = hotkey_keycode_map[scancode -FIRST_ADAPTIVE_KEY +ADAPTIVE_KEY_OFFSET ]; + keycode = hotkey_keycode_map[scancode -FIRST_ADAPTIVE_KEY + +TP_ACPI_HOTKEYSCAN_ADAPTIVE_START ];if (keycode !=KEY_RESERVED ) {mutex_lock (&tpacpi_inputdev_send_mutex);
drivers/platform/x86/thinkpad_acpi.c static bool hotkey_notify_hotkey(const u32 hkey, · line 3786
Quoted 8 lines
drivers/platform/x86/thinkpad_acpi.c +1
-1@@ -3779,7 +3780,7 @@ static bool hotkey_notify_hotkey(const u32 hkey, *ignore_acpi_ev = false;/* HKEY event 0x1001 is scancode 0x00 */ -if (scancode >0 && scancode <=TPACPI_HOTKEY_MAP_LEN ) { +if (scancode >0 && scancode <=TP_ACPI_HOTKEYSCAN_ADAPTIVE_START ) { scancode--;if (!(hotkey_source_mask & (1 << scancode))) {tpacpi_input_send_key_masked (scancode);
Other than that, I like the idea.
Signature · 5 lines
Henrique Holschuh ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, SlashDot.org! http://sdm.link/slashdot
Re: [PATCH 2/2] platform/x86: thinkpad_acpi: add mapping for new hotkeys on T470
In reply to Christian KellnerQuoted 8 lines · Christian Kellner
The T470 emits new hkey events in the
0x1311-0x1315range. According to the user manual they should launch a user selected favorite application (star icon,0x1311), snipping tool (0x1312, currently ignored), enable/disable bluetooth (0x1314) and open they keyboard settings (0x1315).The third nibble (
0xf00) is used to differentiate between the original hotkeys, the adaptive keyboard codes and the new, additional ones.
Looks good.
Signature · 1 line
Henrique Holschuh