2022-07-08 16:40:16

by Werner Sembach

Subject: [PATCH 1/2] Input: i8042 - add additional TUXEDO devices to i8042 quirk tables

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.

Signed-off-by: Werner Sembach <[email protected]>
Cc: [email protected]
---
drivers/input/serio/i8042-x86ia64io.h | 76 ++++++++++++++++++++++++---
1 file changed, 68 insertions(+), 8 deletions(-)

diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 50b090e77fca..5204a7dd61d4 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -900,14 +900,6 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = {
},
.driver_data = (void *)(SERIO_QUIRK_NOMUX)
},
- {
- /* Clevo P650RS, 650RP6, Sager NP8152-S, and others */
- .matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Notebook"),
- DMI_MATCH(DMI_PRODUCT_NAME, "P65xRP"),
- },
- .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS)
- },
{
/* OQO Model 01 */
.matches = {
@@ -1162,6 +1154,74 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = {
.driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
},
+ {
+ /*
+ * This is only a partial board_name and might be followed by
+ * another letter or number. DMI_MATCH however does do partial
+ * matching.
+ */
+ .matches = {
+ DMI_MATCH(DMI_PRODUCT_NAME, "P65xH"),
+ },
+ .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+ SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
+ },
+ {
+ /* Clevo P650RS, 650RP6, Sager NP8152-S, and others */
+ .matches = {
+ DMI_MATCH(DMI_PRODUCT_NAME, "P65xRP"),
+ },
+ .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+ SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
+ },
+ {
+ /*
+ * This is only a partial board_name and might be followed by
+ * another letter or number. DMI_MATCH however does do partial
+ * matching.
+ */
+ .matches = {
+ DMI_MATCH(DMI_PRODUCT_NAME, "P65_P67H"),
+ },
+ .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+ SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
+ },
+ {
+ /*
+ * This is only a partial board_name and might be followed by
+ * another letter or number. DMI_MATCH however does do partial
+ * matching.
+ */
+ .matches = {
+ DMI_MATCH(DMI_PRODUCT_NAME, "P65_67RP"),
+ },
+ .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+ SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
+ },
+ {
+ /*
+ * This is only a partial board_name and might be followed by
+ * another letter or number. DMI_MATCH however does do partial
+ * matching.
+ */
+ .matches = {
+ DMI_MATCH(DMI_PRODUCT_NAME, "P65_67RS"),
+ },
+ .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+ SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
+ },
+ {
+ /*
+ * This is only a partial board_name and might be followed by
+ * another letter or number. DMI_MATCH however does do partial
+ * matching.
+ */
+ .matches = {
+ DMI_MATCH(DMI_PRODUCT_NAME, "P67xRP"),
+ },
+ .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"),
--
2.34.1

2022-07-08 20:07:21

by Hans de Goede

Subject: Re: [PATCH 1/2] Input: i8042 - add additional TUXEDO devices to i8042 quirk tables

Hi,

On 7/8/22 18:10, Werner Sembach wrote:
> 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.
>
> Signed-off-by: Werner Sembach <[email protected]>
> Cc: [email protected]

Thanks, patch looks good to me:

Reviewed-by: Hans de Goede <[email protected]>

Regards,

Hans



> ---
> drivers/input/serio/i8042-x86ia64io.h | 76 ++++++++++++++++++++++++---
> 1 file changed, 68 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
> index 50b090e77fca..5204a7dd61d4 100644
> --- a/drivers/input/serio/i8042-x86ia64io.h
> +++ b/drivers/input/serio/i8042-x86ia64io.h
> @@ -900,14 +900,6 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = {
> },
> .driver_data = (void *)(SERIO_QUIRK_NOMUX)
> },
> - {
> - /* Clevo P650RS, 650RP6, Sager NP8152-S, and others */
> - .matches = {
> - DMI_MATCH(DMI_SYS_VENDOR, "Notebook"),
> - DMI_MATCH(DMI_PRODUCT_NAME, "P65xRP"),
> - },
> - .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS)
> - },
> {
> /* OQO Model 01 */
> .matches = {
> @@ -1162,6 +1154,74 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = {
> .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
> SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
> },
> + {
> + /*
> + * This is only a partial board_name and might be followed by
> + * another letter or number. DMI_MATCH however does do partial
> + * matching.
> + */
> + .matches = {
> + DMI_MATCH(DMI_PRODUCT_NAME, "P65xH"),
> + },
> + .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
> + SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
> + },
> + {
> + /* Clevo P650RS, 650RP6, Sager NP8152-S, and others */
> + .matches = {
> + DMI_MATCH(DMI_PRODUCT_NAME, "P65xRP"),
> + },
> + .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
> + SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
> + },
> + {
> + /*
> + * This is only a partial board_name and might be followed by
> + * another letter or number. DMI_MATCH however does do partial
> + * matching.
> + */
> + .matches = {
> + DMI_MATCH(DMI_PRODUCT_NAME, "P65_P67H"),
> + },
> + .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
> + SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
> + },
> + {
> + /*
> + * This is only a partial board_name and might be followed by
> + * another letter or number. DMI_MATCH however does do partial
> + * matching.
> + */
> + .matches = {
> + DMI_MATCH(DMI_PRODUCT_NAME, "P65_67RP"),
> + },
> + .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
> + SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
> + },
> + {
> + /*
> + * This is only a partial board_name and might be followed by
> + * another letter or number. DMI_MATCH however does do partial
> + * matching.
> + */
> + .matches = {
> + DMI_MATCH(DMI_PRODUCT_NAME, "P65_67RS"),
> + },
> + .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
> + SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
> + },
> + {
> + /*
> + * This is only a partial board_name and might be followed by
> + * another letter or number. DMI_MATCH however does do partial
> + * matching.
> + */
> + .matches = {
> + DMI_MATCH(DMI_PRODUCT_NAME, "P67xRP"),
> + },
> + .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"),

2022-07-08 20:47:53

by Dmitry Torokhov

Subject: Re: [PATCH 1/2] Input: i8042 - add additional TUXEDO devices to i8042 quirk tables

On Fri, Jul 08, 2022 at 06:10:04PM +0200, Werner Sembach wrote:
> 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.
>
> Signed-off-by: Werner Sembach <[email protected]>
> Cc: [email protected]

Applied, thank you.

--
Dmitry