| Message ID | 20180612070906.5305-1-aaron.ma@canonical.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, Jun 12, 2018 at 9:10 AM Aaron Ma <aaron.ma@canonical.com> wrote: > > PNPID is better way to identify the type of touchpads. > Enable middle button support on 2 types of touchpads on Lenovo P52. > > Cc: stable@vger.kernel.org > Cc: KT Liao <kt.liao@emc.com.tw> > Signed-off-by: Aaron Ma <aaron.ma@canonical.com> > --- > drivers/input/mouse/elantech.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) Looks good to me: Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Aaron, our internal tests show that the P52 shows a lot of lost synchronization in pre-v4.18 kernels. Do you have a fix for that too? In v4.18 we need to fix the elan_i2c module as right now the touchpad is muted when booted with such a kernel. Cheers, Benjamin > > diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c > index fb4d902c4403..67b061dd4494 100644 > --- a/drivers/input/mouse/elantech.c > +++ b/drivers/input/mouse/elantech.c > @@ -1175,6 +1175,12 @@ static const struct dmi_system_id elantech_dmi_has_middle_button[] = { > { } > }; > > +static const char * const middle_button_pnp_ids[] = { > + "LEN2131", /* ThinkPad P52 w/ NFC */ > + "LEN2132", /* ThinkPad P52 */ > + NULL > +}; > + > /* > * Set the appropriate event bits for the input subsystem > */ > @@ -1194,7 +1200,8 @@ static int elantech_set_input_params(struct psmouse *psmouse) > __clear_bit(EV_REL, dev->evbit); > > __set_bit(BTN_LEFT, dev->keybit); > - if (dmi_check_system(elantech_dmi_has_middle_button)) > + if (dmi_check_system(elantech_dmi_has_middle_button) || > + psmouse_matches_pnp_id(psmouse, middle_button_pnp_ids)) > __set_bit(BTN_MIDDLE, dev->keybit); > __set_bit(BTN_RIGHT, dev->keybit); > > -- > 2.17.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-input" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 06/19/2018 08:21 PM, Benjamin Tissoires wrote: > On Tue, Jun 12, 2018 at 9:10 AM Aaron Ma <aaron.ma@canonical.com> wrote: >> PNPID is better way to identify the type of touchpads. >> Enable middle button support on 2 types of touchpads on Lenovo P52. >> >> Cc: stable@vger.kernel.org >> Cc: KT Liao <kt.liao@emc.com.tw> >> Signed-off-by: Aaron Ma <aaron.ma@canonical.com> >> --- >> drivers/input/mouse/elantech.c | 9 ++++++++- >> 1 file changed, 8 insertions(+), 1 deletion(-) > Looks good to me: > Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> > > Aaron, our internal tests show that the P52 shows a lot of lost > synchronization in pre-v4.18 kernels. Do you have a fix for that too? > https://lkml.org/lkml/2018/5/28/694 should fix the sync issue. > In v4.18 we need to fix the elan_i2c module as right now the touchpad > is muted when booted with such a kernel. Does this touchpad support elan_i2c? Regards, Aaron > > Cheers, > Benjamin > >> diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c >> index fb4d902c4403..67b061dd4494 100644 >> --- a/drivers/input/mouse/elantech.c >> +++ b/drivers/input/mouse/elantech.c >> @@ -1175,6 +1175,12 @@ static const struct dmi_system_id elantech_dmi_has_middle_button[] = { >> { } >> }; >> >> +static const char * const middle_button_pnp_ids[] = { >> + "LEN2131", /* ThinkPad P52 w/ NFC */ >> + "LEN2132", /* ThinkPad P52 */ >> + NULL >> +}; >> + >> /* >> * Set the appropriate event bits for the input subsystem >> */ >> @@ -1194,7 +1200,8 @@ static int elantech_set_input_params(struct psmouse *psmouse) >> __clear_bit(EV_REL, dev->evbit); >> >> __set_bit(BTN_LEFT, dev->keybit); >> - if (dmi_check_system(elantech_dmi_has_middle_button)) >> + if (dmi_check_system(elantech_dmi_has_middle_button) || >> + psmouse_matches_pnp_id(psmouse, middle_button_pnp_ids)) >> __set_bit(BTN_MIDDLE, dev->keybit); >> __set_bit(BTN_RIGHT, dev->keybit); >> >> -- >> 2.17.1 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-input" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Jun 19, 2018 at 3:13 PM Aaron Ma <aaron.ma@canonical.com> wrote: > > On 06/19/2018 08:21 PM, Benjamin Tissoires wrote: > > On Tue, Jun 12, 2018 at 9:10 AM Aaron Ma <aaron.ma@canonical.com> wrote: > >> PNPID is better way to identify the type of touchpads. > >> Enable middle button support on 2 types of touchpads on Lenovo P52. > >> > >> Cc: stable@vger.kernel.org > >> Cc: KT Liao <kt.liao@emc.com.tw> > >> Signed-off-by: Aaron Ma <aaron.ma@canonical.com> > >> --- > >> drivers/input/mouse/elantech.c | 9 ++++++++- > >> 1 file changed, 8 insertions(+), 1 deletion(-) > > Looks good to me: > > Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> > > > > Aaron, our internal tests show that the P52 shows a lot of lost > > synchronization in pre-v4.18 kernels. Do you have a fix for that too? > > > > https://lkml.org/lkml/2018/5/28/694 > should fix the sync issue. Thanks for the pointer :) I have missed that one. > > > > In v4.18 we need to fix the elan_i2c module as right now the touchpad > > is muted when booted with such a kernel. > > Does this touchpad support elan_i2c? Yes it does. And starting from v4.18 the touchpad will switch to elan_i2c by default. However, I'll have to provide some fixes as some elan_i2c commands are not working :( Cheers, Benjamin > > Regards, > Aaron > > > > > Cheers, > > Benjamin > > > >> diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c > >> index fb4d902c4403..67b061dd4494 100644 > >> --- a/drivers/input/mouse/elantech.c > >> +++ b/drivers/input/mouse/elantech.c > >> @@ -1175,6 +1175,12 @@ static const struct dmi_system_id elantech_dmi_has_middle_button[] = { > >> { } > >> }; > >> > >> +static const char * const middle_button_pnp_ids[] = { > >> + "LEN2131", /* ThinkPad P52 w/ NFC */ > >> + "LEN2132", /* ThinkPad P52 */ > >> + NULL > >> +}; > >> + > >> /* > >> * Set the appropriate event bits for the input subsystem > >> */ > >> @@ -1194,7 +1200,8 @@ static int elantech_set_input_params(struct psmouse *psmouse) > >> __clear_bit(EV_REL, dev->evbit); > >> > >> __set_bit(BTN_LEFT, dev->keybit); > >> - if (dmi_check_system(elantech_dmi_has_middle_button)) > >> + if (dmi_check_system(elantech_dmi_has_middle_button) || > >> + psmouse_matches_pnp_id(psmouse, middle_button_pnp_ids)) > >> __set_bit(BTN_MIDDLE, dev->keybit); > >> __set_bit(BTN_RIGHT, dev->keybit); > >> > >> -- > >> 2.17.1 > >> > >> -- > >> To unsubscribe from this list: send the line "unsubscribe linux-input" in > >> the body of a message to majordomo@vger.kernel.org > >> More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index fb4d902c4403..67b061dd4494 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c @@ -1175,6 +1175,12 @@ static const struct dmi_system_id elantech_dmi_has_middle_button[] = { { } }; +static const char * const middle_button_pnp_ids[] = { + "LEN2131", /* ThinkPad P52 w/ NFC */ + "LEN2132", /* ThinkPad P52 */ + NULL +}; + /* * Set the appropriate event bits for the input subsystem */ @@ -1194,7 +1200,8 @@ static int elantech_set_input_params(struct psmouse *psmouse) __clear_bit(EV_REL, dev->evbit); __set_bit(BTN_LEFT, dev->keybit); - if (dmi_check_system(elantech_dmi_has_middle_button)) + if (dmi_check_system(elantech_dmi_has_middle_button) || + psmouse_matches_pnp_id(psmouse, middle_button_pnp_ids)) __set_bit(BTN_MIDDLE, dev->keybit); __set_bit(BTN_RIGHT, dev->keybit);
PNPID is better way to identify the type of touchpads. Enable middle button support on 2 types of touchpads on Lenovo P52. Cc: stable@vger.kernel.org Cc: KT Liao <kt.liao@emc.com.tw> Signed-off-by: Aaron Ma <aaron.ma@canonical.com> --- drivers/input/mouse/elantech.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)