Skip to contentSkip to conversation

Support intel-vbtn based tablet mode switch

PATCH Superseded Marco Martin 4 participants 9 messages Jan 26, 2018 – Jan 27, 2018 x86 platform drivers

v5 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

PATCH v5 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 | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
drivers/platform/x86/intel-vbtn.c +20 -0
index 58c5ff3..3765c41 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,20 @@ 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));
+		}
+	}
+
 	status = acpi_install_notify_handler(handle,
 					     ACPI_DEVICE_NOTIFY,
 					     notify_handler,
Signature · 1 line
2.7.4
Reviewed-by on v5 1/1
#1 lore raw
Quoted 87 lines

-----Original Message-----
From: [email protected] [mailto:platform-driver-x86- [email protected]] On Behalf Of Marco Martin
Sent: Friday, January 26, 2018 5:21 AM
To: [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Limonciello, Mario <[email protected]>; Marco Martin <[email protected]>; Limonciello, Mario <[email protected]>
Subject: [PATCH v5] 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 | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
drivers/platform/x86/intel-vbtn.c +3 -0
index 58c5ff3..3765c41 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 */

drivers/platform/x86/intel-vbtn.c +3 -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)
 
 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;
drivers/platform/x86/intel-vbtn.c +14 -0
 	acpi_status status;
@@ -110,6 +116,20 @@ 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));
+		}
+	}
+
drivers/platform/x86/intel-vbtn.c +0 -1
 	status = acpi_install_notify_handler(handle,
 					     ACPI_DEVICE_NOTIFY,
 					     notify_handler,
--
Quoted 1 line

2.7.4

Looks good to me now.

#2 lore raw
In reply to Marco Martin
Quoted 3 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

Thanks for an update. It doesn't apply.

Please, rebase on top of our testing branch, add Mario's tag and resend.

Quoted 68 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 | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
drivers/platform/x86/intel-vbtn.c +20 -1
index 58c5ff3..3765c41 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,20 @@ 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));
+               }
+       }
+
        status = acpi_install_notify_handler(handle,
                                             ACPI_DEVICE_NOTIFY,
                                             notify_handler,
--

2.7.4

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#3 lore raw
Quoted 8 lines · Andy Shevchenko
Quoted 3 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

Thanks for an update. It doesn't apply.

Please, rebase on top of our testing branch, add Mario's tag and resend.

what clone/branch I should look at?

#4 lore raw
Quoted 19 lines

-----Original Message-----
From: Marco Martin [mailto:[email protected]]
Sent: Friday, January 26, 2018 10:18 AM
To: Andy Shevchenko <[email protected]>
Cc: Linux Kernel Mailing List <[email protected]>; Matthew Garrett <[email protected]>; Pali Rohár <[email protected]>; Darren Hart <[email protected]>; Andy Shevchenko <[email protected]>; Bhushan Shah <[email protected]>; Platform Driver <[email protected]>; Limonciello, Mario <[email protected]>; Limonciello, Mario <[email protected]>
Subject: Re: [PATCH v5] Support intel-vbtn based tablet mode switch

Quoted 5 lines · Andy Shevchenko
Quoted 3 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 8 lines
Quoted 3 lines

Thanks for an update. It doesn't apply.

Please, rebase on top of our testing branch, add Mario's tag and resend.

what clone/branch I should look at?

--
Marco Martin

http://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git
The testing branch.

#6 lore raw
Quoted 13 lines

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

On Fri, Jan 26, 2018 at 6:22 PM, <[email protected]> wrote:

Quoted 8 lines
Quoted 2 lines

http://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git
The testing branch.

Since PDx86 subsystem is maintained by more than one person we encourage to use impersonal URL, i.e.

http://git.infradead.org/linux-platform-drivers-x86.git

Thx, didn't know that existed.

#7 lore raw
Quoted 16 lines · On Fri, Jan 26, 2018 at 5:29 PM, <[email protected]> wrote:
Quoted 16 lines

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

Quoted 2 lines · On Fri, Jan 26, 2018 at 6:22 PM, <[email protected]> wrote:

http://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git
The testing branch.

Quoted 7 lines
Quoted 5 lines

Since PDx86 subsystem is maintained by more than one person we encourage to use impersonal URL, i.e.

http://git.infradead.org/linux-platform-drivers-x86.git

Thx, didn't know that existed.

last one is against master of that tree

#8 lore raw
In reply to Marco Martin
Quoted 40 lines · On Friday 26 January 2018 12:21:28 Marco Martin wrote:

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 | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
drivers/platform/x86/intel-vbtn.c +5 -0
index 58c5ff3..3765c41 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 },
 };
 

drivers/platform/x86/intel-vbtn.c static void notify_handler(acpi_handle handle, u32 event, void *context) · line 96

Quoted 4 lines
drivers/platform/x86/intel-vbtn.c +1 -0
@@ -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 };

Memory leak. I do not see where is allocated buffer released.

Quoted 27 lines
drivers/platform/x86/intel-vbtn.c +14 -0
 	acpi_handle handle = ACPI_HANDLE(&device->dev);
 	struct intel_vbtn_priv *priv;
 	acpi_status status;
@@ -110,6 +116,20 @@ 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));
+		}
+	}
+
 	status = acpi_install_notify_handler(handle,
 					     ACPI_DEVICE_NOTIFY,
 					     notify_handler,
Signature · 1 line
2.7.4
Signature · 2 lines
Pali Rohár
[email protected]