Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 20 Sep 2021 18:43:05 +0000
To:     =?utf-8?Q?Jos=C3=A9_Exp=C3=B3sito?= <jose.exposito89@gmail.com>
From:   =?utf-8?Q?Barnab=C3=A1s_P=C5=91cze?= <pobrn@protonmail.com>
Cc:     hdegoede@redhat.com, alex.hung@canonical.com,
        mgross@linux.intel.com, platform-driver-x86@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        Tobias Gurtzick <magic@wizardtales.com>
Reply-To: =?utf-8?Q?Barnab=C3=A1s_P=C5=91cze?= <pobrn@protonmail.com>
Subject: Re: [PATCH] platform/x86/intel: hid: Add DMI switches allow list
Message-ID: <NgI8poho2fFBrbj2ivUSWphaZbwgMIxHVovWWqI2UWdJA8FNhlDtkFk-Y7cp4mYxiiOtkFQHoCQj-kkGh71lQfsvzJ1sg0IgixkJqdEdcnM=@protonmail.com>
In-Reply-To: <20210920160312.9787-1-jose.exposito89@gmail.com>
References: <20210920160312.9787-1-jose.exposito89@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Hi


2021. szeptember 20., h=C3=A9tf=C5=91 18:03 keltez=C3=A9ssel, Jos=C3=A9 Exp=
=C3=B3sito =C3=ADrta:
> Some devices, even non convertible ones, can send incorrect
> SW_TABLET_MODE reports.
>
> Add an allow list and accept such reports only from devices in it.
>
> Bug reported for Dell XPS 17 9710 on:
> https://gitlab.freedesktop.org/libinput/libinput/-/issues/662
>
> Reported-by: Tobias Gurtzick <magic@wizardtales.com>
> Suggested-by: Hans de Goede <hdegoede@redhat.com>
> Tested-by: Tobias Gurtzick <magic@wizardtales.com>
> Signed-off-by: Jos=C3=A9 Exp=C3=B3sito <jose.exposito89@gmail.com>
> ---
>  drivers/platform/x86/intel/hid.c | 33 +++++++++++++++++++++++++++-----
>  1 file changed, 28 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/platform/x86/intel/hid.c b/drivers/platform/x86/inte=
l/hid.c
> index a33a5826e81a..24d26336e39a 100644
> --- a/drivers/platform/x86/intel/hid.c
> +++ b/drivers/platform/x86/intel/hid.c
> @@ -118,6 +118,24 @@ static const struct dmi_system_id dmi_vgbs_allow_lis=
t[] =3D {
>  =09{ }
>  };
>
> +/*
> + * Some devices, even non convertible ones, can send incorrect SW_TABLET=
_MODE
> + * reports. Accept such reports only from devices in this list.
> + */
> +static const struct dmi_system_id dmi_switches_auto_add_allow_list[] =3D=
 {
> +=09{
> +=09=09.matches =3D {
> +=09=09=09DMI_EXACT_MATCH(DMI_CHASSIS_TYPE, "31" /* Convertible */),
> +=09=09},
> +=09},
> +=09{
> +=09=09.matches =3D {
> +=09=09=09DMI_EXACT_MATCH(DMI_CHASSIS_TYPE, "32" /* Detachable */),
> +=09=09},
> +=09},
> +=09{} /* Array terminator */
> +};
> +
>  struct intel_hid_priv {
>  =09struct input_dev *input_dev;
>  =09struct input_dev *array;
> @@ -455,11 +473,16 @@ static void notify_handler(acpi_handle handle, u32 =
event, void *context)
>  =09 *
>  =09 * See dual_accel_detect.h for more info on the dual_accel check.
>  =09 */
> -=09if (!priv->switches && !priv->dual_accel && (event =3D=3D 0xcc || eve=
nt =3D=3D 0xcd)) {
> -=09=09dev_info(&device->dev, "switch event received, enable switches sup=
ports\n");
> -=09=09err =3D intel_hid_switches_setup(device);
> -=09=09if (err)
> -=09=09=09pr_err("Failed to setup Intel HID switches\n");
> +=09if (event =3D=3D 0xcc || event =3D=3D 0xcd) {
> +=09=09if (!dmi_check_system(dmi_switches_auto_add_allow_list))
> +=09=09=09return;

I think you should not check it every time. Maybe add a `bool` member
to `struct intel_hid_priv`. Or maybe better: rename `dual_accel` to somethi=
ng like
`autodetect_switch` and initialize it with `!dual_accel_detect() && dmi_che=
ck_system(...)`.


> +
> +=09=09if (!priv->switches && !priv->dual_accel) {
> +=09=09=09dev_info(&device->dev, "switch event received, enable switches =
supports\n");
> +=09=09=09err =3D intel_hid_switches_setup(device);
> +=09=09=09if (err)
> +=09=09=09=09pr_err("Failed to setup Intel HID switches\n");
> +=09=09}
>  =09}
>
>  =09if (priv->wakeup_mode) {
> --
> 2.25.1
>
>


Regards,
Barnab=C3=A1s P=C5=91cze