Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git] / drivers / input / mouse / psmouse-base.c
index 0b38267..136321a 100644 (file)
@@ -2,6 +2,7 @@
  * PS/2 mouse driver
  *
  * Copyright (c) 1999-2002 Vojtech Pavlik
+ * Copyright (c) 2003-2004 Dmitry Torokhov
  */
 
 /*
 #include <linux/input.h>
 #include <linux/serio.h>
 #include <linux/init.h>
+#include <linux/libps2.h>
+#include <linux/mutex.h>
+
 #include "psmouse.h"
 #include "synaptics.h"
 #include "logips2pp.h"
+#include "alps.h"
+#include "lifebook.h"
+#include "trackpoint.h"
+
+#define DRIVER_DESC    "PS/2 mouse driver"
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>");
-MODULE_DESCRIPTION("PS/2 mouse driver");
+MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
 
-static char *psmouse_proto;
-static unsigned int psmouse_max_proto = -1U;
-module_param_named(proto, psmouse_proto, charp, 0);
-MODULE_PARM_DESC(proto, "Highest protocol extension to probe (bare, imps, exps). Useful for KVM switches.");
-
-int psmouse_resolution = 200;
-module_param_named(resolution, psmouse_resolution, uint, 0);
+static unsigned int psmouse_max_proto = PSMOUSE_AUTO;
+static int psmouse_set_maxproto(const char *val, struct kernel_param *kp);
+static int psmouse_get_maxproto(char *buffer, struct kernel_param *kp);
+#define param_check_proto_abbrev(name, p)      __param_check(name, p, unsigned int)
+#define param_set_proto_abbrev                 psmouse_set_maxproto
+#define param_get_proto_abbrev                 psmouse_get_maxproto
+module_param_named(proto, psmouse_max_proto, proto_abbrev, 0644);
+MODULE_PARM_DESC(proto, "Highest protocol extension to probe (bare, imps, exps, any). Useful for KVM switches.");
+
+static unsigned int psmouse_resolution = 200;
+module_param_named(resolution, psmouse_resolution, uint, 0644);
 MODULE_PARM_DESC(resolution, "Resolution, in dpi.");
 
-unsigned int psmouse_rate = 100;
-module_param_named(rate, psmouse_rate, uint, 0);
+static unsigned int psmouse_rate = 100;
+module_param_named(rate, psmouse_rate, uint, 0644);
 MODULE_PARM_DESC(rate, "Report rate, in reports per second.");
 
-int psmouse_smartscroll = 1;
-module_param_named(smartscroll, psmouse_smartscroll, bool, 0);
+static unsigned int psmouse_smartscroll = 1;
+module_param_named(smartscroll, psmouse_smartscroll, bool, 0644);
 MODULE_PARM_DESC(smartscroll, "Logitech Smartscroll autorepeat, 1 = enabled (default), 0 = disabled.");
 
-static unsigned int psmouse_resetafter;
-module_param_named(resetafter, psmouse_resetafter, uint, 0);
+static unsigned int psmouse_resetafter = 5;
+module_param_named(resetafter, psmouse_resetafter, uint, 0644);
 MODULE_PARM_DESC(resetafter, "Reset device after so many bad packets (0 = never).");
 
+static unsigned int psmouse_resync_time;
+module_param_named(resync_time, psmouse_resync_time, uint, 0644);
+MODULE_PARM_DESC(resync_time, "How long can mouse stay idle before forcing resync (in seconds, 0 = never).");
+
+PSMOUSE_DEFINE_ATTR(protocol, S_IWUSR | S_IRUGO,
+                       NULL,
+                       psmouse_attr_show_protocol, psmouse_attr_set_protocol);
+PSMOUSE_DEFINE_ATTR(rate, S_IWUSR | S_IRUGO,
+                       (void *) offsetof(struct psmouse, rate),
+                       psmouse_show_int_attr, psmouse_attr_set_rate);
+PSMOUSE_DEFINE_ATTR(resolution, S_IWUSR | S_IRUGO,
+                       (void *) offsetof(struct psmouse, resolution),
+                       psmouse_show_int_attr, psmouse_attr_set_resolution);
+PSMOUSE_DEFINE_ATTR(resetafter, S_IWUSR | S_IRUGO,
+                       (void *) offsetof(struct psmouse, resetafter),
+                       psmouse_show_int_attr, psmouse_set_int_attr);
+PSMOUSE_DEFINE_ATTR(resync_time, S_IWUSR | S_IRUGO,
+                       (void *) offsetof(struct psmouse, resync_time),
+                       psmouse_show_int_attr, psmouse_set_int_attr);
+
+static struct attribute *psmouse_attributes[] = {
+       &psmouse_attr_protocol.dattr.attr,
+       &psmouse_attr_rate.dattr.attr,
+       &psmouse_attr_resolution.dattr.attr,
+       &psmouse_attr_resetafter.dattr.attr,
+       &psmouse_attr_resync_time.dattr.attr,
+       NULL
+};
+
+static struct attribute_group psmouse_attribute_group = {
+       .attrs  = psmouse_attributes,
+};
+
 __obsolete_setup("psmouse_noext");
 __obsolete_setup("psmouse_resolution=");
 __obsolete_setup("psmouse_smartscroll=");
 __obsolete_setup("psmouse_resetafter=");
 __obsolete_setup("psmouse_rate=");
 
-static char *psmouse_protocols[] = { "None", "PS/2", "PS2++", "PS2T++", "GenPS/2", "ImPS/2", "ImExPS/2", "SynPS/2"};
+/*
+ * psmouse_mutex protects all operations changing state of mouse
+ * (connecting, disconnecting, changing rate or resolution via
+ * sysfs). We could use a per-device semaphore but since there
+ * rarely more than one PS/2 mouse connected and since semaphore
+ * is taken in "slow" paths it is not worth it.
+ */
+static DEFINE_MUTEX(psmouse_mutex);
+
+static struct workqueue_struct *kpsmoused_wq;
+
+struct psmouse_protocol {
+       enum psmouse_type type;
+       char *name;
+       char *alias;
+       int maxproto;
+       int (*detect)(struct psmouse *, int);
+       int (*init)(struct psmouse *);
+};
 
 /*
  * psmouse_process_byte() analyzes the PS/2 data stream and reports
@@ -62,10 +126,10 @@ static char *psmouse_protocols[] = { "None", "PS/2", "PS2++", "PS2T++", "GenPS/2
 
 static psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse, struct pt_regs *regs)
 {
-       struct input_dev *dev = &psmouse->dev;
+       struct input_dev *dev = psmouse->dev;
        unsigned char *packet = psmouse->packet;
 
-       if (psmouse->pktcnt < 3 + (psmouse->type >= PSMOUSE_GENPS))
+       if (psmouse->pktcnt < psmouse->pktsize)
                return PSMOUSE_GOOD_DATA;
 
 /*
@@ -74,13 +138,6 @@ static psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse, struct pt_reg
 
        input_regs(dev, regs);
 
-/*
- * The PS2++ protocol is a little bit complex
- */
-
-       if (psmouse->type == PSMOUSE_PS2PP || psmouse->type == PSMOUSE_PS2TPP)
-               ps2pp_process_packet(psmouse);
-
 /*
  * Scroll wheel on IntelliMice, scroll buttons on NetMice
  */
@@ -107,6 +164,15 @@ static psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse, struct pt_reg
                input_report_key(dev, BTN_EXTRA, (packet[0] >> 7) & 1);
        }
 
+/*
+ * Extra button on ThinkingMouse
+ */
+       if (psmouse->type == PSMOUSE_THINKPS) {
+               input_report_key(dev, BTN_EXTRA, (packet[0] >> 3) & 1);
+               /* Without this bit of weirdness moving up gives wildly high Y changes. */
+               packet[1] |= (packet[0] & 0x40) << 1;
+       }
+
 /*
  * Generic PS/2 Mouse
  */
@@ -124,98 +190,53 @@ static psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse, struct pt_reg
 }
 
 /*
- * psmouse_interrupt() handles incoming characters, either gathering them into
- * packets or passing them to the command routine as command output.
+ * __psmouse_set_state() sets new psmouse state and resets all flags.
  */
 
