1 files changed, 18 insertions, 0 deletions

diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index 8ba8956b5a48..484a8673b835 100644
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -53,6 +53,7 @@ MODULE_ALIAS("wmi:5FB7F034-2C63-45e9-BE91-3D44E2C707E4");
 #define HPWMI_ALS_QUERY 0x3
 #define HPWMI_HARDWARE_QUERY 0x4
 #define HPWMI_WIRELESS_QUERY 0x5
+#define HPWMI_BIOS_QUERY 0x9
 #define HPWMI_HOTKEY_QUERY 0xc
 #define HPWMI_FEATURE_QUERY 0xd
 #define HPWMI_WIRELESS2_QUERY 0x1b
@@ -144,6 +145,7 @@ static const struct key_entry hp_wmi_keymap[] = {
         { KE_KEY, 0x2142, { KEY_MEDIA } },
         { KE_KEY, 0x213b, { KEY_INFO } },
         { KE_KEY, 0x2169, { KEY_DIRECTION } },
+        { KE_KEY, 0x216a, { KEY_SETUP } },
         { KE_KEY, 0x231b, { KEY_HELP } },
         { KE_END, 0 }
 };
@@ -304,6 +306,19 @@ static int hp_wmi_bios_2009_later(void)
         return (state & 0x10) ? 1 : 0;
 }
 
+static int hp_wmi_enable_hotkeys(void)
+{
+        int ret;
+        int query = 0x6e;
+
+        ret = hp_wmi_perform_query(HPWMI_BIOS_QUERY, 1, &query, sizeof(query),
+                                   0);
+
+        if (ret)
+                return -EINVAL;
+        return 0;
+}
+
 static int hp_wmi_set_block(void *data, bool blocked)
 {
         enum hp_wmi_radio r = (enum hp_wmi_radio) data;
@@ -648,6 +663,9 @@ static int __init hp_wmi_input_setup(void)
                             hp_wmi_tablet_state());
         input_sync(hp_wmi_input_dev);
 
+        if (hp_wmi_bios_2009_later() == 4)
+                hp_wmi_enable_hotkeys();
+
         status = wmi_install_notify_handler(HPWMI_EVENT_GUID, hp_wmi_notify, NULL);
         if (ACPI_FAILURE(status)) {
                 err = -EIO;