Skip to contentSkip to conversation

Support intel-vbtn based tablet mode switch

PATCH In review Marco Martin 3 participants 4 messages Jan 27, 2018 – Jan 29, 2018 x86 platform drivers

lore
Share & tools
lore
#0 lore raw

PATCH v7 1/1 Support intel-vbtn based tablet mode switch

Some laptops such as Dell Inspiron 7000 series have the tablet mode switch implemented in Intel ACPI,
the events to enter and exit the tablet mode are 0xCC and 0xCD

CC Matthew Garrett <[email protected]>
CC "Pali Rohár" <[email protected]>
CC Darren Hart <[email protected]>
CC Mario Limonciello <[email protected]>
CC Andy Shevchenko <[email protected]>
---
 drivers/platform/x86/intel-vbtn.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
drivers/platform/x86/intel-vbtn.c +22 -0
index 58c5ff3..0979811 100644
@@ -26,6 +26,9 @@
 #include <linux/suspend.h>
 #include <acpi/acpi_bus.h>
 
+/* When NOT in tablet mode, VGBS returns with the flag 0x40 */
+#define TABLET_MODE_FLAG 0x40
+
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("AceLan Kao");
 
@@ -42,6 +45,8 @@ static const struct key_entry intel_vbtn_keymap[] = {
 	{ KE_IGNORE, 0xC5, { KEY_VOLUMEUP } },		/* volume-up key release */
 	{ KE_KEY, 0xC6, { KEY_VOLUMEDOWN } },		/* volume-down key press */
 	{ KE_IGNORE, 0xC7, { KEY_VOLUMEDOWN } },	/* volume-down key release */
+	{ KE_SW,  0xCC, { .sw = { SW_TABLET_MODE, 1 } } }, /* Tablet mode in */
+	{ KE_SW,  0xCD, { .sw = { SW_TABLET_MODE, 0 } } }, /* Tablet mode out */
 	{ KE_END },
 };
 
@@ -88,6 +93,7 @@ static void notify_handler(acpi_handle handle, u32 event, void *context)
 
 static int intel_vbtn_probe(struct platform_device *device)
 {
+	struct acpi_buffer vgbs_output = { ACPI_ALLOCATE_BUFFER, NULL };
 	acpi_handle handle = ACPI_HANDLE(&device->dev);
 	struct intel_vbtn_priv *priv;
 	acpi_status status;
@@ -110,6 +116,22 @@ static int intel_vbtn_probe(struct platform_device *device)
 		return err;
 	}
 
