[PATCH] input: psmouse: create an 'enabled' sysfs attribute to squelch mouse

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

From: Paul Fox <pgf@xxxxxxxxxx>

on OLPC XO laptops, at least one model of touchpad (sentelic)
emits continuous jittery motion reports when the laptop is
configured in "ebook" mode.  the touchpad is inaccessible in
that configuration, so we simply disable it.

these motion reports will wake the SoC when put to sleep, so simply
ignoring the events is not a possibilty; the device must be disabled.

[dilinger@xxxxxxxxxx: drop psmouse_resync changes, add attribute comment,
 and add psmouse_cleanup workaround]

Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
 drivers/input/mouse/psmouse-base.c |   20 ++++++++++++++++++--
 drivers/input/mouse/psmouse.h      |    1 +
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index 22fe254..a115534 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -87,6 +87,13 @@ PSMOUSE_DEFINE_ATTR(resetafter, S_IWUSR | S_IRUGO,
 			(void *) offsetof(struct psmouse, resync_time),
 			psmouse_show_int_attr, psmouse_set_int_attr);
+ * There's no need for a custom handler for the 'enabled' attr;
+ * psmouse_attr_set_helper will take care of disabling and enabling for us.
+ */
+			(void *) offsetof(struct psmouse, enabled),
+			psmouse_show_int_attr, psmouse_set_int_attr);
 static struct attribute *psmouse_attributes[] = {
@@ -94,6 +101,7 @@ static struct attribute *psmouse_attributes[] = {
+	&psmouse_attr_enabled.dattr.attr,
@@ -1094,6 +1102,9 @@ static void psmouse_initialize(struct psmouse *psmouse)
 int psmouse_activate(struct psmouse *psmouse)
+	if (!psmouse->enabled)
+		return 0;
 	if (ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_ENABLE)) {
 		psmouse_warn(psmouse, "Failed to enable mouse on %s\n",
@@ -1256,7 +1267,8 @@ static void psmouse_cleanup(struct serio *serio)
  * Some boxes, such as HP nx7400, get terribly confused if mouse
  * is not fully enabled before suspending/shutting down.
-	ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_ENABLE);
+	if (psmouse->enabled)
+		ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_ENABLE);
 	if (parent) {
 		if (parent->pt_deactivate)
@@ -1418,6 +1430,7 @@ static int psmouse_connect(struct serio *serio, struct serio_driver *drv)
 	psmouse->resolution = psmouse_resolution;
 	psmouse->resetafter = psmouse_resetafter;
 	psmouse->resync_time = parent ? 0 : psmouse_resync_time;
+	psmouse->enabled = true;
 	psmouse->smartscroll = psmouse_smartscroll;
 	psmouse_switch_protocol(psmouse, NULL);
@@ -1516,7 +1529,10 @@ static int psmouse_reconnect(struct serio *serio)
 	if (parent && parent->pt_activate)
-	psmouse_activate(psmouse);
+	if (psmouse->enabled)
+		psmouse_activate(psmouse);
+	else
+		psmouse_deactivate(psmouse);
 	rc = 0;
diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
index fe1df23..aa30321 100644
--- a/drivers/input/mouse/psmouse.h
+++ b/drivers/input/mouse/psmouse.h
@@ -62,6 +62,7 @@ struct psmouse {
 	unsigned int resolution;
 	unsigned int resetafter;
 	unsigned int resync_time;
+	bool enabled;
 	bool smartscroll;	/* Logitech only */
 	psmouse_ret_t (*protocol_handler)(struct psmouse *psmouse);

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[Other Archives]     [Linux Kernel Newbies]     [Linux Driver Development]     [Fedora Kernel]     [Linux Kernel Testers]     [Linux SH]     [Linux Omap]     [Linux Kbuild]     [Linux Tape]     [Linux Input]     [Linux Kernel Janitors]     [Linux Kernel Packagers]     [Linux Doc]     [Linux Man Pages]     [Linux API]     [Linux Memory Management]     [Linux Modules]     [Linux Standards]     [Kernel Announce]     [Netdev]     [Git]     [Linux PCI]     Linux CAN Development     [Linux I2C]     [Linux RDMA]     [Linux NUMA]     [Netfilter]     [Netfilter Devel]     [SELinux]     [Bugtraq]     [FIO]     [Linux Perf Users]     [Linux Serial]     [Linux PPP]     [Linux ISDN]     [Linux Next]     [Kernel Stable Commits]     [Linux Tip Commits]     [Kernel MM Commits]     [Linux Security Module]     [Filesystem Development]     [Ext3 Filesystem]     [Linux bcache]     [Ext4 Filesystem]     [Linux BTRFS]     [Linux CEPH Filesystem]     [Linux XFS]     [XFS]     [Linux NFS]     [Linux CIFS]     [Ecryptfs]     [Linux NILFS]     [Linux Cachefs]     [Reiser FS]     [Initramfs]     [Linux FB Devel]     [Linux OpenGL]     [DRI Devel]     [Fastboot]     [Linux RT Users]     [Linux RT Stable]     [eCos]     [Corosync]     [Linux Clusters]     [LVS Devel]     [Hot Plug]     [Linux Virtualization]     [KVM]     [KVM PPC]     [KVM ia64]     [Linux Containers]     [Linux Hexagon]     [Linux Cgroups]     [Util Linux]     [Wireless]     [Linux Bluetooth]     [Bluez Devel]     [Ethernet Bridging]     [Embedded Linux]     [Barebox]     [Linux MMC]     [Linux IIO]     [Sparse]     [Smatch]     [Linux Arch]     [x86 Platform Driver]     [Linux ACPI]     [Linux IBM ACPI]     [LM Sensors]     [CPU Freq]     [Linux Power Management]     [Linmodems]     [Linux DCCP]     [Linux SCTP]     [ALSA Devel]     [Linux USB]     [Linux PA RISC]     [Linux Samsung SOC]     [MIPS Linux]     [IBM S/390 Linux]     [ARM Linux]     [ARM Kernel]     [ARM MSM]     [Tegra Devel]     [Sparc Linux]     [Linux Security]     [Linux Sound]     [Linux Media]     [Video 4 Linux]     [Linux IRDA Users]     [Linux for the blind]     [Linux RAID]     [Linux ATA RAID]     [Device Mapper]     [Linux SCSI]     [SCSI Target Devel]     [Linux SCSI Target Infrastructure]     [Linux IDE]     [Linux SMP]     [Linux AXP]     [Linux Alpha]     [Linux M68K]     [Linux ia64]     [Linux 8086]     [Linux x86_64]     [Linux Config]     [Linux Apps]     [Linux MSDOS]     [Linux X.25]     [Linux Crypto]     [DM Crypt]     [Linux Trace Users]     [Linux Btrace]     [Linux Watchdog]     [Utrace Devel]     [Linux C Programming]     [Linux Assembly]     [Dash]     [DWARVES]     [Hail Devel]     [Linux Kernel Debugger]     [Linux gcc]     [Gcc Help]     [X.Org]     [Wine]

Add to Google Powered by Linux

[Older Kernel Discussion]     [Yosemite National Park Forum]     [Large Format Photos]     [Gimp]     [Yosemite Photos]     [Stuff]