Message ID | 20220329143622.31394-5-wse@tuxedocomputers.com (mailing list archive) |
---|---|
State | Under Review |
Headers | show |
Series | [v5,1/4] input/i8042: Move __initconst to fix code styling warning | expand |
Hi Werner, On Tue, Mar 29, 2022 at 04:36:22PM +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. > > 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> > Cc: stable@vger.kernel.org > --- > drivers/input/serio/i8042-x86ia64io.h | 125 ++++++++++++++++++++++++++ > 1 file changed, 125 insertions(+) > > diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h > index 5c0eb5594fb1..a59c6aba7c75 100644 > --- a/drivers/input/serio/i8042-x86ia64io.h > +++ b/drivers/input/serio/i8042-x86ia64io.h > @@ -1025,6 +1025,25 @@ 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 savely be set for s/savely/safely/ > + * 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"), > + }, Don't you need to set driver_data here and below? > + }, > + { > + .matches = { > + DMI_MATCH(DMI_BOARD_VENDOR, "TUXEDO"), > + DMI_MATCH(DMI_BOARD_NAME, "EDUBOOK1502"), > + }, > + }, > { > /* Mivvy M310 */ > .matches = { > @@ -1054,6 +1073,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 savely be set for safely > + * 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 save to just ignore all ps2 mouses here to avoid safe > + * this issue. The know affected device is the known > + * 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) > + }, > { } > }; > > -- > 2.25.1 > Thanks.
On 6/29/22 07:36, Dmitry Torokhov wrote: > Hi Werner, > > On Tue, Mar 29, 2022 at 04:36:22PM +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. >> >> 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> >> Cc: stable@vger.kernel.org >> --- >> drivers/input/serio/i8042-x86ia64io.h | 125 ++++++++++++++++++++++++++ >> 1 file changed, 125 insertions(+) >> >> diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h >> index 5c0eb5594fb1..a59c6aba7c75 100644 >> --- a/drivers/input/serio/i8042-x86ia64io.h >> +++ b/drivers/input/serio/i8042-x86ia64io.h >> @@ -1025,6 +1025,25 @@ 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 savely be set for > s/savely/safely/ > >> + * 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"), >> + }, > Don't you need to set driver_data here and below? > >> + }, >> + { >> + .matches = { >> + DMI_MATCH(DMI_BOARD_VENDOR, "TUXEDO"), >> + DMI_MATCH(DMI_BOARD_NAME, "EDUBOOK1502"), >> + }, >> + }, >> { >> /* Mivvy M310 */ >> .matches = { >> @@ -1054,6 +1073,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 savely be set for > safely > >> + * 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 save to just ignore all ps2 mouses here to avoid > safe > >> + * this issue. The know affected device is the > known > >> + * 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) >> + }, >> { } >> }; >> >> -- >> 2.25.1 >> > Thanks. > Everything applied in v6, thanks for the feedback.
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index 5c0eb5594fb1..a59c6aba7c75 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h @@ -1025,6 +1025,25 @@ 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 savely 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"), + }, + }, + { + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "TUXEDO"), + DMI_MATCH(DMI_BOARD_NAME, "EDUBOOK1502"), + }, + }, { /* Mivvy M310 */ .matches = { @@ -1054,6 +1073,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 savely 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 save to just ignore all ps2 mouses here to avoid + * this issue. The know 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) + }, { } };
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> Cc: stable@vger.kernel.org --- drivers/input/serio/i8042-x86ia64io.h | 125 ++++++++++++++++++++++++++ 1 file changed, 125 insertions(+)