* [PATCH v7] Support intel-vbtn based tablet mode switch
@ 2018-01-27 16:35 Marco Martin
2018-01-29 18:57 ` Andy Shevchenko
0 siblings, 1 reply; 4+ messages in thread
From: Marco Martin @ 2018-01-27 16:35 UTC (permalink / raw)
To: platform-driver-x86
Cc: mario_limonciello, andy, pali.rohar, dvhart, mjg59, linux-kernel,
bhush94, notmart
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: platform-driver-x86@vger.kernel.org
CC: Matthew Garrett <mjg59@srcf.ucam.org>
CC: "Pali Rohár" <pali.rohar@gmail.com>
CC: Darren Hart <dvhart@infradead.org>
CC: Mario Limonciello <mario_limonciello@dell.com>
CC: Andy Shevchenko <andy@infradead.org>
Signed-off-by: Marco Martin <notmart@gmail.com>
Reviewed-by: Mario Limonciello <mario.limonciello@dell.com>
Acked-by: Pali Rohár <pali.rohar@gmail.com>
---
drivers/platform/x86/intel-vbtn.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/drivers/platform/x86/intel-vbtn.c b/drivers/platform/x86/intel-vbtn.c
index 58c5ff3..0979811 100644
--- a/drivers/platform/x86/intel-vbtn.c
+++ b/drivers/platform/x86/intel-vbtn.c
@@ -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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v7] Support intel-vbtn based tablet mode switch
2018-01-27 16:35 [PATCH v7] Support intel-vbtn based tablet mode switch Marco Martin
@ 2018-01-29 18:57 ` Andy Shevchenko
2018-01-29 19:35 ` Mario.Limonciello
0 siblings, 1 reply; 4+ messages in thread
From: Andy Shevchenko @ 2018-01-29 18:57 UTC (permalink / raw)
To: Marco Martin
Cc: Platform Driver, Mario Limonciello, Andy Shevchenko,
Pali Rohár, Darren Hart, Matthew Garrett,
Linux Kernel Mailing List, Bhushan Shah
On Sat, Jan 27, 2018 at 6:35 PM, Marco Martin <notmart@gmail.com> 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
>
It doesn't apply :-(
> CC: platform-driver-x86@vger.kernel.org
> CC: Matthew Garrett <mjg59@srcf.ucam.org>
> CC: "Pali Rohár" <pali.rohar@gmail.com>
> CC: Darren Hart <dvhart@infradead.org>
> CC: Mario Limonciello <mario_limonciello@dell.com>
> CC: Andy Shevchenko <andy@infradead.org>
>
> Signed-off-by: Marco Martin <notmart@gmail.com>
>
> Reviewed-by: Mario Limonciello <mario.limonciello@dell.com>
> Acked-by: Pali Rohár <pali.rohar@gmail.com>
> ---
> drivers/platform/x86/intel-vbtn.c | 22 ++++++++++++++++++++++
> 1 file changed, 22 insertions(+)
>
> diff --git a/drivers/platform/x86/intel-vbtn.c b/drivers/platform/x86/intel-vbtn.c
> index 58c5ff3..0979811 100644
> --- a/drivers/platform/x86/intel-vbtn.c
> +++ b/drivers/platform/x86/intel-vbtn.c
> @@ -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
>
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH v7] Support intel-vbtn based tablet mode switch
2018-01-29 18:57 ` Andy Shevchenko
@ 2018-01-29 19:35 ` Mario.Limonciello
2018-01-29 20:33 ` Marco Martin
0 siblings, 1 reply; 4+ messages in thread
From: Mario.Limonciello @ 2018-01-29 19:35 UTC (permalink / raw)
To: andy.shevchenko, notmart
Cc: platform-driver-x86, andy, pali.rohar, dvhart, mjg59,
linux-kernel, bhush94
> -----Original Message-----
> From: Andy Shevchenko [mailto:andy.shevchenko@gmail.com]
> Sent: Monday, January 29, 2018 12:57 PM
> To: Marco Martin <notmart@gmail.com>
> Cc: Platform Driver <platform-driver-x86@vger.kernel.org>; Limonciello, Mario
> <Mario_Limonciello@Dell.com>; Andy Shevchenko <andy@infradead.org>; Pali
> Rohár <pali.rohar@gmail.com>; Darren Hart <dvhart@infradead.org>; Matthew
> Garrett <mjg59@srcf.ucam.org>; Linux Kernel Mailing List <linux-
> kernel@vger.kernel.org>; Bhushan Shah <bhush94@gmail.com>
> Subject: Re: [PATCH v7] Support intel-vbtn based tablet mode switch
>
> On Sat, Jan 27, 2018 at 6:35 PM, Marco Martin <notmart@gmail.com> 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
> >
>
> 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) <dvhart@infradead.org>
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.
Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
Reviewed-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Tested-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Cc: AceLan Kao <acelan.kao@canonical.com>
>
> > CC: platform-driver-x86@vger.kernel.org
> > CC: Matthew Garrett <mjg59@srcf.ucam.org>
> > CC: "Pali Rohár" <pali.rohar@gmail.com>
> > CC: Darren Hart <dvhart@infradead.org>
> > CC: Mario Limonciello <mario_limonciello@dell.com>
> > CC: Andy Shevchenko <andy@infradead.org>
> >
> > Signed-off-by: Marco Martin <notmart@gmail.com>
> >
> > Reviewed-by: Mario Limonciello <mario.limonciello@dell.com>
> > Acked-by: Pali Rohár <pali.rohar@gmail.com>
> > ---
> > drivers/platform/x86/intel-vbtn.c | 22 ++++++++++++++++++++++
> > 1 file changed, 22 insertions(+)
> >
> > diff --git a/drivers/platform/x86/intel-vbtn.c b/drivers/platform/x86/intel-vbtn.c
> > index 58c5ff3..0979811 100644
> > --- a/drivers/platform/x86/intel-vbtn.c
> > +++ b/drivers/platform/x86/intel-vbtn.c
> > @@ -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
> >
>
>
>
> --
> With Best Regards,
> Andy Shevchenko
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v7] Support intel-vbtn based tablet mode switch
2018-01-29 19:35 ` Mario.Limonciello
@ 2018-01-29 20:33 ` Marco Martin
0 siblings, 0 replies; 4+ messages in thread
From: Marco Martin @ 2018-01-29 20:33 UTC (permalink / raw)
To: Mario Limonciello
Cc: Andy Shevchenko, Platform Driver, Andy Shevchenko,
Pali Rohár, Darren Hart, Matthew Garrett,
Linux Kernel Mailing List, Bhushan Shah, Stefan Brüns
On Mon, Jan 29, 2018 at 8:35 PM, <Mario.Limonciello@dell.com> wrote:
>> -----Original Message-----
>> From: Andy Shevchenko [mailto:andy.shevchenko@gmail.com]
>> Sent: Monday, January 29, 2018 12:57 PM
>> To: Marco Martin <notmart@gmail.com>
>> Cc: Platform Driver <platform-driver-x86@vger.kernel.org>; Limonciello, Mario
>> <Mario_Limonciello@Dell.com>; Andy Shevchenko <andy@infradead.org>; Pali
>> Rohár <pali.rohar@gmail.com>; Darren Hart <dvhart@infradead.org>; Matthew
>> Garrett <mjg59@srcf.ucam.org>; Linux Kernel Mailing List <linux-
>> kernel@vger.kernel.org>; Bhushan Shah <bhush94@gmail.com>
>> Subject: Re: [PATCH v7] Support intel-vbtn based tablet mode switch
>>
>> On Sat, Jan 27, 2018 at 6:35 PM, Marco Martin <notmart@gmail.com> 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
>> >
>>
>> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-01-29 20:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-27 16:35 [PATCH v7] Support intel-vbtn based tablet mode switch Marco Martin
2018-01-29 18:57 ` Andy Shevchenko
2018-01-29 19:35 ` Mario.Limonciello
2018-01-29 20:33 ` Marco Martin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome