psm - disable PS2 multiplexing based on kbdc quirks

mneumann · mneumann · commit b6ec1c5c48be · 2025-05-31T22:28:29.000+02:00
hw.psm.mux_disabled now defaults to -1, in which case the quirks are
taken into account.

Taken-from: FreeBSD
diff --git a/sys/dev/misc/psm/psm.c b/sys/dev/misc/psm/psm.c
@@ -531,7 +531,7 @@ static int verbose = PSM_DEBUG;
 static int synaptics_support = 1;
 static int trackpoint_support = 1;
 static int elantech_support = 1;
-static int mux_disabled = 0;
+static int mux_disabled = -1;
 
 TUNABLE_INT("hw.psm.tap_enabled", &tap_enabled);
 TUNABLE_INT("debug.psm.loglevel", &verbose);
@@ -6322,7 +6322,8 @@ enable_synaptics_mux(struct psm_softc *sc, enum probearg arg)
 
 	sc->muxsinglesyna = FALSE;
 
-	if (mux_disabled != 0)
+	if (mux_disabled == 1 || (mux_disabled == -1 &&
+	    (kbdc->quirks & KBDC_QUIRK_DISABLE_MUX_PROBE) != 0))
 		return (FALSE);
 
 	version = enable_aux_mux(kbdc);
