Skip to content

Commit

Permalink
Input: psmouse - limit protocols that we try on passthrough ports
Browse files Browse the repository at this point in the history
PS/2 protocol is slow, and using it with pass-through port (where we
encapsulate PS/2 into PS/2) is slower yet so it takes quite a bit of time
to do full protocol discovery for device attached to a pass-through port.
However, so far we have not see anything but trackpoints or basic PS/2
mice on pass-through ports, so let's limit protocols that we probe there
to Trackpoint, IntelliMouse Explorer, IntelliMouse, and bare PS/2 protocol,
and avoid other extended protocols, such as Synaptics, ALPS, etc.

Reviewed-by: Hans de Goede <[email protected]>
Reviewed-by: Pali Rohár <[email protected]>
Tested-by: Marcin Sochacki <[email protected]>
Tested-by: Till <[email protected]>
Signed-off-by: Dmitry Torokhov <[email protected]>
  • Loading branch information
dtor committed Dec 17, 2015
1 parent c378b51 commit ec6184b
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions drivers/input/mouse/psmouse-base.c
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ struct psmouse_protocol {
enum psmouse_type type;
bool maxproto;
bool ignore_parity; /* Protocol should ignore parity errors from KBC */
bool try_passthru; /* Try protocol also on passthrough ports */
const char *name;
const char *alias;
int (*detect)(struct psmouse *, bool);
Expand Down Expand Up @@ -691,6 +692,7 @@ static const struct psmouse_protocol psmouse_protocols[] = {
.maxproto = true,
.ignore_parity = true,
.detect = ps2bare_detect,
.try_passthru = true,
},
#ifdef CONFIG_MOUSE_PS2_LOGIPS2PP
{
Expand Down Expand Up @@ -728,6 +730,7 @@ static const struct psmouse_protocol psmouse_protocols[] = {
.maxproto = true,
.ignore_parity = true,
.detect = intellimouse_detect,
.try_passthru = true,
},
{
.type = PSMOUSE_IMEX,
Expand All @@ -736,6 +739,7 @@ static const struct psmouse_protocol psmouse_protocols[] = {
.maxproto = true,
.ignore_parity = true,
.detect = im_explorer_detect,
.try_passthru = true,
},
#ifdef CONFIG_MOUSE_PS2_SYNAPTICS
{
Expand Down Expand Up @@ -777,6 +781,7 @@ static const struct psmouse_protocol psmouse_protocols[] = {
.name = "TPPS/2",
.alias = "trackpoint",
.detect = trackpoint_detect,
.try_passthru = true,
},
#endif
#ifdef CONFIG_MOUSE_PS2_TOUCHKIT
Expand Down Expand Up @@ -933,6 +938,11 @@ static bool psmouse_try_protocol(struct psmouse *psmouse,
if (!proto)
return false;

if (psmouse->ps2dev.serio->id.type == SERIO_PS_PSTHRU &&
!proto->try_passthru) {
return false;
}

if (set_properties)
psmouse_apply_defaults(psmouse);

Expand Down

0 comments on commit ec6184b

Please sign in to comment.