Input: i8042 - add TUXEDO devices to i8042 quirk tables

[ Upstream commit befc1aea0253253ae7045c298e1b0f9d53180cd7 ]

A lot of modern Clevo barebones have touchpad and/or keyboard issues after
suspend fixable with nomux + reset + noloop + nopnp. Luckily, none of them
have an external PS/2 port so this can safely be set for all of them.

I'm not entirely sure if every device listed really needs all four quirks,
but after testing and production use. No negative effects could be
observed when setting all four.

The list is quite massive as neither the TUXEDO nor the Clevo dmi strings
have been very consistent historically. I tried to keep the list as short
as possible without risking on missing an affected device.

This is revision 3. The Clevo N150CU barebone is still removed as it might
have problems with the fix and needs further investigations. The
SchenkerTechnologiesGmbH System-/Board-Vendor string variations are
added. This is now based in the quirk table refactor. This now also
includes the additional noaux flag for the NS7xMU.

Signed-off-by: Werner Sembach <wse@tuxedocomputers.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20220629112725.12922-5-wse@tuxedocomputers.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Stable-dep-of: 9c445d2637c9 ("Input: i8042 - add Clevo PCX0DX to i8042 quirk table")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 73374c15eb272f60c2398cf6ce71e56116b5f24d..ea9996debb88aa17d833055f04cd9369e30dd410 100644 (file)
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -1025,6 +1025,29 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = {
                },
                .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
+       /*
+        * A lot of modern Clevo barebones have touchpad and/or keyboard issues
+        * after suspend fixable with nomux + reset + noloop + nopnp. Luckily,
+        * none of them have an external PS/2 port so this can safely be set for
+        * all of them. These two are based on a Clevo design, but have the
+        * board_name changed.
+        */
+       {
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "TUXEDO"),
+                       DMI_MATCH(DMI_BOARD_NAME, "AURA1501"),
+               },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
+       },
+       {
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "TUXEDO"),
+                       DMI_MATCH(DMI_BOARD_NAME, "EDUBOOK1502"),
+               },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
+       },
        {
                /* Mivvy M310 */
                .matches = {
@@ -1054,6 +1077,112 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = {
                },
                .driver_data = (void *)(SERIO_QUIRK_NOLOOP)
        },
+       /*
+        * A lot of modern Clevo barebones have touchpad and/or keyboard issues
+        * after suspend fixable with nomux + reset + noloop + nopnp. Luckily,
+        * none of them have an external PS/2 port so this can safely be set for
+        * all of them.
+        * Clevo barebones come with board_vendor and/or system_vendor set to
+        * either the very generic string "Notebook" and/or a different value
+        * for each individual reseller. The only somewhat universal way to
+        * identify them is by board_name.
+        */
+       {
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_NAME, "LAPQC71A"),
+               },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
+       },
+       {
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_NAME, "LAPQC71B"),
+               },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
+       },
+       {
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_NAME, "N140CU"),
+               },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
+       },
+       {
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_NAME, "N141CU"),
+               },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
+       },
+       {
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_NAME, "NH5xAx"),
+               },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
+       },
+       {
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_NAME, "NL5xRU"),
+               },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
+       },
+       /*
+        * At least one modern Clevo barebone has the touchpad connected both
+        * via PS/2 and i2c interface. This causes a race condition between the
+        * psmouse and i2c-hid driver. Since the full capability of the touchpad
+        * is available via the i2c interface and the device has no external
+        * PS/2 port, it is safe to just ignore all ps2 mouses here to avoid
+        * this issue. The known affected device is the
+        * TUXEDO InfinityBook S17 Gen6 / Clevo NS70MU which comes with one of
+        * the two different dmi strings below. NS50MU is not a typo!
+        */
+       {
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_NAME, "NS50MU"),
+               },
+               .driver_data = (void *)(SERIO_QUIRK_NOAUX | SERIO_QUIRK_NOMUX |
+                                       SERIO_QUIRK_RESET_ALWAYS | SERIO_QUIRK_NOLOOP |
+                                       SERIO_QUIRK_NOPNP)
+       },
+       {
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_NAME, "NS50_70MU"),
+               },
+               .driver_data = (void *)(SERIO_QUIRK_NOAUX | SERIO_QUIRK_NOMUX |
+                                       SERIO_QUIRK_RESET_ALWAYS | SERIO_QUIRK_NOLOOP |
+                                       SERIO_QUIRK_NOPNP)
+       },
+       {
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_NAME, "NJ50_70CU"),
+               },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
+       },
+       {
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_NAME, "PB50_70DFx,DDx"),
+               },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
+       },
+       {
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_NAME, "X170SM"),
+               },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
+       },
+       {
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_NAME, "X170KM-G"),
+               },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
+       },
        { }
 };