Skip to contentSkip to conversation

Support intel-vbtn based tablet mode switch

PATCH Superseded Marco Martin 2 participants 6 messages Jan 23, 2018 – Jan 26, 2018 x86 platform drivers

v4 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

PATCH v4 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 | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
drivers/platform/x86/intel-vbtn.c +21 -0
index 58c5ff3..64b4b34 100644
@@ -26,6 +26,9 @@
 #include <linux/suspend.h>
 #include <acpi/acpi_bus.h>
 
+/* When NOT in tablet mode, VBDS has 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,21 @@ 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_set_capability(priv->input_dev, EV_SW, SW_TABLET_MODE);
+			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
#1 lore raw
Quoted 60 lines · On martedì 23 gennaio 2018 16:18:24 CET 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 | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
(quoted diff) +0 -0

b/drivers/platform/x86/intel-vbtn.c index 58c5ff3..64b4b34 100644

drivers/platform/x86/intel-vbtn.c +6 -0
@@ -26,6 +26,9 @@
 #include <linux/suspend.h>
 #include <acpi/acpi_bus.h>
 
+/* When NOT in tablet mode, VBDS has 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;
drivers/platform/x86/intel-vbtn.c +8 -0
 	acpi_status status;
@@ -110,6 +116,21 @@ 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) {

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

Quoted 10 lines
drivers/platform/x86/intel-vbtn.c +7 -0
+			input_set_capability(priv->input_dev, EV_SW, SW_TABLET_MODE);
+			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,

Is there still something to change in this version of the patch?

Signature · 1 line
Marco Martin
#2 lore raw
Quoted 65 lines · On Friday 26 January 2018 10:45:55 Marco Martin wrote:
Quoted 64 lines · On martedì 23 gennaio 2018 16:18:24 CET 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 | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
(quoted diff) +0 -0

b/drivers/platform/x86/intel-vbtn.c index 58c5ff3..64b4b34 100644

drivers/platform/x86/intel-vbtn.c +6 -0
@@ -26,6 +26,9 @@
 #include <linux/suspend.h>
 #include <acpi/acpi_bus.h>
 
+/* When NOT in tablet mode, VBDS has 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;
drivers/platform/x86/intel-vbtn.c +12 -0
 	acpi_status status;
@@ -110,6 +116,21 @@ 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_set_capability(priv->input_dev, EV_SW, SW_TABLET_MODE);
+			input_report_switch(priv->input_dev,
+								SW_TABLET_MODE,
+								!(obj->integer.value & TABLET_MODE_FLAG));
Quoted 8 lines

drivers/platform/x86/intel-vbtn.c static int intel_vbtn_probe(struct platform_device *device) · line 136

Quoted 6 lines
drivers/platform/x86/intel-vbtn.c +3 -0
+		}
+	}
+
 	status = acpi_install_notify_handler(handle,
 					     ACPI_DEVICE_NOTIFY,
 					     notify_handler,

Is there still something to change in this version of the patch?

Yes, I already wrote it in thread for older patch version. Calling input_set_capability() is not needed at all because all capabilities are already set by sparse_keymap_setup() function.

Signature · 2 lines
Pali Rohár
[email protected]
#3 lore raw
Quoted 75 lines · Pali Rohár
Quoted 65 lines · On Friday 26 January 2018 10:45:55 Marco Martin wrote:
Quoted 64 lines · On martedì 23 gennaio 2018 16:18:24 CET 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 | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
(quoted diff) +0 -0

b/drivers/platform/x86/intel-vbtn.c index 58c5ff3..64b4b34 100644

drivers/platform/x86/intel-vbtn.c +6 -0
@@ -26,6 +26,9 @@
 #include <linux/suspend.h>
 #include <acpi/acpi_bus.h>
 
+/* When NOT in tablet mode, VBDS has 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;
drivers/platform/x86/intel-vbtn.c +12 -0
@@ -110,6 +116,21 @@ 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_set_capability(priv->input_dev, EV_SW, SW_TABLET_MODE);
+                   input_report_switch(priv->input_dev,
+                                                           SW_TABLET_MODE,
+                                                           !(obj->integer.value & TABLET_MODE_FLAG));
Quoted 8 lines

drivers/platform/x86/intel-vbtn.c static int intel_vbtn_probe(struct platform_device *device) · line 136

Quoted 6 lines
drivers/platform/x86/intel-vbtn.c +3 -0
+           }
+   }
+
    status = acpi_install_notify_handler(handle,
                                         ACPI_DEVICE_NOTIFY,
                                         notify_handler,

Is there still something to change in this version of the patch?

Quoted 3 lines

Yes, I already wrote it in thread for older patch version. Calling input_set_capability() is not needed at all because all capabilities are already set by sparse_keymap_setup() function.

ah, sorry, i somehow missed the answer.
Wouldn't this cause a problem tough? it was querying VGBS to add the switch capability just conditionally
on models which actually have it, so now being in sparse_keymap, all will have that switch available even if not there.
Now, if this is fine (after all that switch would never be triggered on such hardware) i can go forward removing all of that so the patch becomes a neat two-liner.

#4 lore raw
Quoted 80 lines · On Friday 26 January 2018 12:09:01 Marco Martin wrote:
Quoted 75 lines · Pali Rohár
Quoted 65 lines · On Friday 26 January 2018 10:45:55 Marco Martin wrote:
Quoted 64 lines · On martedì 23 gennaio 2018 16:18:24 CET 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 | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
(quoted diff) +0 -0

b/drivers/platform/x86/intel-vbtn.c index 58c5ff3..64b4b34 100644

drivers/platform/x86/intel-vbtn.c +6 -0
@@ -26,6 +26,9 @@
 #include <linux/suspend.h>
 #include <acpi/acpi_bus.h>
 
+/* When NOT in tablet mode, VBDS has 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;
drivers/platform/x86/intel-vbtn.c +12 -0
@@ -110,6 +116,21 @@ 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_set_capability(priv->input_dev, EV_SW, SW_TABLET_MODE);
+                   input_report_switch(priv->input_dev,
+                                                           SW_TABLET_MODE,
+                                                           !(obj->integer.value & TABLET_MODE_FLAG));
Quoted 8 lines

drivers/platform/x86/intel-vbtn.c static int intel_vbtn_probe(struct platform_device *device) · line 136

Quoted 6 lines
drivers/platform/x86/intel-vbtn.c +3 -0
+           }
+   }
+
    status = acpi_install_notify_handler(handle,
                                         ACPI_DEVICE_NOTIFY,
                                         notify_handler,

Is there still something to change in this version of the patch?

Quoted 3 lines

Yes, I already wrote it in thread for older patch version. Calling input_set_capability() is not needed at all because all capabilities are already set by sparse_keymap_setup() function.

Quoted 8 lines

ah, sorry, i somehow missed the answer.
Wouldn't this cause a problem tough? it was querying VGBS to add the switch capability just conditionally
on models which actually have it, so now being in sparse_keymap, all will have that switch available even if not there.
Now, if this is fine (after all that switch would never be triggered on such hardware) i can go forward removing all of that so the patch becomes a neat two-liner.

Looking at other drivers and I see that they send initial status of SW_TABLET_MODE at probe time. I do not know if this is correct or not. If yes, then you need to call that input_report_switch() as you have. If not, then then really just 2 line patch is enough.

But in both cases, call to input_set_capability() is not needed.

Signature · 2 lines
Pali Rohár
[email protected]
#5 lore raw
Quoted 90 lines · Pali Rohár
Quoted 80 lines · On Friday 26 January 2018 12:09:01 Marco Martin wrote:
Quoted 75 lines · Pali Rohár
Quoted 65 lines · On Friday 26 January 2018 10:45:55 Marco Martin wrote:
Quoted 64 lines · On martedì 23 gennaio 2018 16:18:24 CET 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 | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
(quoted diff) +0 -0

b/drivers/platform/x86/intel-vbtn.c index 58c5ff3..64b4b34 100644

drivers/platform/x86/intel-vbtn.c +6 -0
@@ -26,6 +26,9 @@
 #include <linux/suspend.h>
 #include <acpi/acpi_bus.h>
 
+/* When NOT in tablet mode, VBDS has 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;
drivers/platform/x86/intel-vbtn.c +12 -0
@@ -110,6 +116,21 @@ 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_set_capability(priv->input_dev, EV_SW, SW_TABLET_MODE);
+                   input_report_switch(priv->input_dev,
+                                                           SW_TABLET_MODE,
+                                                           !(obj->integer.value & TABLET_MODE_FLAG));
Quoted 8 lines

drivers/platform/x86/intel-vbtn.c static int intel_vbtn_probe(struct platform_device *device) · line 136

Quoted 6 lines
drivers/platform/x86/intel-vbtn.c +3 -0
+           }
+   }
+
    status = acpi_install_notify_handler(handle,
                                         ACPI_DEVICE_NOTIFY,
                                         notify_handler,

Is there still something to change in this version of the patch?

Quoted 3 lines

Yes, I already wrote it in thread for older patch version. Calling input_set_capability() is not needed at all because all capabilities are already set by sparse_keymap_setup() function.

Quoted 8 lines

ah, sorry, i somehow missed the answer.
Wouldn't this cause a problem tough? it was querying VGBS to add the switch capability just conditionally
on models which actually have it, so now being in sparse_keymap, all will have that switch available even if not there.
Now, if this is fine (after all that switch would never be triggered on such hardware) i can go forward removing all of that so the patch becomes a neat two-liner.

Quoted 6 lines

Looking at other drivers and I see that they send initial status of SW_TABLET_MODE at probe time. I do not know if this is correct or not. If yes, then you need to call that input_report_switch() as you have. If not, then then really just 2 line patch is enough.

But in both cases, call to input_set_capability() is not needed.

ok, done in latest version.
the initial query and set seems indeed to be necessary, otherwise if i do modprobe of intel-vbtn when in tablet mode, it incorrectly reports 0 as initial state