+	status = acpi_evaluate_object(handle, "VGBS", NULL, &vgbs_output);
+	/* VGBS being present and returning something means
+	 * we have a tablet mode switch
+	 */
+	if (ACPI_SUCCESS(status)) {
+		union acpi_object *obj = vgbs_output.pointer;
+
+		if (obj && obj->type == ACPI_TYPE_INTEGER) {
+			input_report_switch(priv->input_dev,
+								SW_TABLET_MODE,
+								!(obj->integer.value & TABLET_MODE_FLAG));
+		}
+	}
+
+	kfree(vgbs_output.pointer);
+
 	status = acpi_install_notify_handler(handle,
 					     ACPI_DEVICE_NOTIFY,
 					     notify_handler,
Signature · 1 line
2.7.4
#1 lore raw
Quoted 4 lines · Marco Martin

Some laptops such as Dell Inspiron 7000 series have the tablet mode switch implemented in Intel ACPI,
the events to enter and exit the tablet mode are 0xCC and 0xCD

It doesn't apply :-(

Quoted 72 lines
CC Matthew Garrett <[email protected]>
CC "Pali Rohár" <[email protected]>
CC Darren Hart <[email protected]>
CC Mario Limonciello <[email protected]>
CC Andy Shevchenko <[email protected]>
---
 drivers/platform/x86/intel-vbtn.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
drivers/platform/x86/intel-vbtn.c +22 -1
index 58c5ff3..0979811 100644
@@ -26,6 +26,9 @@
 #include <linux/suspend.h>
 #include <acpi/acpi_bus.h>
 
+/* When NOT in tablet mode, VGBS returns with the flag 0x40 */
+#define TABLET_MODE_FLAG 0x40
+
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("AceLan Kao");
 
@@ -42,6 +45,8 @@ static const struct key_entry intel_vbtn_keymap[] = {
        { KE_IGNORE, 0xC5, { KEY_VOLUMEUP } },          /* volume-up key release */
        { KE_KEY, 0xC6, { KEY_VOLUMEDOWN } },           /* volume-down key press */
        { KE_IGNORE, 0xC7, { KEY_VOLUMEDOWN } },        /* volume-down key release */
+       { KE_SW,  0xCC, { .sw = { SW_TABLET_MODE, 1 } } }, /* Tablet mode in */
+       { KE_SW,  0xCD, { .sw = { SW_TABLET_MODE, 0 } } }, /* Tablet mode out */
        { KE_END },
 };
 
@@ -88,6 +93,7 @@ static void notify_handler(acpi_handle handle, u32 event, void *context)
 
 static int intel_vbtn_probe(struct platform_device *device)
 {
+       struct acpi_buffer vgbs_output = { ACPI_ALLOCATE_BUFFER, NULL };
        acpi_handle handle = ACPI_HANDLE(&device->dev);
        struct intel_vbtn_priv *priv;
        acpi_status status;
@@ -110,6 +116,22 @@ static int intel_vbtn_probe(struct platform_device *device)
                return err;
        }
 
+       status = acpi_evaluate_object(handle, "VGBS", NULL, &vgbs_output);
+       /* VGBS being present and returning something means
+        * we have a tablet mode switch
+        */
+       if (ACPI_SUCCESS(status)) {
+               union acpi_object *obj = vgbs_output.pointer;
+
+               if (obj && obj->type == ACPI_TYPE_INTEGER) {
+                       input_report_switch(priv->input_dev,
+                                                               SW_TABLET_MODE,
+                                                               !(obj->integer.value & TABLET_MODE_FLAG));
+               }
+       }
+
+       kfree(vgbs_output.pointer);
+
        status = acpi_install_notify_handler(handle,
                                             ACPI_DEVICE_NOTIFY,
                                             notify_handler,
--

2.7.4

Signature · 2 lines
With Best Regards,
Andy Shevchenko
Reviewed-by Stefan Brüns Tested-by Stefan Brüns
#2 lore raw
Quoted 11 lines

-----Original Message-----
From: Andy Shevchenko [mailto:[email protected]]
Sent: Monday, January 29, 2018 12:57 PM
To: Marco Martin <[email protected]>
Cc: Platform Driver <[email protected]>; Limonciello, Mario <[email protected]>; Andy Shevchenko <[email protected]>; Pali Rohár <[email protected]>; Darren Hart <[email protected]>; Matthew Garrett <[email protected]>; Linux Kernel Mailing List <linux- [email protected]>; Bhushan Shah <[email protected]>
Subject: Re: [PATCH v7] Support intel-vbtn based tablet mode switch

Quoted 7 lines
Quoted 4 lines · Marco Martin

Some laptops such as Dell Inspiron 7000 series have the tablet mode switch implemented in Intel ACPI,
the events to enter and exit the tablet mode are 0xCC and 0xCD

It doesn't apply :-(

Marco, I can see it applies on 4.15 but it's not applying on platform-drivers-x86/testing. It's most likely this commit you need to rebase on top of:

commit 1c3fdf125ef416227e43fdedf6b5097c41e8c467

Author: Darren Hart (VMware) <[email protected]>
Date:   Fri Dec 8 14:57:54 2017 -0800

platform/x86: intel-vbtn: Simplify autorelease logic

The new notify_handler logic determining if autorelease should be used or not is a bit awkward, and can result in more than one call to sparse_keymap_report_event for the same event (scancode). The nesting and long lines also made it difficult to read.

Simplify the logic by eliminating a level of nesting with a goto and always calculate autorelease and val so we can make a single call to sparse_keymap_report_event.

Quoted 82 lines
Quoted 31 lines
CC Matthew Garrett <[email protected]>
CC "Pali Rohár" <[email protected]>
CC Darren Hart <[email protected]>
CC Mario Limonciello <[email protected]>
CC Andy Shevchenko <[email protected]>
---
 drivers/platform/x86/intel-vbtn.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
drivers/platform/x86/intel-vbtn.c +3 -0
index 58c5ff3..0979811 100644
@@ -26,6 +26,9 @@
 #include <linux/suspend.h>
 #include <acpi/acpi_bus.h>
 
+/* When NOT in tablet mode, VGBS returns with the flag 0x40 */
+#define TABLET_MODE_FLAG 0x40
+
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("AceLan Kao");
 

drivers/platform/x86/intel-vbtn.c static const struct key_entry intel_vbtn_keymap[] = { · line 47

Quoted 3 lines
drivers/platform/x86/intel-vbtn.c +0 -0
@@ -42,6 +45,8 @@ static const struct key_entry intel_vbtn_keymap[] = {
        { KE_IGNORE, 0xC5, { KEY_VOLUMEUP } },          /* volume-up key release */
        { KE_KEY, 0xC6, { KEY_VOLUMEDOWN } },           /* volume-down key press */
        { KE_IGNORE, 0xC7, { KEY_VOLUMEDOWN } },        /* volume-down key

release */

drivers/platform/x86/intel-vbtn.c static void notify_handler(acpi_handle handle, u32 event,

Quoted 6 lines
drivers/platform/x86/intel-vbtn.c +2 -0
+       { KE_SW,  0xCC, { .sw = { SW_TABLET_MODE, 1 } } }, /* Tablet mode in */
+       { KE_SW,  0xCD, { .sw = { SW_TABLET_MODE, 0 } } }, /* Tablet mode out */
        { KE_END },
 };
 
@@ -88,6 +93,7 @@ static void notify_handler(acpi_handle handle, u32 event,

void *context)

drivers/platform/x86/intel-vbtn.c static int intel_vbtn_probe(struct platform_device

Quoted 8 lines
drivers/platform/x86/intel-vbtn.c +1 -0
 static int intel_vbtn_probe(struct platform_device *device)
 {
+       struct acpi_buffer vgbs_output = { ACPI_ALLOCATE_BUFFER, NULL };
        acpi_handle handle = ACPI_HANDLE(&device->dev);
        struct intel_vbtn_priv *priv;
        acpi_status status;
@@ -110,6 +116,22 @@ static int intel_vbtn_probe(struct platform_device

*device)

Quoted 23 lines
drivers/platform/x86/intel-vbtn.c +16 -1
                return err;
        }
 
+       status = acpi_evaluate_object(handle, "VGBS", NULL, &vgbs_output);
+       /* VGBS being present and returning something means
+        * we have a tablet mode switch
+        */
+       if (ACPI_SUCCESS(status)) {
+               union acpi_object *obj = vgbs_output.pointer;
+
+               if (obj && obj->type == ACPI_TYPE_INTEGER) {
+                       input_report_switch(priv->input_dev,
+                                                               SW_TABLET_MODE,
+                                                               !(obj->integer.value & TABLET_MODE_FLAG));
+               }
+       }
+
+       kfree(vgbs_output.pointer);
+
        status = acpi_install_notify_handler(handle,
                                             ACPI_DEVICE_NOTIFY,
                                             notify_handler,
--
Quoted 2 lines

2.7.4

--
With Best Regards,
Andy Shevchenko

#3 lore raw
Quoted 17 lines · On Mon, Jan 29, 2018 at 8:35 PM, <[email protected]> wrote:
Quoted 17 lines

-----Original Message-----
From: Andy Shevchenko [mailto:[email protected]]
Sent: Monday, January 29, 2018 12:57 PM
To: Marco Martin <[email protected]>
Cc: Platform Driver <[email protected]>; Limonciello, Mario <[email protected]>; Andy Shevchenko <[email protected]>; Pali Rohár <[email protected]>; Darren Hart <[email protected]>; Matthew Garrett <[email protected]>; Linux Kernel Mailing List <linux- [email protected]>; Bhushan Shah <[email protected]>
Subject: Re: [PATCH v7] Support intel-vbtn based tablet mode switch

Quoted 4 lines · Marco Martin

Some laptops such as Dell Inspiron 7000 series have the tablet mode switch implemented in Intel ACPI,
the events to enter and exit the tablet mode are 0xCC and 0xCD

Quoted 4 lines
Quoted 1 line

It doesn't apply :-(

Marco, I can see it applies on 4.15 but it's not applying on platform-drivers-x86/testing. It's most likely this commit you need to rebase on top of:

Ah, i see (i was trying on platform-drivers-x86 but master branch, sorry) latest version is rebased on top of it, i seen the reason it didn't apply was that the addition
to sparse_keymap was already done in 1c8284 by Stefan Brüns (whoops :)
However still needs the initialization part, so booting or modprobe with the device already in tablet mode would initialize the correct state

--
Marco Martin