-static irqreturn_t psmouse_interrupt(struct serio *serio,
-               unsigned char data, unsigned int flags, struct pt_regs *regs)
+static inline void __psmouse_set_state(struct psmouse *psmouse, enum psmouse_state new_state)
 {
-       struct psmouse *psmouse = serio->private;
-       psmouse_ret_t rc;
-
-       if (psmouse->state == PSMOUSE_IGNORE)
-               goto out;
-
-       if (flags & (SERIO_PARITY|SERIO_TIMEOUT)) {
-               if (psmouse->state == PSMOUSE_ACTIVATED)
-                       printk(KERN_WARNING "psmouse.c: bad data from KBC -%s%s\n",
-                               flags & SERIO_TIMEOUT ? " timeout" : "",
-                               flags & SERIO_PARITY ? " bad parity" : "");
-               if (psmouse->acking) {
-                       psmouse->ack = -1;
-                       psmouse->acking = 0;
-               }
-               psmouse->pktcnt = 0;
-               goto out;
-       }
-
-       if (psmouse->acking) {
-               switch (data) {
-                       case PSMOUSE_RET_ACK:
-                               psmouse->ack = 1;
-                               break;
-                       case PSMOUSE_RET_NAK:
-                               psmouse->ack = -1;
-                               break;
-                       default:
-                               psmouse->ack = 1;       /* Workaround for mice which don't ACK the Get ID command */
-                               if (psmouse->cmdcnt)
-                                       psmouse->cmdbuf[--psmouse->cmdcnt] = data;
-                               break;
-               }
-               psmouse->acking = 0;
-               goto out;
-       }
-
-       if (psmouse->cmdcnt) {
-               psmouse->cmdbuf[--psmouse->cmdcnt] = data;
-               goto out;
-       }
+       psmouse->state = new_state;
+       psmouse->pktcnt = psmouse->out_of_sync = 0;
+       psmouse->ps2dev.flags = 0;
+       psmouse->last = jiffies;
+}
 
-       if (psmouse->state == PSMOUSE_ACTIVATED &&
-           psmouse->pktcnt && time_after(jiffies, psmouse->last + HZ/2)) {
-               printk(KERN_WARNING "psmouse.c: %s at %s lost synchronization, throwing %d bytes away.\n",
-                      psmouse->name, psmouse->phys, psmouse->pktcnt);
-               psmouse->pktcnt = 0;
-       }
 
-       psmouse->last = jiffies;
-       psmouse->packet[psmouse->pktcnt++] = data;
+/*
+ * psmouse_set_state() sets new psmouse state and resets all flags and
+ * counters while holding serio lock so fighting with interrupt handler
+ * is not a concern.
+ */
 
-       if (psmouse->packet[0] == PSMOUSE_RET_BAT) {
-               if (psmouse->pktcnt == 1)
-                       goto out;
+static void psmouse_set_state(struct psmouse *psmouse, enum psmouse_state new_state)
+{
+       serio_pause_rx(psmouse->ps2dev.serio);
+       __psmouse_set_state(psmouse, new_state);
+       serio_continue_rx(psmouse->ps2dev.serio);
+}
 
-               if (psmouse->pktcnt == 2) {
-                       if (psmouse->packet[1] == PSMOUSE_RET_ID) {
-                               psmouse->state = PSMOUSE_IGNORE;
-                               serio_reconnect(serio);
-                               goto out;
-                       }
-                       if (psmouse->type == PSMOUSE_SYNAPTICS) {
-                               /* neither 0xAA nor 0x00 are valid first bytes
-                                * for a packet in absolute mode
-                                */
-                               psmouse->pktcnt = 0;
-                               goto out;
-                       }
-               }
-       }
+/*
+ * psmouse_handle_byte() processes one byte of the input data stream
+ * by calling corresponding protocol handler.
+ */
 
-       rc = psmouse->protocol_handler(psmouse, regs);
+static int psmouse_handle_byte(struct psmouse *psmouse, struct pt_regs *regs)
+{
+       psmouse_ret_t rc = psmouse->protocol_handler(psmouse, regs);
 
        switch (rc) {
                case PSMOUSE_BAD_DATA:
-                       printk(KERN_WARNING "psmouse.c: %s at %s lost sync at byte %d\n",
-                               psmouse->name, psmouse->phys, psmouse->pktcnt);
-                       psmouse->pktcnt = 0;
-
-                       if (++psmouse->out_of_sync == psmouse_resetafter) {
-                               psmouse->state = PSMOUSE_IGNORE;
-                               printk(KERN_NOTICE "psmouse.c: issuing reconnect request\n");
-                               serio_reconnect(psmouse->serio);
+                       if (psmouse->state == PSMOUSE_ACTIVATED) {
+                               printk(KERN_WARNING "psmouse.c: %s at %s lost sync at byte %d\n",
+                                       psmouse->name, psmouse->phys, psmouse->pktcnt);
+                               if (++psmouse->out_of_sync == psmouse->resetafter) {
+                                       __psmouse_set_state(psmouse, PSMOUSE_IGNORE);
+                                       printk(KERN_NOTICE "psmouse.c: issuing reconnect request\n");
+                                       serio_reconnect(psmouse->ps2dev.serio);
+                                       return -1;
+                               }
                        }
+                       psmouse->pktcnt = 0;
                        break;
 
                case PSMOUSE_FULL_PACKET:
@@ -230,84 +251,94 @@ static irqreturn_t psmouse_interrupt(struct serio *serio,
                case PSMOUSE_GOOD_DATA:
                        break;
        }
-out:
-       return IRQ_HANDLED;
-}
-
-/*
- * psmouse_sendbyte() sends a byte to the mouse, and waits for acknowledge.
- * It doesn't handle retransmission, though it could - because when there would
- * be need for retransmissions, the mouse has to be replaced anyway.
- */
-
-static int psmouse_sendbyte(struct psmouse *psmouse, unsigned char byte)
-{
-       int timeout = 10000; /* 100 msec */
-       psmouse->ack = 0;
-       psmouse->acking = 1;
-
-       if (serio_write(psmouse->serio, byte)) {
-               psmouse->acking = 0;
-               return -1;
-       }
-
-       while (!psmouse->ack && timeout--) udelay(10);
-
-       return -(psmouse->ack <= 0);
+       return 0;
 }
 
 /*
- * psmouse_command() sends a command and its parameters to the mouse,
- * then waits for the response and puts it in the param array.
+ * psmouse_interrupt() handles incoming characters, either passing them
+ * for normal processing or gathering them as command response.
  */
 
-int psmouse_command(struct psmouse *psmouse, unsigned char *param, int command)
+static irqreturn_t psmouse_interrupt(struct serio *serio,
+               unsigned char data, unsigned int flags, struct pt_regs *regs)
 {
-       int timeout = 500000; /* 500 msec */
-       int send = (command >> 12) & 0xf;
-       int receive = (command >> 8) & 0xf;
-       int i;
+       struct psmouse *psmouse = serio_get_drvdata(serio);
 
-       psmouse->cmdcnt = receive;
+       if (psmouse->state == PSMOUSE_IGNORE)
+               goto out;
 
-       if (command == PSMOUSE_CMD_RESET_BAT)
-                timeout = 4000000; /* 4 sec */
+       if (flags & (SERIO_PARITY|SERIO_TIMEOUT)) {
+               if (psmouse->state == PSMOUSE_ACTIVATED)
+                       printk(KERN_WARNING "psmouse.c: bad data from KBC -%s%s\n",
+                               flags & SERIO_TIMEOUT ? " timeout" : "",
+                               flags & SERIO_PARITY ? " bad parity" : "");
+               ps2_cmd_aborted(&psmouse->ps2dev);
+               goto out;
+       }
 
-       /* initialize cmdbuf with preset values from param */
-       if (receive)
-          for (i = 0; i < receive; i++)
-               psmouse->cmdbuf[(receive - 1) - i] = param[i];
+       if (unlikely(psmouse->ps2dev.flags & PS2_FLAG_ACK))
+               if  (ps2_handle_ack(&psmouse->ps2dev, data))
+                       goto out;
 
-       if (command & 0xff)
-               if (psmouse_sendbyte(psmouse, command & 0xff))
-                       return (psmouse->cmdcnt = 0) - 1;
+       if (unlikely(psmouse->ps2dev.flags & PS2_FLAG_CMD))
+               if  (ps2_handle_response(&psmouse->ps2dev, data))
+                       goto out;
 
-       for (i = 0; i < send; i++)
-               if (psmouse_sendbyte(psmouse, param[i]))
-                       return (psmouse->cmdcnt = 0) - 1;
+       if (psmouse->state <= PSMOUSE_RESYNCING)
+               goto out;
 
-       while (psmouse->cmdcnt && timeout--) {
+       if (psmouse->state == PSMOUSE_ACTIVATED &&
+           psmouse->pktcnt && time_after(jiffies, psmouse->last + HZ/2)) {
+               printk(KERN_INFO "psmouse.c: %s at %s lost synchronization, throwing %d bytes away.\n",
+                      psmouse->name, psmouse->phys, psmouse->pktcnt);
+               psmouse->badbyte = psmouse->packet[0];
+               __psmouse_set_state(psmouse, PSMOUSE_RESYNCING);
+               queue_work(kpsmoused_wq, &psmouse->resync_work);
+               goto out;
+       }
 
-               if (psmouse->cmdcnt == 1 && command == PSMOUSE_CMD_RESET_BAT &&
-                               timeout > 100000) /* do not run in a endless loop */
-                       timeout = 100000; /* 1 sec */
+       psmouse->packet[psmouse->pktcnt++] = data;
+/*
+ * Check if this is a new device announcement (0xAA 0x00)
+ */
+       if (unlikely(psmouse->packet[0] == PSMOUSE_RET_BAT && psmouse->pktcnt <= 2)) {
+               if (psmouse->pktcnt == 1) {
+                       psmouse->last = jiffies;
+                       goto out;
+               }
 
-               if (psmouse->cmdcnt == 1 && command == PSMOUSE_CMD_GETID &&
-                   psmouse->cmdbuf[1] != 0xab && psmouse->cmdbuf[1] != 0xac) {
-                       psmouse->cmdcnt = 0;
-                       break;
+               if (psmouse->packet[1] == PSMOUSE_RET_ID) {
+                       __psmouse_set_state(psmouse, PSMOUSE_IGNORE);
+                       serio_reconnect(serio);
+                       goto out;
                }
+/*
+ * Not a new device, try processing first byte normally
+ */
+               psmouse->pktcnt = 1;
+               if (psmouse_handle_byte(psmouse, regs))
+                       goto out;
 
-               udelay(1);
+               psmouse->packet[psmouse->pktcnt++] = data;
        }
 
-       for (i = 0; i < receive; i++)
-               param[i] = psmouse->cmdbuf[(receive - 1) - i];
+/*
+ * See if we need to force resync because mouse was idle for too long
+ */
+       if (psmouse->state == PSMOUSE_ACTIVATED &&
+           psmouse->pktcnt == 1 && psmouse->resync_time &&
+           time_after(jiffies, psmouse->last + psmouse->resync_time * HZ)) {
+               psmouse->badbyte = psmouse->packet[0];
+               __psmouse_set_state(psmouse, PSMOUSE_RESYNCING);
+               queue_work(kpsmoused_wq, &psmouse->resync_work);
+               goto out;
+       }
 
-       if (psmouse->cmdcnt)
-               return (psmouse->cmdcnt = 0) - 1;
+       psmouse->last = jiffies;
+       psmouse_handle_byte(psmouse, regs);
 
-       return 0;
+ out:
+       return IRQ_HANDLED;
 }
 
 
@@ -322,12 +353,12 @@ int psmouse_sliced_command(struct psmouse *psmouse, unsigned char command)
 {
        int i;
 
-       if (psmouse_command(psmouse, NULL, PSMOUSE_CMD_SETSCALE11))
+       if (ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_SETSCALE11))
                return -1;
 
        for (i = 6; i >= 0; i -= 2) {
                unsigned char d = (command >> i) & 3;
-               if (psmouse_command(psmouse, &d, PSMOUSE_CMD_SETRES))
+               if (ps2_command(&psmouse->ps2dev, &d, PSMOUSE_CMD_SETRES))
                        return -1;
        }
 
@@ -342,7 +373,7 @@ int psmouse_reset(struct psmouse *psmouse)
 {
        unsigned char param[2];
 
-       if (psmouse_command(psmouse, param, PSMOUSE_CMD_RESET_BAT))
+       if (ps2_command(&psmouse->ps2dev, param, PSMOUSE_CMD_RESET_BAT))
                return -1;
 
        if (param[0] != PSMOUSE_RET_BAT && param[1] != PSMOUSE_RET_ID)
@@ -355,56 +386,145 @@ int psmouse_reset(struct psmouse *psmouse)
 /*
  * Genius NetMouse magic init.
  */
-static int genius_detect(struct psmouse *psmouse)
+static int genius_detect(struct psmouse *psmouse, int set_properties)
 {
+       struct ps2dev *ps2dev = &psmouse->ps2dev;
        unsigned char param[4];
 
        param[0] = 3;
-       psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES);
-       psmouse_command(psmouse,  NULL, PSMOUSE_CMD_SETSCALE11);
-       psmouse_command(psmouse,  NULL, PSMOUSE_CMD_SETSCALE11);
-       psmouse_command(psmouse,  NULL, PSMOUSE_CMD_SETSCALE11);
-       psmouse_command(psmouse, param, PSMOUSE_CMD_GETINFO);
+       ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES);
+       ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE11);
+       ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE11);
+       ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE11);
+       ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO);
+
+       if (param[0] != 0x00 || param[1] != 0x33 || param[2] != 0x55)
+               return -1;
 
-       return param[0] == 0x00 && param[1] == 0x33 && param[2] == 0x55;
+       if (set_properties) {
+               set_bit(BTN_EXTRA, psmouse->dev->keybit);
+               set_bit(BTN_SIDE, psmouse->dev->keybit);
+               set_bit(REL_WHEEL, psmouse->dev->relbit);
+
+               psmouse->vendor = "Genius";
+               psmouse->name = "Mouse";
+               psmouse->pktsize = 4;
+       }
+
+       return 0;
 }
 
 /*
  * IntelliMouse magic init.
  */
-static int intellimouse_detect(struct psmouse *psmouse)
+static int intellimouse_detect(struct psmouse *psmouse, int set_properties)
 {
+       struct ps2dev *ps2dev = &psmouse->ps2dev;
        unsigned char param[2];
 
        param[0] = 200;
-       psmouse_command(psmouse, param, PSMOUSE_CMD_SETRATE);
+       ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE);
        param[0] = 100;
-       psmouse_command(psmouse, param, PSMOUSE_CMD_SETRATE);
+       ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE);
        param[0] =  80;
-       psmouse_command(psmouse, param, PSMOUSE_CMD_SETRATE);
-       psmouse_command(psmouse, param, PSMOUSE_CMD_GETID);
+       ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE);
+       ps2_command(ps2dev, param, PSMOUSE_CMD_GETID);
+
+       if (param[0] != 3)
+               return -1;
 
-       return param[0] == 3;
+       if (set_properties) {
+               set_bit(BTN_MIDDLE, psmouse->dev->keybit);
+               set_bit(REL_WHEEL, psmouse->dev->relbit);
+
+               if (!psmouse->vendor) psmouse->vendor = "Generic";
+               if (!psmouse->name) psmouse->name = "Wheel Mouse";
+               psmouse->pktsize = 4;
+       }
+
+       return 0;
 }
 
 /*
  * Try IntelliMouse/Explorer magic init.
  */
-static int im_explorer_detect(struct psmouse *psmouse)
+static int im_explorer_detect(struct psmouse *psmouse, int set_properties)
 {
+       struct ps2dev *ps2dev = &psmouse->ps2dev;
        unsigned char param[2];
 
+       intellimouse_detect(psmouse, 0);
+
        param[0] = 200;
-       psmouse_command(psmouse, param, PSMOUSE_CMD_SETRATE);
+       ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE);
        param[0] = 200;
-       psmouse_command(psmouse, param, PSMOUSE_CMD_SETRATE);
+       ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE);
        param[0] =  80;
-       psmouse_command(psmouse, param, PSMOUSE_CMD_SETRATE);
-       psmouse_command(psmouse, param, PSMOUSE_CMD_GETID);
+       ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE);
+       ps2_command(ps2dev, param, PSMOUSE_CMD_GETID);
+
+       if (param[0] != 4)
+               return -1;
+
+       if (set_properties) {
+               set_bit(BTN_MIDDLE, psmouse->dev->keybit);
+               set_bit(REL_WHEEL, psmouse->dev->relbit);
+               set_bit(BTN_SIDE, psmouse->dev->keybit);
+               set_bit(BTN_EXTRA, psmouse->dev->keybit);
+
+               if (!psmouse->vendor) psmouse->vendor = "Generic";
+               if (!psmouse->name) psmouse->name = "Explorer Mouse";
+               psmouse->pktsize = 4;
+       }
+
+       return 0;
+}
+
+/*
+ * Kensington ThinkingMouse / ExpertMouse magic init.
+ */
+static int thinking_detect(struct psmouse *psmouse, int set_properties)
+{
+       struct ps2dev *ps2dev = &psmouse->ps2dev;
+       unsigned char param[2];
+       unsigned char seq[] = { 20, 60, 40, 20, 20, 60, 40, 20, 20, 0 };
+       int i;
+
+       param[0] = 10;
+       ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE);
+       param[0] = 0;
+       ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES);
+       for (i = 0; seq[i]; i++)
+               ps2_command(ps2dev, seq + i, PSMOUSE_CMD_SETRATE);
+       ps2_command(ps2dev, param, PSMOUSE_CMD_GETID);
+
+       if (param[0] != 2)
+               return -1;
+
+       if (set_properties) {
+               set_bit(BTN_EXTRA, psmouse->dev->keybit);
+
+               psmouse->vendor = "Kensington";
+               psmouse->name = "ThinkingMouse";
+       }
+
+       return 0;
+}
+
+/*
+ * Bare PS/2 protocol "detection". Always succeeds.
+ */
+static int ps2bare_detect(struct psmouse *psmouse, int set_properties)
+{
+       if (set_properties) {
+               if (!psmouse->vendor) psmouse->vendor = "Generic";
+               if (!psmouse->name) psmouse->name = "Mouse";
+       }
 
-       return param[0] == 4;
+       return 0;
 }
 
+
 /*
  * psmouse_extensions() probes for any extensions to the basic PS/2 protocol
  * the mouse may have.
@@ -415,17 +535,31 @@ static int psmouse_extensions(struct psmouse *psmouse,
 {
        int synaptics_hardware = 0;
 
+/*
+ * We always check for lifebook because it does not disturb mouse
+ * (it only checks DMI information).
+ */
+       if (lifebook_detect(psmouse, set_properties) == 0) {
+               if (max_proto > PSMOUSE_IMEX) {
+                       if (!set_properties || lifebook_init(psmouse) == 0)
+                               return PSMOUSE_LIFEBOOK;
+               }
+       }
+
+/*
+ * Try Kensington ThinkingMouse (we try first, because synaptics probe
+ * upsets the thinkingmouse).
+ */
+
+       if (max_proto > PSMOUSE_IMEX && thinking_detect(psmouse, set_properties) == 0)
+               return PSMOUSE_THINKPS;
+
 /*
  * Try Synaptics TouchPad
  */
-       if (max_proto > PSMOUSE_PS2 && synaptics_detect(psmouse)) {
+       if (max_proto > PSMOUSE_PS2 && synaptics_detect(psmouse, set_properties) == 0) {
                synaptics_hardware = 1;
 
-               if (set_properties) {
-                       psmouse->vendor = "Synaptics";
-                       psmouse->name = "TouchPad";
-               }
-
                if (max_proto > PSMOUSE_IMEX) {
                        if (!set_properties || synaptics_init(psmouse) == 0)
                                return PSMOUSE_SYNAPTICS;
@@ -442,53 +576,49 @@ static int psmouse_extensions(struct psmouse *psmouse,
                synaptics_reset(psmouse);
        }
 
-       if (max_proto > PSMOUSE_IMEX && genius_detect(psmouse)) {
-
-               if (set_properties) {
-                       set_bit(BTN_EXTRA, psmouse->dev.keybit);
-                       set_bit(BTN_SIDE, psmouse->dev.keybit);
-                       set_bit(REL_WHEEL, psmouse->dev.relbit);
-                       psmouse->vendor = "Genius";
-                       psmouse->name = "Wheel Mouse";
+/*
+ * Try ALPS TouchPad
+ */
+       if (max_proto > PSMOUSE_IMEX) {
+               ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_RESET_DIS);
+               if (alps_detect(psmouse, set_properties) == 0) {
+                       if (!set_properties || alps_init(psmouse) == 0)
+                               return PSMOUSE_ALPS;
+/*
+ * Init failed, try basic relative protocols
+ */
+                       max_proto = PSMOUSE_IMEX;
                }
+       }
 
+       if (max_proto > PSMOUSE_IMEX && genius_detect(psmouse, set_properties) == 0)
                return PSMOUSE_GENPS;
-       }
 
-       if (max_proto > PSMOUSE_IMEX) {
-               int type = ps2pp_init(psmouse, set_properties);
-               if (type > PSMOUSE_PS2)
-                       return type;
-       }
+       if (max_proto > PSMOUSE_IMEX && ps2pp_init(psmouse, set_properties) == 0)
+               return PSMOUSE_PS2PP;
 
-       if (max_proto >= PSMOUSE_IMEX && im_explorer_detect(psmouse)) {
+       if (max_proto > PSMOUSE_IMEX && trackpoint_detect(psmouse, set_properties) == 0)
+               return PSMOUSE_TRACKPOINT;
 
-               if (set_properties) {
-                       set_bit(REL_WHEEL, psmouse->dev.relbit);
-                       set_bit(BTN_SIDE, psmouse->dev.keybit);
-                       set_bit(BTN_EXTRA, psmouse->dev.keybit);
-                       if (!psmouse->name)
-                               psmouse->name = "Explorer Mouse";
-               }
+/*
+ * Reset to defaults in case the device got confused by extended
+ * protocol probes. Note that we do full reset becuase some mice
+ * put themselves to sleep when see PSMOUSE_RESET_DIS.
+ */
+       psmouse_reset(psmouse);
 
+       if (max_proto >= PSMOUSE_IMEX && im_explorer_detect(psmouse, set_properties) == 0)
                return PSMOUSE_IMEX;
-       }
-
-       if (max_proto >= PSMOUSE_IMPS && intellimouse_detect(psmouse)) {
-
-               if (set_properties) {
-                       set_bit(REL_WHEEL, psmouse->dev.relbit);
-                       if (!psmouse->name)
-                               psmouse->name = "Wheel Mouse";
-               }
 
+       if (max_proto >= PSMOUSE_IMPS && intellimouse_detect(psmouse, set_properties) == 0)
                return PSMOUSE_IMPS;
-       }
 
 /*
  * Okay, all failed, we have a standard mouse here. The number of the buttons
  * is still a question, though. We assume 3.
  */
+       ps2bare_detect(psmouse, set_properties);
+
        if (synaptics_hardware) {
 /*
  * We detected Synaptics hardware but it did not respond to IMPS/2 probes.
@@ -497,39 +627,144 @@ static int psmouse_extensions(struct psmouse *psmouse,
  * extensions.
  */
                psmouse_reset(psmouse);
-               psmouse_command(psmouse, NULL, PSMOUSE_CMD_RESET_DIS);
        }
 
        return PSMOUSE_PS2;
 }
 
+static struct psmouse_protocol psmouse_protocols[] = {
+       {
+               .type           = PSMOUSE_PS2,
+               .name           = "PS/2",
+               .alias          = "bare",
+               .maxproto       = 1,
+               .detect         = ps2bare_detect,
+       },
+       {
+               .type           = PSMOUSE_PS2PP,
+               .name           = "PS2++",
+               .alias          = "logitech",
+               .detect         = ps2pp_init,
+       },
+       {
+               .type           = PSMOUSE_THINKPS,
+               .name           = "ThinkPS/2",
+               .alias          = "thinkps",
+               .detect         = thinking_detect,
+       },
+       {
+               .type           = PSMOUSE_GENPS,
+               .name           = "GenPS/2",
+               .alias          = "genius",
+               .detect         = genius_detect,
+       },
+       {
+               .type           = PSMOUSE_IMPS,
+               .name           = "ImPS/2",
+               .alias          = "imps",
+               .maxproto       = 1,
+               .detect         = intellimouse_detect,
+       },
+       {
+               .type           = PSMOUSE_IMEX,
+               .name           = "ImExPS/2",
+               .alias          = "exps",
+               .maxproto       = 1,
+               .detect         = im_explorer_detect,
+       },
+       {
+               .type           = PSMOUSE_SYNAPTICS,
+               .name           = "SynPS/2",
+               .alias          = "synaptics",
+               .detect         = synaptics_detect,
+               .init           = synaptics_init,
+       },
+       {
+               .type           = PSMOUSE_ALPS,
+               .name           = "AlpsPS/2",
+               .alias          = "alps",
+               .detect         = alps_detect,
+               .init           = alps_init,
+       },
+       {
+               .type           = PSMOUSE_LIFEBOOK,
+               .name           = "LBPS/2",
+               .alias          = "lifebook",
+               .init           = lifebook_init,
+       },
+       {
+               .type           = PSMOUSE_TRACKPOINT,
+               .name           = "TPPS/2",
+               .alias          = "trackpoint",
+               .detect         = trackpoint_detect,
+       },
+       {
+               .type           = PSMOUSE_AUTO,
+               .name           = "auto",
+               .alias          = "any",
+               .maxproto       = 1,
+       },
+};
+
+static struct psmouse_protocol *psmouse_protocol_by_type(enum psmouse_type type)
+{
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(psmouse_protocols); i++)
+               if (psmouse_protocols[i].type == type)
+                       return &psmouse_protocols[i];
+
+       WARN_ON(1);
+       return &psmouse_protocols[0];
+}
+
+static struct psmouse_protocol *psmouse_protocol_by_name(const char *name, size_t len)
+{
+       struct psmouse_protocol *p;
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(psmouse_protocols); i++) {
+               p = &psmouse_protocols[i];
+
+               if ((strlen(p->name) == len && !strncmp(p->name, name, len)) ||
+                   (strlen(p->alias) == len && !strncmp(p->alias, name, len)))
+                       return &psmouse_protocols[i];
+       }
+
+       return NULL;
+}
+
+
 /*
  * psmouse_probe() probes for a PS/2 mouse.
  */
 
 static int psmouse_probe(struct psmouse *psmouse)
 {
+       struct ps2dev *ps2dev = &psmouse->ps2dev;
        unsigned char param[2];
 
 /*
  * First, we check if it's a mouse. It should send 0x00 or 0x03
  * in case of an IntelliMouse in 4-byte mode or 0x04 for IM Explorer.
+ * Sunrex K8561 IR Keyboard/Mouse reports 0xff on second and subsequent
+ * ID queries, probably due to a firmware bug.
  */
 
        param[0] = 0xa5;
-
-       if (psmouse_command(psmouse, param, PSMOUSE_CMD_GETID))
+       if (ps2_command(ps2dev, param, PSMOUSE_CMD_GETID))
                return -1;
 
-       if (param[0] != 0x00 && param[0] != 0x03 && param[0] != 0x04)
+       if (param[0] != 0x00 && param[0] != 0x03 &&
+           param[0] != 0x04 && param[0] != 0xff)
                return -1;
 
 /*
  * Then we reset and disable the mouse so that it doesn't generate events.
  */
 
-       if (psmouse_command(psmouse, NULL, PSMOUSE_CMD_RESET_DIS))
-               printk(KERN_WARNING "psmouse.c: Failed to reset mouse on %s\n", psmouse->serio->phys);
+       if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_RESET_DIS))
+               printk(KERN_WARNING "psmouse.c: Failed to reset mouse on %s\n", ps2dev->serio->phys);
 
        return 0;
 }
@@ -538,38 +773,29 @@ static int psmouse_probe(struct psmouse *psmouse)
  * Here we set the mouse resolution.
  */
 
-static void psmouse_set_resolution(struct psmouse *psmouse)
+void psmouse_set_resolution(struct psmouse *psmouse, unsigned int resolution)
 {
-       unsigned char param[1];
-
-       if (psmouse->type == PSMOUSE_PS2PP && psmouse_resolution > 400) {
-               ps2pp_set_800dpi(psmouse);
-               return;
-       }
+       unsigned char params[] = { 0, 1, 2, 2, 3 };
 
-       if (!psmouse_resolution || psmouse_resolution >= 200)
-               param[0] = 3;
-       else if (psmouse_resolution >= 100)
-               param[0] = 2;
-       else if (psmouse_resolution >= 50)
-               param[0] = 1;
-       else if (psmouse_resolution)
-               param[0] = 0;
+       if (resolution == 0 || resolution > 200)
+               resolution = 200;
 
-        psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES);
+       ps2_command(&psmouse->ps2dev, &params[resolution / 50], PSMOUSE_CMD_SETRES);
+       psmouse->resolution = 25 << params[resolution / 50];
 }
 
 /*
  * Here we set the mouse report rate.
  */
 
-static void psmouse_set_rate(struct psmouse *psmouse)
+static void psmouse_set_rate(struct psmouse *psmouse, unsigned int rate)
 {
        unsigned char rates[] = { 200, 100, 80, 60, 40, 20, 10, 0 };
        int i = 0;
 
-       while (rates[i] > psmouse_rate) i++;
-       psmouse_command(psmouse, rates + i, PSMOUSE_CMD_SETRATE);
+       while (rates[i] > rate) i++;
+       ps2_command(&psmouse->ps2dev, &rates[i], PSMOUSE_CMD_SETRATE);
+       psmouse->rate = rates[i];
 }
 
 /*
@@ -578,35 +804,155 @@ static void psmouse_set_rate(struct psmouse *psmouse)
 
 static void psmouse_initialize(struct psmouse *psmouse)
 {
-       unsigned char param[2];
+/*
+ * We set the mouse into streaming mode.
+ */
+
+       ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_SETSTREAM);
 
 /*
  * We set the mouse report rate, resolution and scaling.
  */
 
        if (psmouse_max_proto != PSMOUSE_PS2) {
-               psmouse_set_rate(psmouse);
-               psmouse_set_resolution(psmouse);
-               psmouse_command(psmouse,  NULL, PSMOUSE_CMD_SETSCALE11);
+               psmouse->set_rate(psmouse, psmouse->rate);
+               psmouse->set_resolution(psmouse, psmouse->resolution);
+               ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_SETSCALE11);
        }
+}
 
 /*
- * We set the mouse into streaming mode.
+ * psmouse_activate() enables the mouse so that we get motion reports from it.
+ */
+
+static void psmouse_activate(struct psmouse *psmouse)
+{
+       if (ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_ENABLE))
+               printk(KERN_WARNING "psmouse.c: Failed to enable mouse on %s\n",
+                       psmouse->ps2dev.serio->phys);
+
+       psmouse_set_state(psmouse, PSMOUSE_ACTIVATED);
+}
+
+
+/*
+ * psmouse_deactivate() puts the mouse into poll mode so that we don't get motion
+ * reports from it unless we explicitely request it.
  */
 
-       psmouse_command(psmouse, param, PSMOUSE_CMD_SETSTREAM);
+static void psmouse_deactivate(struct psmouse *psmouse)
+{
+       if (ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_DISABLE))
+               printk(KERN_WARNING "psmouse.c: Failed to deactivate mouse on %s\n",
+                       psmouse->ps2dev.serio->phys);
+
+       psmouse_set_state(psmouse, PSMOUSE_CMD_MODE);
 }
 
 /*
- * psmouse_activate() enables the mouse so that we get motion reports from it.
+ * psmouse_poll() - default poll hanlder. Everyone except for ALPS uses it.
  */
 
-static void psmouse_activate(struct psmouse *psmouse)
+static int psmouse_poll(struct psmouse *psmouse)
+{
+       return ps2_command(&psmouse->ps2dev, psmouse->packet,
+                          PSMOUSE_CMD_POLL | (psmouse->pktsize << 8));
+}
+
+
+/*
+ * psmouse_resync() attempts to re-validate current protocol.
+ */
+
+static void psmouse_resync(void *p)
 {
-       if (psmouse_command(psmouse, NULL, PSMOUSE_CMD_ENABLE))
-               printk(KERN_WARNING "psmouse.c: Failed to enable mouse on %s\n", psmouse->serio->phys);
+       struct psmouse *psmouse = p, *parent = NULL;
+       struct serio *serio = psmouse->ps2dev.serio;
+       psmouse_ret_t rc = PSMOUSE_GOOD_DATA;
+       int failed = 0, enabled = 0;
+       int i;
+
+       mutex_lock(&psmouse_mutex);
+
+       if (psmouse->state != PSMOUSE_RESYNCING)
+               goto out;
+
+       if (serio->parent && serio->id.type == SERIO_PS_PSTHRU) {
+               parent = serio_get_drvdata(serio->parent);
+               psmouse_deactivate(parent);
+       }
+
+/*
+ * Some mice don't ACK commands sent while they are in the middle of
+ * transmitting motion packet. To avoid delay we use ps2_sendbyte()
+ * instead of ps2_command() which would wait for 200ms for an ACK
+ * that may never come.
+ * As an additional quirk ALPS touchpads may not only forget to ACK
+ * disable command but will stop reporting taps, so if we see that
+ * mouse at least once ACKs disable we will do full reconnect if ACK
+ * is missing.
+ */
+       psmouse->num_resyncs++;
+
+       if (ps2_sendbyte(&psmouse->ps2dev, PSMOUSE_CMD_DISABLE, 20)) {
+               if (psmouse->num_resyncs < 3 || psmouse->acks_disable_command)
+                       failed = 1;
+       } else
+               psmouse->acks_disable_command = 1;
+
+/*
+ * Poll the mouse. If it was reset the packet will be shorter than
+ * psmouse->pktsize and ps2_command will fail. We do not expect and
+ * do not handle scenario when mouse "upgrades" its protocol while
+ * disconnected since it would require additional delay. If we ever
+ * see a mouse that does it we'll adjust the code.
+ */
+       if (!failed) {
+               if (psmouse->poll(psmouse))
+                       failed = 1;
+               else {
+                       psmouse_set_state(psmouse, PSMOUSE_CMD_MODE);
+                       for (i = 0; i < psmouse->pktsize; i++) {
+                               psmouse->pktcnt++;
+                               rc = psmouse->protocol_handler(psmouse, NULL);
+                               if (rc != PSMOUSE_GOOD_DATA)
+                                       break;
+                       }
+                       if (rc != PSMOUSE_FULL_PACKET)
+                               failed = 1;
+                       psmouse_set_state(psmouse, PSMOUSE_RESYNCING);
+               }
+       }
+/*
+ * Now try to enable mouse. We try to do that even if poll failed and also
+ * repeat our attempts 5 times, otherwise we may be left out with disabled
+ * mouse.
+ */
+       for (i = 0; i < 5; i++) {
+               if (!ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_ENABLE)) {
+                       enabled = 1;
+                       break;
+               }
+               msleep(200);
+       }
+
+       if (!enabled) {
+               printk(KERN_WARNING "psmouse.c: failed to re-enable mouse on %s\n",
+                       psmouse->ps2dev.serio->phys);
+               failed = 1;
+       }
 
-       psmouse->state = PSMOUSE_ACTIVATED;
+       if (failed) {
+               psmouse_set_state(psmouse, PSMOUSE_IGNORE);
+               printk(KERN_INFO "psmouse.c: resync failed, issuing reconnect request\n");
+               serio_reconnect(serio);
+       } else
+               psmouse_set_state(psmouse, PSMOUSE_ACTIVATED);
+
+       if (parent)
+               psmouse_activate(parent);
+ out:
+       mutex_unlock(&psmouse_mutex);
 }
 
 /*
@@ -615,7 +961,7 @@ static void psmouse_activate(struct psmouse *psmouse)
 
 static void psmouse_cleanup(struct serio *serio)
 {
-       struct psmouse *psmouse = serio->private;
+       struct psmouse *psmouse = serio_get_drvdata(serio);
 
        psmouse_reset(psmouse);
 }
@@ -626,174 +972,512 @@ static void psmouse_cleanup(struct serio *serio)
 
 static void psmouse_disconnect(struct serio *serio)
 {
-       struct psmouse *psmouse = serio->private;
+       struct psmouse *psmouse, *parent = NULL;
+
+       psmouse = serio_get_drvdata(serio);
+
+       sysfs_remove_group(&serio->dev.kobj, &psmouse_attribute_group);
+
+       mutex_lock(&psmouse_mutex);
+
+       psmouse_set_state(psmouse, PSMOUSE_CMD_MODE);
 
-       psmouse->state = PSMOUSE_CMD_MODE;
+       /* make sure we don't have a resync in progress */
+       mutex_unlock(&psmouse_mutex);
+       flush_workqueue(kpsmoused_wq);
+       mutex_lock(&psmouse_mutex);
 
-       if (psmouse->ptport) {
-               if (psmouse->ptport->deactivate)
-                       psmouse->ptport->deactivate(psmouse);
-               __serio_unregister_port(&psmouse->ptport->serio); /* we have serio_sem */
-               kfree(psmouse->ptport);
-               psmouse->ptport = NULL;
+       if (serio->parent && serio->id.type == SERIO_PS_PSTHRU) {
+               parent = serio_get_drvdata(serio->parent);
+               psmouse_deactivate(parent);
        }
 
        if (psmouse->disconnect)
                psmouse->disconnect(psmouse);
 
-       psmouse->state = PSMOUSE_IGNORE;
+       if (parent && parent->pt_deactivate)
+               parent->pt_deactivate(parent);
+
+       psmouse_set_state(psmouse, PSMOUSE_IGNORE);
 
-       input_unregister_device(&psmouse->dev);
        serio_close(serio);
+       serio_set_drvdata(serio, NULL);
+       input_unregister_device(psmouse->dev);
        kfree(psmouse);
+
+       if (parent)
+               psmouse_activate(parent);
+
+       mutex_unlock(&psmouse_mutex);
+}
+
+static int psmouse_switch_protocol(struct psmouse *psmouse, struct psmouse_protocol *proto)
+{
+       struct input_dev *input_dev = psmouse->dev;
+
+       input_dev->private = psmouse;
+       input_dev->cdev.dev = &psmouse->ps2dev.serio->dev;
+
+       input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
+       input_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
+       input_dev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
+
+       psmouse->set_rate = psmouse_set_rate;
+       psmouse->set_resolution = psmouse_set_resolution;
+       psmouse->poll = psmouse_poll;
+       psmouse->protocol_handler = psmouse_process_byte;
+       psmouse->pktsize = 3;
+
+       if (proto && (proto->detect || proto->init)) {
+               if (proto->detect && proto->detect(psmouse, 1) < 0)
+                       return -1;
+
+               if (proto->init && proto->init(psmouse) < 0)
+                       return -1;
+
+               psmouse->type = proto->type;
+       }
+       else
+               psmouse->type = psmouse_extensions(psmouse, psmouse_max_proto, 1);
+
+       /*
+        * If mouse's packet size is 3 there is no point in polling the
+        * device in hopes to detect protocol reset - we won't get less
+        * than 3 bytes response anyhow.
+        */
+       if (psmouse->pktsize == 3)
+               psmouse->resync_time = 0;
+
+       /*
+        * Some smart KVMs fake response to POLL command returning just
+        * 3 bytes and messing up our resync logic, so if initial poll
+        * fails we won't try polling the device anymore. Hopefully
+        * such KVM will maintain initially selected protocol.
+        */
+       if (psmouse->resync_time && psmouse->poll(psmouse))
+               psmouse->resync_time = 0;
+
+       sprintf(psmouse->devname, "%s %s %s",
+               psmouse_protocol_by_type(psmouse->type)->name, psmouse->vendor, psmouse->name);
+
+       input_dev->name = psmouse->devname;
+       input_dev->phys = psmouse->phys;
+       input_dev->id.bustype = BUS_I8042;
+       input_dev->id.vendor = 0x0002;
+       input_dev->id.product = psmouse->type;
+       input_dev->id.version = psmouse->model;
+
+       return 0;
 }
 
 /*
  * psmouse_connect() is a callback from the serio module when
  * an unhandled serio port is found.
  */
-static void psmouse_connect(struct serio *serio, struct serio_dev *dev)
+static int psmouse_connect(struct serio *serio, struct serio_driver *drv)
 {
-       struct psmouse *psmouse;
+       struct psmouse *psmouse, *parent = NULL;
+       struct input_dev *input_dev;
+       int retval = -ENOMEM;
 
-       if ((serio->type & SERIO_TYPE) != SERIO_8042 &&
-           (serio->type & SERIO_TYPE) != SERIO_PS_PSTHRU)
-               return;
+       mutex_lock(&psmouse_mutex);
 
-       if (!(psmouse = kmalloc(sizeof(struct psmouse), GFP_KERNEL)))
-               return;
+       /*
+        * If this is a pass-through port deactivate parent so the device
+        * connected to this port can be successfully identified
+        */
+       if (serio->parent && serio->id.type == SERIO_PS_PSTHRU) {
+               parent = serio_get_drvdata(serio->parent);
+               psmouse_deactivate(parent);
+       }
 
-       memset(psmouse, 0, sizeof(struct psmouse));
+       psmouse = kzalloc(sizeof(struct psmouse), GFP_KERNEL);
+       input_dev = input_allocate_device();
+       if (!psmouse || !input_dev)
+               goto out;
 
-       init_input_dev(&psmouse->dev);
-       psmouse->dev.evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-       psmouse->dev.keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
-       psmouse->dev.relbit[0] = BIT(REL_X) | BIT(REL_Y);
-       psmouse->state = PSMOUSE_CMD_MODE;
-       psmouse->serio = serio;
-       psmouse->dev.private = psmouse;
+       ps2_init(&psmouse->ps2dev, serio);
+       INIT_WORK(&psmouse->resync_work, psmouse_resync, psmouse);
+       psmouse->dev = input_dev;
+       sprintf(psmouse->phys, "%s/input0", serio->phys);
 
-       serio->private = psmouse;
-       if (serio_open(serio, dev)) {
-               kfree(psmouse);
-               serio->private = NULL;
-               return;
-       }
+       psmouse_set_state(psmouse, PSMOUSE_INITIALIZING);
+
+       serio_set_drvdata(serio, psmouse);
+
+       retval = serio_open(serio, drv);
+       if (retval)
+               goto out;
 
        if (psmouse_probe(psmouse) < 0) {
                serio_close(serio);
-               kfree(psmouse);
-               serio->private = NULL;
-               return;
+               retval = -ENODEV;
+               goto out;
        }
 
-       psmouse->type = psmouse_extensions(psmouse, psmouse_max_proto, 1);
-       if (!psmouse->vendor)
-               psmouse->vendor = "Generic";
-       if (!psmouse->name)
-               psmouse->name = "Mouse";
-       if (!psmouse->protocol_handler)
-               psmouse->protocol_handler = psmouse_process_byte;
+       psmouse->rate = psmouse_rate;
+       psmouse->resolution = psmouse_resolution;
+       psmouse->resetafter = psmouse_resetafter;
+       psmouse->resync_time = parent ? 0 : psmouse_resync_time;
+       psmouse->smartscroll = psmouse_smartscroll;
 
-       sprintf(psmouse->devname, "%s %s %s",
-               psmouse_protocols[psmouse->type], psmouse->vendor, psmouse->name);
-       sprintf(psmouse->phys, "%s/input0",
-               serio->phys);
+       psmouse_switch_protocol(psmouse, NULL);
 
-       psmouse->dev.name = psmouse->devname;
-       psmouse->dev.phys = psmouse->phys;
-       psmouse->dev.id.bustype = BUS_I8042;
-       psmouse->dev.id.vendor = 0x0002;
-       psmouse->dev.id.product = psmouse->type;
-       psmouse->dev.id.version = psmouse->model;
+       psmouse_set_state(psmouse, PSMOUSE_CMD_MODE);
+       psmouse_initialize(psmouse);
 
-       input_register_device(&psmouse->dev);
+       input_register_device(psmouse->dev);
 
-       printk(KERN_INFO "input: %s on %s\n", psmouse->devname, serio->phys);
+       if (parent && parent->pt_activate)
+               parent->pt_activate(parent);
 
-       psmouse_initialize(psmouse);
+       sysfs_create_group(&serio->dev.kobj, &psmouse_attribute_group);
 
-       if (psmouse->ptport) {
-               printk(KERN_INFO "serio: %s port at %s\n", psmouse->ptport->serio.name, psmouse->phys);
-               __serio_register_port(&psmouse->ptport->serio); /* we have serio_sem */
-               if (psmouse->ptport->activate)
-                       psmouse->ptport->activate(psmouse);
+       psmouse_activate(psmouse);
+
+       retval = 0;
+
+out:
+       if (retval) {
+               serio_set_drvdata(serio, NULL);
+               input_free_device(input_dev);
+               kfree(psmouse);
        }
 
-       psmouse_activate(psmouse);
+       /* If this is a pass-through port the parent needs to be re-activated */
+       if (parent)
+               psmouse_activate(parent);
+
+       mutex_unlock(&psmouse_mutex);
+       return retval;
 }
 
 
 static int psmouse_reconnect(struct serio *serio)
 {
-       struct psmouse *psmouse = serio->private;
-       struct serio_dev *dev = serio->dev;
+       struct psmouse *psmouse = serio_get_drvdata(serio);
+       struct psmouse *parent = NULL;
+       struct serio_driver *drv = serio->drv;
+       int rc = -1;
 
-       if (!dev || !psmouse) {
+       if (!drv || !psmouse) {
                printk(KERN_DEBUG "psmouse: reconnect request, but serio is disconnected, ignoring...\n");
                return -1;
        }
 
-       psmouse->state = PSMOUSE_CMD_MODE;
-       psmouse->acking = psmouse->cmdcnt = psmouse->pktcnt = psmouse->out_of_sync = 0;
+       mutex_lock(&psmouse_mutex);
+
+       if (serio->parent && serio->id.type == SERIO_PS_PSTHRU) {
+               parent = serio_get_drvdata(serio->parent);
+               psmouse_deactivate(parent);
+       }
+
+       psmouse_set_state(psmouse, PSMOUSE_INITIALIZING);
+
        if (psmouse->reconnect) {
-              if (psmouse->reconnect(psmouse))
-                       return -1;
+               if (psmouse->reconnect(psmouse))
+                       goto out;
        } else if (psmouse_probe(psmouse) < 0 ||
                   psmouse->type != psmouse_extensions(psmouse, psmouse_max_proto, 0))
-               return -1;
+               goto out;
 
        /* ok, the device type (and capabilities) match the old one,
         * we can continue using it, complete intialization
         */
+       psmouse_set_state(psmouse, PSMOUSE_CMD_MODE);
+
        psmouse_initialize(psmouse);
 
-       if (psmouse->ptport) {
-                       if (psmouse_reconnect(&psmouse->ptport->serio)) {
-                       __serio_unregister_port(&psmouse->ptport->serio);
-                       __serio_register_port(&psmouse->ptport->serio);
-                       if (psmouse->ptport->activate)
-                               psmouse->ptport->activate(psmouse);
-               }
-       }
+       if (parent && parent->pt_activate)
+               parent->pt_activate(parent);
 
        psmouse_activate(psmouse);
-       return 0;
+       rc = 0;
+
+out:
+       /* If this is a pass-through port the parent waits to be activated */
+       if (parent)
+               psmouse_activate(parent);
+
+       mutex_unlock(&psmouse_mutex);
+       return rc;
 }
 
+static struct serio_device_id psmouse_serio_ids[] = {
+       {
+               .type   = SERIO_8042,
+               .proto  = SERIO_ANY,
+               .id     = SERIO_ANY,
+               .extra  = SERIO_ANY,
+       },
+       {
+               .type   = SERIO_PS_PSTHRU,
+               .proto  = SERIO_ANY,
+               .id     = SERIO_ANY,
+               .extra  = SERIO_ANY,
+       },
+       { 0 }
+};
 
-static struct serio_dev psmouse_dev = {
-       .interrupt =    psmouse_interrupt,
-       .connect =      psmouse_connect,
-       .reconnect =    psmouse_reconnect,
-       .disconnect =   psmouse_disconnect,
-       .cleanup =      psmouse_cleanup,
+MODULE_DEVICE_TABLE(serio, psmouse_serio_ids);
+
+static struct serio_driver psmouse_drv = {
+       .driver         = {
+               .name   = "psmouse",
+       },
+       .description    = DRIVER_DESC,
+       .id_table       = psmouse_serio_ids,
+       .interrupt      = psmouse_interrupt,
+       .connect        = psmouse_connect,
+       .reconnect      = psmouse_reconnect,
+       .disconnect     = psmouse_disconnect,
+       .cleanup        = psmouse_cleanup,
 };
 
-static inline void psmouse_parse_proto(void)
+ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *devattr,
+                                char *buf)
+{
+       struct serio *serio = to_serio_port(dev);
+       struct psmouse_attribute *attr = to_psmouse_attr(devattr);
+       struct psmouse *psmouse;
+       int retval;
+
+       retval = serio_pin_driver(serio);
+       if (retval)
+               return retval;
+
+       if (serio->drv != &psmouse_drv) {
+               retval = -ENODEV;
+               goto out;
+       }
+
+       psmouse = serio_get_drvdata(serio);
+
+       retval = attr->show(psmouse, attr->data, buf);
+
+out:
+       serio_unpin_driver(serio);
+       return retval;
+}
+
+ssize_t psmouse_attr_set_helper(struct device *dev, struct device_attribute *devattr,
+                               const char *buf, size_t count)
+{
+       struct serio *serio = to_serio_port(dev);
+       struct psmouse_attribute *attr = to_psmouse_attr(devattr);
+       struct psmouse *psmouse, *parent = NULL;
+       int retval;
+
+       retval = serio_pin_driver(serio);
+       if (retval)
+               return retval;
+
+       if (serio->drv != &psmouse_drv) {
+               retval = -ENODEV;
+               goto out_unpin;
+       }
+
+       retval = mutex_lock_interruptible(&psmouse_mutex);
+       if (retval)
+               goto out_unpin;
+
+       psmouse = serio_get_drvdata(serio);
+
+       if (psmouse->state == PSMOUSE_IGNORE) {
+               retval = -ENODEV;
+               goto out_unlock;
+       }
+
+       if (serio->parent && serio->id.type == SERIO_PS_PSTHRU) {
+               parent = serio_get_drvdata(serio->parent);
+               psmouse_deactivate(parent);
+       }
+
+       psmouse_deactivate(psmouse);
+
+       retval = attr->set(psmouse, attr->data, buf, count);
+
+       if (retval != -ENODEV)
+               psmouse_activate(psmouse);
+
+       if (parent)
+               psmouse_activate(parent);
+
+ out_unlock:
+       mutex_unlock(&psmouse_mutex);
+ out_unpin:
+       serio_unpin_driver(serio);
+       return retval;
+}
+
+static ssize_t psmouse_show_int_attr(struct psmouse *psmouse, void *offset, char *buf)
+{
+       unsigned long *field = (unsigned long *)((char *)psmouse + (size_t)offset);
+
+       return sprintf(buf, "%lu\n", *field);
+}
+
+static ssize_t psmouse_set_int_attr(struct psmouse *psmouse, void *offset, const char *buf, size_t count)
+{
+       unsigned long *field = (unsigned long *)((char *)psmouse + (size_t)offset);
+       unsigned long value;
+       char *rest;
+
+       value = simple_strtoul(buf, &rest, 10);
+       if (*rest)
+               return -EINVAL;
+
+       *field = value;
+
+       return count;
+}
+
+static ssize_t psmouse_attr_show_protocol(struct psmouse *psmouse, void *data, char *buf)
+{
+       return sprintf(buf, "%s\n", psmouse_protocol_by_type(psmouse->type)->name);
+}
+
+static ssize_t psmouse_attr_set_protocol(struct psmouse *psmouse, void *data, const char *buf, size_t count)
 {
-       if (psmouse_proto) {
-               if (!strcmp(psmouse_proto, "bare"))
-                       psmouse_max_proto = PSMOUSE_PS2;
-               else if (!strcmp(psmouse_proto, "imps"))
-                       psmouse_max_proto = PSMOUSE_IMPS;
-               else if (!strcmp(psmouse_proto, "exps"))
-                       psmouse_max_proto = PSMOUSE_IMEX;
-               else
-                       printk(KERN_ERR "psmouse: unknown protocol type '%s'\n", psmouse_proto);
+       struct serio *serio = psmouse->ps2dev.serio;
+       struct psmouse *parent = NULL;
+       struct input_dev *new_dev;
+       struct psmouse_protocol *proto;
+       int retry = 0;
+
+       if (!(proto = psmouse_protocol_by_name(buf, count)))
+               return -EINVAL;
+
+       if (psmouse->type == proto->type)
+               return count;
+
+       if (!(new_dev = input_allocate_device()))
+               return -ENOMEM;
+
+       while (serio->child) {
+               if (++retry > 3) {
+                       printk(KERN_WARNING "psmouse: failed to destroy child port, protocol change aborted.\n");
+                       input_free_device(new_dev);
+                       return -EIO;
+               }
+
+               mutex_unlock(&psmouse_mutex);
+               serio_unpin_driver(serio);
+               serio_unregister_child_port(serio);
+               serio_pin_driver_uninterruptible(serio);
+               mutex_lock(&psmouse_mutex);
+
+               if (serio->drv != &psmouse_drv) {
+                       input_free_device(new_dev);
+                       return -ENODEV;
+               }
+
+               if (psmouse->type == proto->type) {
+                       input_free_device(new_dev);
+                       return count; /* switched by other thread */
+               }
+       }
+
+       if (serio->parent && serio->id.type == SERIO_PS_PSTHRU) {
+               parent = serio_get_drvdata(serio->parent);
+               if (parent->pt_deactivate)
+                       parent->pt_deactivate(parent);
+       }
+
+       if (psmouse->disconnect)
+               psmouse->disconnect(psmouse);
+
+       psmouse_set_state(psmouse, PSMOUSE_IGNORE);
+       input_unregister_device(psmouse->dev);
+
+       psmouse->dev = new_dev;
+       psmouse_set_state(psmouse, PSMOUSE_INITIALIZING);
+
+       if (psmouse_switch_protocol(psmouse, proto) < 0) {
+               psmouse_reset(psmouse);
+               /* default to PSMOUSE_PS2 */
+               psmouse_switch_protocol(psmouse, &psmouse_protocols[0]);
        }
+
+       psmouse_initialize(psmouse);
+       psmouse_set_state(psmouse, PSMOUSE_CMD_MODE);
+
+       input_register_device(psmouse->dev);
+
+       if (parent && parent->pt_activate)
+               parent->pt_activate(parent);
+
+       return count;
+}
+
+static ssize_t psmouse_attr_set_rate(struct psmouse *psmouse, void *data, const char *buf, size_t count)
+{
+       unsigned long value;
+       char *rest;
+
+       value = simple_strtoul(buf, &rest, 10);
+       if (*rest)
+               return -EINVAL;
+
+       psmouse->set_rate(psmouse, value);
+       return count;
+}
+
+static ssize_t psmouse_attr_set_resolution(struct psmouse *psmouse, void *data, const char *buf, size_t count)
+{
+       unsigned long value;
+       char *rest;
+
+       value = simple_strtoul(buf, &rest, 10);
+       if (*rest)
+               return -EINVAL;
+
+       psmouse->set_resolution(psmouse, value);
+       return count;
+}
+
+
+static int psmouse_set_maxproto(const char *val, struct kernel_param *kp)
+{
+       struct psmouse_protocol *proto;
+
+       if (!val)
+               return -EINVAL;
+
+       proto = psmouse_protocol_by_name(val, strlen(val));
+
+       if (!proto || !proto->maxproto)
+               return -EINVAL;
+
+       *((unsigned int *)kp->arg) = proto->type;
+
+       return 0;
 }
 
-int __init psmouse_init(void)
+static int psmouse_get_maxproto(char *buffer, struct kernel_param *kp)
 {
-       psmouse_parse_proto();
-       serio_register_device(&psmouse_dev);
+       int type = *((unsigned int *)kp->arg);
+
+       return sprintf(buffer, "%s\n", psmouse_protocol_by_type(type)->name);
+}
+
+static int __init psmouse_init(void)
+{
+       kpsmoused_wq = create_singlethread_workqueue("kpsmoused");
+       if (!kpsmoused_wq) {
+               printk(KERN_ERR "psmouse: failed to create kpsmoused workqueue\n");
+               return -ENOMEM;
+       }
+
+       serio_register_driver(&psmouse_drv);
+
        return 0;
 }
 
-void __exit psmouse_exit(void)
+static void __exit psmouse_exit(void)
 {
-       serio_unregister_device(&psmouse_dev);
+       serio_unregister_driver(&psmouse_drv);
+       destroy_workqueue(kpsmoused_wq);
 }
 
 module_init(psmouse_init);