diff mbox

[PATCHv3] hp-wmi: limit hotkey enable

Message ID 55F1B391.7020601@gmail.com (mailing list archive)
State Changes Requested, archived
Headers show

Commit Message

Kyle Evans Sept. 10, 2015, 4:45 p.m. UTC 
From 0e2c0ae37e1fbc326c54a60b2845eb0c7566d389 Mon Sep 17 00:00:00 2001
From: Kyle Evans <kvans32@gmail.com>
Date: Tue, 1 Sep 2015 18:50:45 -0500
Subject: [PATCH] hp-wmi: limit hotkey enable

Do not write initialize magic on systems that do not have
feature query 0xb. Fixes Bug #82451.

Redefine FEATURE_QUERY to align with 0xb and FEATURE2 with 0xd
for code clearity.

Add a new test function, hp_wmi_bios_2008_later() & simplify
hp_wmi_bios_2009_later(), which fixes a bug in cases where
an improper value is returned. May also fix Bug #69131.

Signed-off-by: Kyle Evans <kvans32@gmail.com>
---

Since v1:
  - Refactored feature query 0xb into separate function
  - Redefine FEATURE_QUERY to align with 0xb and FEATURE2 with 0xd

Since v2:
  - Simplify hp_wmi_bios_200x_later functions. No longer returns true 
(4) when the test fails. However, if state is somehow useful, that is lost.

  drivers/platform/x86/hp-wmi.c | 31 ++++++++++++++++++++-----------
  1 file changed, 20 insertions(+), 11 deletions(-)

NULL);

Comments

Darren Hart Sept. 10, 2015, 5:46 p.m. UTC | #1 
On Thu, Sep 10, 2015 at 11:45:05AM -0500, Kyle Evans wrote:
> From 0e2c0ae37e1fbc326c54a60b2845eb0c7566d389 Mon Sep 17 00:00:00 2001
> From: Kyle Evans <kvans32@gmail.com>
> Date: Tue, 1 Sep 2015 18:50:45 -0500
> Subject: [PATCH] hp-wmi: limit hotkey enable
> 
> Do not write initialize magic on systems that do not have
> feature query 0xb. Fixes Bug #82451.
> 
> Redefine FEATURE_QUERY to align with 0xb and FEATURE2 with 0xd
> for code clearity.
> 
> Add a new test function, hp_wmi_bios_2008_later() & simplify
> hp_wmi_bios_2009_later(), which fixes a bug in cases where
> an improper value is returned. May also fix Bug #69131.
> 
> Signed-off-by: Kyle Evans <kvans32@gmail.com>

Thanks Kyle,

I think this looks much better. Unfortunately, it doesn't apply to either Linus'
master nor my for-next branch, with all 3 hunks failing even with the more
forgiving manual patch application. Please check your base and regenerate based
on either Linus' master (the usual approach) or my for-next branch.
Kyle Evans Sept. 10, 2015, 7:47 p.m. UTC | #2 
On 09/10/2015 12:46 PM, Darren Hart wrote:
> On Thu, Sep 10, 2015 at 11:45:05AM -0500, Kyle Evans wrote:
>>  From 0e2c0ae37e1fbc326c54a60b2845eb0c7566d389 Mon Sep 17 00:00:00 2001
>> From: Kyle Evans <kvans32@gmail.com>
>> Date: Tue, 1 Sep 2015 18:50:45 -0500
>> Subject: [PATCH] hp-wmi: limit hotkey enable
>>
>> Do not write initialize magic on systems that do not have
>> feature query 0xb. Fixes Bug #82451.
>>
>> Redefine FEATURE_QUERY to align with 0xb and FEATURE2 with 0xd
>> for code clearity.
>>
>> Add a new test function, hp_wmi_bios_2008_later() & simplify
>> hp_wmi_bios_2009_later(), which fixes a bug in cases where
>> an improper value is returned. May also fix Bug #69131.
>>
>> Signed-off-by: Kyle Evans <kvans32@gmail.com>
>
> Thanks Kyle,
>
> I think this looks much better. Unfortunately, it doesn't apply to either Linus'
> master nor my for-next branch, with all 3 hunks failing even with the more
> forgiving manual patch application. Please check your base and regenerate based
> on either Linus' master (the usual approach) or my for-next branch.
>

Please try my v4 patch. It is based on 4.3-rc1.

b8889c4fc6ba03e289cec6a4d692f6f080a55e53
--
To unsubscribe from this list: send the line "unsubscribe platform-driver-x86" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index 0669731..45a9eaa 100644
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -54,8 +54,9 @@  MODULE_ALIAS("wmi:5FB7F034-2C63-45e9-BE91-3D44E2C707E4");
  #define HPWMI_HARDWARE_QUERY 0x4
  #define HPWMI_WIRELESS_QUERY 0x5
  #define HPWMI_BIOS_QUERY 0x9
+#define HPWMI_FEATURE_QUERY 0xb
  #define HPWMI_HOTKEY_QUERY 0xc
-#define HPWMI_FEATURE_QUERY 0xd
+#define HPWMI_FEATURE2_QUERY 0xd
  #define HPWMI_WIRELESS2_QUERY 0x1b
  #define HPWMI_POSTCODEERROR_QUERY 0x2a

@@ -295,25 +296,33 @@  static int hp_wmi_tablet_state(void)
  	return (state & 0x4) ? 1 : 0;
  }

-static int __init hp_wmi_bios_2009_later(void)
+static int __init hp_wmi_bios_2008_later(void)
  {
  	int state = 0;
  	int ret = hp_wmi_perform_query(HPWMI_FEATURE_QUERY, 0, &state,
  				       sizeof(state), sizeof(state));
-	if (ret)
-		return ret;
+	if (!ret)
+		return 1;

-	return (state & 0x10) ? 1 : 0;
+	return (ret == HPWMI_RET_UNKNOWN_CMDTYPE) ? 0 : -ENXIO;
  }

-static int hp_wmi_enable_hotkeys(void)
+static int __init hp_wmi_bios_2009_later(void)
  {
-	int ret;
-	int query = 0x6e;
+	int state = 0;
+	int ret = hp_wmi_perform_query(HPWMI_FEATURE2_QUERY, 0, &state,
+				       sizeof(state), sizeof(state));
+	if (!ret)
+		return 1;

-	ret = hp_wmi_perform_query(HPWMI_BIOS_QUERY, 1, &query, sizeof(query),
-				   0);
+	return (ret == HPWMI_RET_UNKNOWN_CMDTYPE) ? 0 : -ENXIO;
+}

+static int hp_wmi_enable_hotkeys(void)
+{
+	int value = 0x6e;
+	int ret = hp_wmi_perform_query(HPWMI_BIOS_QUERY, 1, &value,
+				       sizeof(value), 0);
  	if (ret)
  		return -EINVAL;
  	return 0;
@@ -663,7 +672,7 @@  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)
+	if (!hp_wmi_bios_2009_later() && hp_wmi_2008_later())
  		hp_wmi_enable_hotkeys();

  	status = wmi_install_notify_handler(HPWMI_EVENT_GUID, hp_wmi_notify,