This is a note to let you know that I've just added the patch titled
platform/x86: asus-wmi: Simplify tablet-mode-switch handling
to the 5.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
platform-x86-asus-wmi-simplify-tablet-mode-switch-ha.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit 2e120f8acb23c90a2c707e87332da34620ee9286
Author: Hans de Goede <hdegoede@xxxxxxxxxx>
Date: Wed Aug 24 17:11:45 2022 +0200
platform/x86: asus-wmi: Simplify tablet-mode-switch handling
[ Upstream commit 1ea0d3b46798afc35c3185f6058b8bc08525d56c ]
Simplify tablet-mode-switch handling:
1. The code is the same for all variants, the only difference is the
dev_id and notify event code. Store the dev_id + code in struct asus_wmi
and unify the handling
2. Make the new unified asus_wmi_tablet_mode_get_state() check dev_id has
been set and make it a no-op when not set. This allows calling it
unconditionally at resume/restore time
3. Simplify the tablet_mode_sw module-param handling, this also allows
selecting the new lid-flip-rog type through the module-param.
Cc: Luke D. Jones <luke@xxxxxxxxxx>
Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20220824151145.1448010-2-hdegoede@xxxxxxxxxx
Stable-dep-of: b52cbca22cbf ("platform/x86: asus-wmi: Move i8042 filter install to shared asus-wmi code")
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c
index 2857678efa2eb..7b8942fee76dd 100644
--- a/drivers/platform/x86/asus-nb-wmi.c
+++ b/drivers/platform/x86/asus-nb-wmi.c
@@ -504,17 +504,8 @@ static void asus_nb_wmi_quirks(struct asus_wmi_driver *driver)
else
wapf = quirks->wapf;
- switch (tablet_mode_sw) {
- case 0:
- quirks->tablet_switch_mode = asus_wmi_no_tablet_switch;
- break;
- case 1:
- quirks->tablet_switch_mode = asus_wmi_kbd_dock_devid;
- break;
- case 2:
- quirks->tablet_switch_mode = asus_wmi_lid_flip_devid;
- break;
- }
+ if (tablet_mode_sw != -1)
+ quirks->tablet_switch_mode = tablet_mode_sw;
if (quirks->i8042_filter) {
ret = i8042_install_filter(quirks->i8042_filter);
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index 35b2fbb466b45..e7a01accf4ff1 100644
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -204,6 +204,9 @@ struct asus_wmi {
struct asus_rfkill gps;
struct asus_rfkill uwb;
+ int tablet_switch_event_code;
+ u32 tablet_switch_dev_id;
+
enum fan_type fan_type;
int fan_pwm_mode;
int agfn_pwm;
@@ -370,11 +373,11 @@ static void asus_wmi_tablet_sw_init(struct asus_wmi *asus, u32 dev_id, int event
int result;
result = asus_wmi_get_devstate_simple(asus, dev_id);
- if (result < 0)
- asus->driver->quirks->tablet_switch_mode = asus_wmi_no_tablet_switch;
if (result >= 0) {
input_set_capability(asus->inputdev, EV_SW, SW_TABLET_MODE);
input_report_switch(asus->inputdev, SW_TABLET_MODE, result);
+ asus->tablet_switch_dev_id = dev_id;
+ asus->tablet_switch_event_code = event_code;
} else if (result == -ENODEV) {
dev_err(dev, "This device has tablet-mode-switch quirk but got ENODEV checking it. This is a bug.");
} else {
@@ -436,22 +439,14 @@ static void asus_wmi_input_exit(struct asus_wmi *asus)
/* Tablet mode ****************************************************************/
-static void lid_flip_tablet_mode_get_state(struct asus_wmi *asus)
+static void asus_wmi_tablet_mode_get_state(struct asus_wmi *asus)
{
int result;
- result = asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_LID_FLIP);
- if (result >= 0) {
- input_report_switch(asus->inputdev, SW_TABLET_MODE, result);
- input_sync(asus->inputdev);
- }
-}
-
-static void lid_flip_rog_tablet_mode_get_state(struct asus_wmi *asus)
-{
- int result;
+ if (!asus->tablet_switch_dev_id)
+ return;
- result = asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_LID_FLIP_ROG);
+ result = asus_wmi_get_devstate_simple(asus, asus->tablet_switch_dev_id);
if (result >= 0) {
input_report_switch(asus->inputdev, SW_TABLET_MODE, result);
input_sync(asus->inputdev);
@@ -2507,9 +2502,7 @@ static void asus_wmi_handle_event_code(int code, struct asus_wmi *asus)
{
unsigned int key_value = 1;
bool autorelease = 1;
- int result, orig_code;
-
- orig_code = code;
+ int orig_code = code;
if (asus->driver->key_filter) {
asus->driver->key_filter(asus->driver, &code, &key_value,
@@ -2552,27 +2545,8 @@ static void asus_wmi_handle_event_code(int code, struct asus_wmi *asus)
return;
}
- if (asus->driver->quirks->tablet_switch_mode == asus_wmi_kbd_dock_devid &&
- code == NOTIFY_KBD_DOCK_CHANGE) {
- result = asus_wmi_get_devstate_simple(asus,
- ASUS_WMI_DEVID_KBD_DOCK);
- if (result >= 0) {
- input_report_switch(asus->inputdev, SW_TABLET_MODE,
- !result);
- input_sync(asus->inputdev);
- }
- return;
- }
-
- if (asus->driver->quirks->tablet_switch_mode == asus_wmi_lid_flip_devid &&
- code == NOTIFY_LID_FLIP) {
- lid_flip_tablet_mode_get_state(asus);
- return;
- }
-
- if (asus->driver->quirks->tablet_switch_mode == asus_wmi_lid_flip_rog_devid &&
- code == NOTIFY_LID_FLIP_ROG) {
- lid_flip_rog_tablet_mode_get_state(asus);
+ if (code == asus->tablet_switch_event_code) {
+ asus_wmi_tablet_mode_get_state(asus);
return;
}
@@ -3202,18 +3176,7 @@ static int asus_hotk_resume(struct device *device)
if (asus_wmi_has_fnlock_key(asus))
asus_wmi_fnlock_update(asus);
- switch (asus->driver->quirks->tablet_switch_mode) {
- case asus_wmi_no_tablet_switch:
- case asus_wmi_kbd_dock_devid:
- break;
- case asus_wmi_lid_flip_devid:
- lid_flip_tablet_mode_get_state(asus);
- break;
- case asus_wmi_lid_flip_rog_devid:
- lid_flip_rog_tablet_mode_get_state(asus);
- break;
- }
-
+ asus_wmi_tablet_mode_get_state(asus);
return 0;
}
@@ -3253,18 +3216,7 @@ static int asus_hotk_restore(struct device *device)
if (asus_wmi_has_fnlock_key(asus))
asus_wmi_fnlock_update(asus);
- switch (asus->driver->quirks->tablet_switch_mode) {
- case asus_wmi_no_tablet_switch:
- case asus_wmi_kbd_dock_devid:
- break;
- case asus_wmi_lid_flip_devid:
- lid_flip_tablet_mode_get_state(asus);
- break;
- case asus_wmi_lid_flip_rog_devid:
- lid_flip_rog_tablet_mode_get_state(asus);
- break;
- }
-
+ asus_wmi_tablet_mode_get_state(asus);
return 0;
}
