Skip to contentSkip to conversation

serio: add support for PS2Mult multiplexer protocol

PATCH In review Dmitry Eremin-Solenikov 2 participants 13 messages Sep 23, 2010 – Oct 22, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 serio: add support for PS2Mult multiplexer protocol

PS2Mult is a simple serial protocol used for multiplexing several PS/2 streams into one serial data stream. It's used e.g. on TQM85xx serie of boards.

---

It actually depends on "serio: multiple children" patch. I'm not resending it as you were the originator of the latest version of the patch.

 drivers/input/serio/Kconfig   |    8 +
 drivers/input/serio/Makefile  |    1 +
 drivers/input/serio/ps2mult.c |  283 +++++++++++++++++++++++++++++++++++++++++
 include/linux/serio.h         |    2 +
 4 files changed, 294 insertions(+), 0 deletions(-)
 create mode 100644 drivers/input/serio/ps2mult.c
drivers/input/serio/Kconfig +8 -0
index 3bfe8fa..63f4658 100644
@@ -226,4 +226,12 @@ config SERIO_AMS_DELTA
 	  To compile this driver as a module, choose M here;
 	  the module will be called ams_delta_serio.
 
+config SERIO_PS2MULT
+	tristate "TQC PS/2 multiplexer"
+	help
+	  Say Y here if you have the PS/2 line multiplexer like present on TQC boads
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called ps2mult.
+
 endif
drivers/input/serio/Makefile +1 -0
index 84c80bf..26714c5 100644
@@ -24,3 +24,4 @@ obj-$(CONFIG_SERIO_RAW)		+= serio_raw.o
 obj-$(CONFIG_SERIO_AMS_DELTA)	+= ams_delta_serio.o
 obj-$(CONFIG_SERIO_XILINX_XPS_PS2)	+= xilinx_ps2.o
 obj-$(CONFIG_SERIO_ALTERA_PS2)	+= altera_ps2.o
+obj-$(CONFIG_SERIO_PS2MULT)	+= ps2mult.o
drivers/input/serio/ps2mult.c new file +283 -0

283 lines not on this page · raw message

include/linux/serio.h +2 -0
index 8e495ba..136863c 100644
@@ -155,6 +155,7 @@ static inline void serio_continue_rx(struct serio *serio)
 #define SERIO_HIL_MLC	0x03
 #define SERIO_PS_PSTHRU	0x05
 #define SERIO_8042_XL	0x06
+#define SERIO_PS2MULT_T	0x07
 
 /*
  * Serio protocols
@@ -199,5 +200,6 @@ static inline void serio_continue_rx(struct serio *serio)
 #define SERIO_W8001	0x39
 #define SERIO_DYNAPRO	0x3a
 #define SERIO_HAMPSHIRE	0x3b
+#define SERIO_PS2MULT	0x3c
 
 #endif
Signature · 1 line
1.7.1
#1 lore raw
Quoted 8 lines · Dmitry Eremin-Solenikov

PS2Mult is a simple serial protocol used for multiplexing several PS/2 streams into one serial data stream. It's used e.g. on TQM85xx serie of boards.

---

It actually depends on "serio: multiple children" patch. I'm not resending it as you were the originator of the latest version of the patch.

So, what about this version of patch?

Quoted 7 lines

 drivers/input/serio/Kconfig   |    8 + drivers/input/serio/Makefile  |    1 + drivers/input/serio/ps2mult.c |  283 +++++++++++++++++++++++++++++++++++++++++ include/linux/serio.h         |    2 +

 4 files changed, 294 insertions(+), 0 deletions(-)

 create mode 100644 drivers/input/serio/ps2mult.c

Signature · 6 lines
With best wishes
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
maintainer
#2 lore raw
Quoted 5 lines · Dmitry Eremin-Solenikov
Quoted 3 lines · Dmitry Eremin-Solenikov

PS2Mult is a simple serial protocol used for multiplexing several PS/2 streams into one serial data stream. It's used e.g. on TQM85xx serie of boards.

Quoted 8 lines
Quoted 5 lines

---

It actually depends on "serio: multiple children" patch. I'm not resending it as you were the originator of the latest version of the patch.

So, what about this version of patch?

Looks better but I think you also need ->start() to make sure you do not try to deliver events too early. Does the following still work for you?

Thanks.

Signature · 11 lines
Dmitry

Input: ps2mutl - assorted changes

From: Dmitry Torokhov <[email protected]>

Signed-off-by: Dmitry Torokhov <[email protected]>
---

 drivers/input/serio/ps2mult.c |  261 +++++++++++++++++++++++------------------
 1 files changed, 146 insertions(+), 115 deletions(-)
drivers/input/serio/ps2mult.c +146 -115
index bd45e76..3664398 100644
@@ -31,25 +31,27 @@ struct ps2mult_port {
 };
 
 #define PS2MULT_NUM_PORTS	2
+#define PS2MULT_KBD_PORT	0
+#define PS2MULT_MOUSE_PORT	1
 
 struct ps2mult {
-	struct serio *serio;
+	struct serio *mx_serio;
 	struct ps2mult_port ports[PS2MULT_NUM_PORTS];
 
 	spinlock_t lock;
-	struct serio *in_serio;
-	struct serio *out_serio;
+	struct ps2mult_port *in_port;
+	struct ps2mult_port *out_port;
 	bool escape;
 };
 
-/* First MUST com PS2MULT_NUM_PORTS selectors */
-static unsigned char ps2mult_controls[] = {
+/* First MUST come PS2MULT_NUM_PORTS selectors */
+static const unsigned char ps2mult_controls[] = {
 	PS2MULT_KB_SELECTOR, PS2MULT_MS_SELECTOR,
 	PS2MULT_ESCAPE, PS2MULT_BSYNC,
 	PS2MULT_SESSION_START, PS2MULT_SESSION_END,
 };
 
-static struct serio_device_id ps2mult_serio_ids[] = {
+static const struct serio_device_id ps2mult_serio_ids[] = {
 	{
 		.type	= SERIO_RS232,
 		.proto	= SERIO_PS2MULT,
@@ -61,113 +63,112 @@ static struct serio_device_id ps2mult_serio_ids[] = {
 
 MODULE_DEVICE_TABLE(serio, ps2mult_serio_ids);
 
-static int ps2mult_serio_write(struct serio *serio, unsigned char data)
+static void ps2mult_select_port(struct ps2mult *psm, struct ps2mult_port *port)
+{
+	struct serio *mx_serio = psm->mx_serio;
+
+	serio_write(mx_serio, port->sel);
+	psm->out_port = port;
+	dev_dbg(&mx_serio->dev, "switched to sel %02x\n", port->sel);
+}
 
+static int ps2mult_serio_write(struct serio *serio, unsigned char data)
 {
-	struct ps2mult *psm = serio_get_drvdata(serio->parent);
-	struct ps2mult_port *psmp = serio->port_data;
+	struct serio *mx_port = serio->parent;
+	struct ps2mult *psm = serio_get_drvdata(mx_port);
+	struct ps2mult_port *port = serio->port_data;
 	bool need_escape;
 	unsigned long flags;
 
 	spin_lock_irqsave(&psm->lock, flags);
-	if (psm->out_serio != serio) {
-		psm->serio->write(psm->serio, psmp->sel);
-		psm->out_serio = serio;
-		dev_dbg(&serio->dev, "switched to sel %02x\n", psmp->sel);
-	}
+
+	if (psm->out_port != port)
+		ps2mult_select_port(psm, port);
 
 	need_escape = memchr(ps2mult_controls, data, sizeof(ps2mult_controls));
 
-	dev_dbg(&serio->dev, "write: %s%02x\n",
-			need_escape ? "ESC " : "", data);
+	dev_dbg(&serio->dev,
+		"write: %s%02x\n", need_escape ? "ESC " : "", data);
 
 	if (need_escape)
-		psm->serio->write(psm->serio, PS2MULT_ESCAPE);
-	psm->serio->write(psm->serio, data);
+		serio_write(mx_port, PS2MULT_ESCAPE);
+
+	serio_write(mx_port, data);
 
 	spin_unlock_irqrestore(&psm->lock, flags);
 
 	return 0;
 }
 
-static void ps2mult_serio_stop(struct serio *serio)
+static int ps2mult_serio_start(struct serio *serio)
 {
 	struct ps2mult *psm = serio_get_drvdata(serio->parent);
-	struct ps2mult_port *psmp = serio->port_data;
-
+	struct ps2mult_port *port = serio->port_data;
 	unsigned long flags;
 
 	spin_lock_irqsave(&psm->lock, flags);
+	port->serio = serio;
+	spin_unlock_irqrestore(&psm->lock, flags);
 
-	psmp->serio = NULL;
-	if (psm->in_serio == serio)
-		psm->in_serio = NULL;
-	if (psm->out_serio == serio)
-		psm->out_serio = NULL;
+	return 0;
+}
 
-	spin_unlock_irqrestore(&psm->lock, flags);
+static void ps2mult_serio_stop(struct serio *serio)
+{
+	struct ps2mult *psm = serio_get_drvdata(serio->parent);
+	struct ps2mult_port *port = serio->port_data;
+	unsigned long flags;
 
+	spin_lock_irqsave(&psm->lock, flags);
+	port->serio = NULL;
+	spin_unlock_irqrestore(&psm->lock, flags);
 }
 
 static int ps2mult_create_port(struct ps2mult *psm, int i)
 {
-	struct serio *serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
+	struct serio *mx_serio = psm->mx_serio;
+	struct serio *serio;
+
+	serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
 	if (!serio)
 		return -ENOMEM;
 
 	strlcpy(serio->name, "TQC PS/2 Multiplexer", sizeof(serio->name));
 	snprintf(serio->phys, sizeof(serio->phys),
-			"%s/port%d", psm->serio->phys, i);
+		 "%s/port%d", mx_serio->phys, i);
 	serio->id.type = SERIO_8042;
 	serio->id.proto = SERIO_PS2MULT;
 	serio->write = ps2mult_serio_write;
+	serio->start = ps2mult_serio_start;
 	serio->stop = ps2mult_serio_stop;
-	serio->parent = psm->serio;
-
+	serio->parent = psm->mx_serio;
 	serio->port_data = &psm->ports[i];
 
-	psm->ports[i].serio = serio;
-	psm->ports[i].sel = ps2mult_controls[i];
-
 	serio_register_port(serio);
-	dev_info(&serio->dev, "%s port at %s\n", serio->name, psm->serio->phys);
+	dev_info(&serio->dev, "%s port at %s\n", serio->name, mx_serio->phys);
 
 	return 0;
 }
 
-static int ps2mult_reconnect(struct serio *serio)
+static void ps2mult_reset(struct ps2mult *psm)
 {
-	struct ps2mult *psm = serio_get_drvdata(serio);
 	unsigned long flags;
 
-	serio->write(serio, PS2MULT_SESSION_END);
-	serio->write(serio, PS2MULT_SESSION_START);
-
 	spin_lock_irqsave(&psm->lock, flags);
-	psm->out_serio = psm->ports[0].serio;
-	serio->write(serio, psm->ports[0].sel);
-	spin_unlock_irqrestore(&psm->lock, flags);
-
-	return 0;
-}
-
-static void ps2mult_disconnect(struct serio *serio)
-{
-	struct ps2mult *psm = serio_get_drvdata(serio);
 
-	serio->write(serio, PS2MULT_SESSION_END);
+	serio_write(psm->mx_serio, PS2MULT_SESSION_END);
+	serio_write(psm->mx_serio, PS2MULT_SESSION_START);
 
-	serio_close(serio);
-	serio_set_drvdata(serio, NULL);
+	ps2mult_select_port(psm, &psm->ports[PS2MULT_KBD_PORT]);
 
-	kfree(psm);
+	spin_unlock_irqrestore(&psm->lock, flags);
 }
 
 static int ps2mult_connect(struct serio *serio, struct serio_driver *drv)
 {
 	struct ps2mult *psm;
 	int i;
-	int rc;
+	int error;
 
 	if (!serio->write)
 		return -EINVAL;
@@ -177,83 +178,113 @@ static int ps2mult_connect(struct serio *serio, struct serio_driver *drv)
 		return -ENOMEM;
 
 	spin_lock_init(&psm->lock);
-	psm->serio = serio;
+	psm->mx_serio = serio;
 
-	serio_set_drvdata(serio, psm);
-
-	for (i = 0; i <  PS2MULT_NUM_PORTS; i++) {
-		rc = ps2mult_create_port(psm, i);
-		if (rc)
+	for (i = 0; i < PS2MULT_NUM_PORTS; i++) {
+		psm->ports[i].sel = ps2mult_controls[i];
+		error = ps2mult_create_port(psm, i);
+		if (error)
 			goto err_out;
 	}
 
-	serio_open(serio, drv);
+	psm->in_port = psm->out_port = &psm->ports[PS2MULT_KBD_PORT];
 
-	rc = ps2mult_reconnect(serio);
-	if (rc)
+	serio_set_drvdata(serio, psm);
+	error = serio_open(serio, drv);
+	if (error)
 		goto err_out;
 
+	ps2mult_reset(psm);
+
+	for (i = 0; i <  PS2MULT_NUM_PORTS; i++)
+		serio_register_port(psm->ports[i].serio);
+
 	return 0;
 
 err_out:
-	ps2mult_disconnect(serio);
+	while (--i >= 0)
+		kfree(psm->ports[i].serio);
+	kfree(serio);
+	return error;
+}
+
+static void ps2mult_disconnect(struct serio *serio)
+{
+	struct ps2mult *psm = serio_get_drvdata(serio);
+
+	/* Note that serio core already take care of children ports */
+	serio_write(serio, PS2MULT_SESSION_END);
+	serio_close(serio);
+	kfree(psm);
 
-	return rc;
+	serio_set_drvdata(serio, NULL);
+}
+
+static int ps2mult_reconnect(struct serio *serio)
+{
+	struct ps2mult *psm = serio_get_drvdata(serio);
+
+	ps2mult_reset(psm);
+
+	return 0;
 }
 
-static irqreturn_t ps2mult_interrupt(struct serio *serio, unsigned char data,
-		unsigned int flags)
+static irqreturn_t ps2mult_interrupt(struct serio *serio,
+				     unsigned char data, unsigned int dfl)
 {
 	struct ps2mult *psm = serio_get_drvdata(serio);
+	struct ps2mult_port *in_port;
+	unsigned long flags;
+
+	dev_dbg(&serio->dev, "Received %02x flags %02x\n", data, dfl);
+
+	spin_lock_irqsave(&psm->lock, flags);
 
-	dev_dbg(&serio->dev, "Received %02x flags %02x\n", data, flags);
 	if (psm->escape) {
-		spin_lock(&psm->lock);
-		if (psm->in_serio)
-			serio_interrupt(psm->in_serio, data, flags);
-		spin_unlock(&psm->lock);
-
-		psm->escape = 0;
-	} else
-		switch (data) {
-		case PS2MULT_ESCAPE:
-			dev_dbg(&serio->dev, "ESCAPE\n");
-			psm->escape = 1;
-			break;
-		case PS2MULT_BSYNC:
-			dev_dbg(&serio->dev, "BSYNC\n");
-			spin_lock(&psm->lock);
-			psm->in_serio = psm->out_serio;
-			spin_unlock(&psm->lock);
-			break;
-		case PS2MULT_SESSION_START:
-			dev_dbg(&serio->dev, "SS\n");
-			break;
-		case PS2MULT_SESSION_END:
-			dev_dbg(&serio->dev, "SE\n");
-			break;
-		case PS2MULT_KB_SELECTOR:
-			dev_dbg(&serio->dev, "KB\n");
-
-			spin_lock(&psm->lock);
-			psm->in_serio = psm->ports[0].serio;
-			spin_unlock(&psm->lock);
-
-			break;
-		case PS2MULT_MS_SELECTOR:
-			dev_dbg(&serio->dev, "MS\n");
-
-			spin_lock(&psm->lock);
-			psm->in_serio = psm->ports[1].serio;
-			spin_unlock(&psm->lock);
-
-			break;
-		default:
-			spin_lock(&psm->lock);
-			if (psm->in_serio)
-				serio_interrupt(psm->in_serio, data, flags);
-			spin_unlock(&psm->lock);
-		}
+		psm->escape = false;
+		in_port = psm->in_port;
+		if (in_port->serio)
+			serio_interrupt(in_port->serio, data, dfl);
+		goto out;
+	}
+
+	switch (data) {
+	case PS2MULT_ESCAPE:
+		dev_dbg(&serio->dev, "ESCAPE\n");
+		psm->escape = true;
+		break;
+
+	case PS2MULT_BSYNC:
+		dev_dbg(&serio->dev, "BSYNC\n");
+		psm->in_port = psm->out_port;
+		break;
+
+	case PS2MULT_SESSION_START:
+		dev_dbg(&serio->dev, "SS\n");
+		break;
+
+	case PS2MULT_SESSION_END:
+		dev_dbg(&serio->dev, "SE\n");
+		break;
+
+	case PS2MULT_KB_SELECTOR:
+		dev_dbg(&serio->dev, "KB\n");
+		psm->in_port = &psm->ports[PS2MULT_KBD_PORT];
+		break;
+
+	case PS2MULT_MS_SELECTOR:
+		dev_dbg(&serio->dev, "MS\n");
+		psm->in_port = &psm->ports[PS2MULT_MOUSE_PORT];
+		break;
+
+	default:
+		in_port = psm->in_port;
+		if (in_port->serio)
+			serio_interrupt(in_port->serio, data, dfl);
+	}
+
+ out:
+	spin_unlock_irqrestore(&psm->lock, flags);
 	return IRQ_HANDLED;
 }
 
#3 lore raw

Hello,

Quoted 9 lines · Dmitry Torokhov
Quoted 8 lines · Dmitry Eremin-Solenikov
Quoted 6 lines · Dmitry Eremin-Solenikov

PS2Mult is a simple serial protocol used for multiplexing several PS/2 streams into one serial data stream. It's used e.g. on TQM85xx serie of boards.

---

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

It actually depends on "serio: multiple children" patch. I'm not resending it as you were the originator of the latest version of the patch.

So, what about this version of patch?

Looks better but I think you also need ->start() to make sure you do not try to deliver events too early. Does the following still work for you?

Sorry for the delay. Crashes w/o the attached patch.

Signature · 2 lines
With best wishes
Dmitry

From f3307e6693e04285c5be6c9dcf3aabc091f47686 Mon Sep 17 00:00:00 2001
From: Dmitry Eremin-Solenikov <[email protected]>
Date: Thu, 7 Oct 2010 18:32:26 +0400
Subject: [PATCH] ps2mult: don't try to register empty serio pointers

---
 drivers/input/serio/ps2mult.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
drivers/input/serio/ps2mult.c +0 -3
index 3664398..15341d1 100644
@@ -196,9 +196,6 @@ static int ps2mult_connect(struct serio *serio, struct serio_driver *drv)
 
 	ps2mult_reset(psm);
 
-	for (i = 0; i <  PS2MULT_NUM_PORTS; i++)
-		serio_register_port(psm->ports[i].serio);
-
 	return 0;
 
 err_out:
Signature · 1 line
1.7.1
maintainer
#4 lore raw
Quoted 16 lines · Dmitry Eremin-Solenikov

Hello,

Quoted 12 lines · Dmitry Torokhov
Quoted 11 lines · Dmitry Eremin-Solenikov
Quoted 8 lines · Dmitry Eremin-Solenikov

PS2Mult is a simple serial protocol used for multiplexing several PS/2 streams into one serial data stream. It's used e.g. on TQM85xx serie of boards.

---

It actually depends on "serio: multiple children" patch. I'm not resending it as you were the originator of the latest version of the patch.

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

So, what about this version of patch?

Looks better but I think you also need ->start() to make sure you do not try to deliver events too early. Does the following still work for you?

Sorry for the delay. Crashes w/o the attached patch.

Ah, I see, however what I actually wanted is to create ports before hand and handle any errors that might arise and then enable the device and register child ports.

If you apply the patch below instead of yours does it still work?

Thanks.

Signature · 9 lines
Dmitry

Input: ps2mult - don't register ports twice

Signed-off-by: Dmitry Torokhov <[email protected]>
---

 drivers/input/serio/ps2mult.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
drivers/input/serio/ps2mult.c +6 -5
index 3664398..52b58de 100644
@@ -144,9 +144,6 @@ static int ps2mult_create_port(struct ps2mult *psm, int i)
 	serio->parent = psm->mx_serio;
 	serio->port_data = &psm->ports[i];
 
-	serio_register_port(serio);
-	dev_info(&serio->dev, "%s port at %s\n", serio->name, mx_serio->phys);
-
 	return 0;
 }
 
@@ -196,8 +193,12 @@ static int ps2mult_connect(struct serio *serio, struct serio_driver *drv)
 
 	ps2mult_reset(psm);
 
-	for (i = 0; i <  PS2MULT_NUM_PORTS; i++)
-		serio_register_port(psm->ports[i].serio);
+	for (i = 0; i <  PS2MULT_NUM_PORTS; i++) {
+		struct serio *s = psm->ports[i].serio;
+
+		dev_info(&serio->dev, "%s port at %s\n", s->name, serio->phys);
+		serio_register_port(s);
+	}
 
 	return 0;
 
#5 lore raw

Hello,

Quoted 23 lines · Dmitry Torokhov
Quoted 22 lines · Dmitry Eremin-Solenikov

Hello,

Quoted 17 lines · Dmitry Torokhov
Quoted 5 lines · Dmitry Eremin-Solenikov
Quoted 3 lines · Dmitry Eremin-Solenikov

PS2Mult is a simple serial protocol used for multiplexing several PS/2 streams into one serial data stream. It's used e.g. on TQM85xx serie of boards.

Quoted 8 lines
Quoted 5 lines

---

It actually depends on "serio: multiple children" patch. I'm not resending it as you were the originator of the latest version of the patch.

So, what about this version of patch?

Looks better but I think you also need ->start() to make sure you do not try to deliver events too early. Does the following still work for you?

Quoted 8 lines
Quoted 2 lines

Sorry for the delay. Crashes w/o the attached patch.

Ah, I see, however what I actually wanted is to create ports before hand and handle any errors that might arise and then enable the device and register child ports.

If you apply the patch below instead of yours does it still work?

It won't work, as we don't set psm->ports[i].serio before ps2mult_serio_start()

Quoted 45 lines

Thanks.

--
Dmitry

Input: ps2mult - don't register ports twice

---

 drivers/input/serio/ps2mult.c |   11 ++++++-----

 1 files changed, 6 insertions(+), 5 deletions(-)
drivers/input/serio/ps2mult.c +6 -5
index 3664398..52b58de 100644
@@ -144,9 +144,6 @@ static int ps2mult_create_port(struct ps2mult *psm, int i)
        serio->parent = psm->mx_serio;
        serio->port_data = &psm->ports[i];
 
-       serio_register_port(serio);
-       dev_info(&serio->dev, "%s port at %s\n", serio->name, mx_serio->phys);
-
        return 0;
  }
 
@@ -196,8 +193,12 @@ static int ps2mult_connect(struct serio *serio, struct serio_driver *drv)
 
        ps2mult_reset(psm);
 
-       for (i = 0; i <  PS2MULT_NUM_PORTS; i++)
-               serio_register_port(psm->ports[i].serio);
+       for (i = 0; i <  PS2MULT_NUM_PORTS; i++) {
+               struct serio *s = psm->ports[i].serio;
+
+               dev_info(&serio->dev, "%s port at %s\n", s->name, serio->phys);
+               serio_register_port(s);
+       }
 
        return 0;
 
Signature · 6 lines
With best wishes
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#6 lore raw
Quoted 30 lines · Dmitry Eremin-Solenikov

Hello,

Quoted 26 lines · Dmitry Torokhov
Quoted 24 lines · Dmitry Eremin-Solenikov

Hello,

Quoted 9 lines · Dmitry Torokhov
Quoted 8 lines · Dmitry Eremin-Solenikov
Quoted 6 lines · Dmitry Eremin-Solenikov

PS2Mult is a simple serial protocol used for multiplexing several PS/2 streams into one serial data stream. It's used e.g. on TQM85xx serie of boards.

---

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

It actually depends on "serio: multiple children" patch. I'm not resending it as you were the originator of the latest version of the patch.

So, what about this version of patch?

Looks better but I think you also need ->start() to make sure you do not try to deliver events too early. Does the following still work for you?

Sorry for the delay. Crashes w/o the attached patch.

Quoted 7 lines
Quoted 5 lines

Ah, I see, however what I actually wanted is to create ports before hand and handle any errors that might arise and then enable the device and register child ports.

If you apply the patch below instead of yours does it still work?

It won't work, as we don't set psm->ports[i].serio before ps2mult_serio_start()

ping?

Signature · 2 lines
With best wishes
Dmitry
maintainer
#7 lore raw
In reply to Dmitry Eremin-Solenikov
Quoted 30 lines · Dmitry Eremin-Solenikov

Hello,

Quoted 26 lines · Dmitry Torokhov
Quoted 24 lines · Dmitry Eremin-Solenikov

Hello,

Quoted 9 lines · Dmitry Torokhov
Quoted 8 lines · Dmitry Eremin-Solenikov
Quoted 6 lines · Dmitry Eremin-Solenikov

PS2Mult is a simple serial protocol used for multiplexing several PS/2 streams into one serial data stream. It's used e.g. on TQM85xx serie of boards.

---

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

It actually depends on "serio: multiple children" patch. I'm not resending it as you were the originator of the latest version of the patch.

So, what about this version of patch?

Looks better but I think you also need ->start() to make sure you do not try to deliver events too early. Does the following still work for you?

Sorry for the delay. Crashes w/o the attached patch.

Quoted 8 lines
Quoted 5 lines

Ah, I see, however what I actually wanted is to create ports before hand and handle any errors that might arise and then enable the device and register child ports.

If you apply the patch below instead of yours does it still work?

It won't work, as we don't set psm->ports[i].serio before ps2mult_serio_start()

Indeed. I guess we need to set the pointer immediately then and also add a flag to the port structure telling whether it has been registered. Does the following work for you by any chance?

Thanks.

Signature · 9 lines
Dmitry

Input: ps2mult - don't register ports twice

Signed-off-by: Dmitry Torokhov <[email protected]>
---

 drivers/input/serio/ps2mult.c |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)
drivers/input/serio/ps2mult.c +13 -8
index 3664398..ec8f8c1 100644
@@ -28,6 +28,7 @@ MODULE_LICENSE("GPL");
 struct ps2mult_port {
 	struct serio *serio;
 	unsigned char sel;
+	bool registered;
 };
 
 #define PS2MULT_NUM_PORTS	2
@@ -107,7 +108,7 @@ static int ps2mult_serio_start(struct serio *serio)
 	unsigned long flags;
 
 	spin_lock_irqsave(&psm->lock, flags);
-	port->serio = serio;
+	port->registered = true;
 	spin_unlock_irqrestore(&psm->lock, flags);
 
 	return 0;
@@ -120,7 +121,7 @@ static void ps2mult_serio_stop(struct serio *serio)
 	unsigned long flags;
 
 	spin_lock_irqsave(&psm->lock, flags);
-	port->serio = NULL;
+	port->registered = false;
 	spin_unlock_irqrestore(&psm->lock, flags);
 }
 
@@ -144,8 +145,7 @@ static int ps2mult_create_port(struct ps2mult *psm, int i)
 	serio->parent = psm->mx_serio;
 	serio->port_data = &psm->ports[i];
 
-	serio_register_port(serio);
-	dev_info(&serio->dev, "%s port at %s\n", serio->name, mx_serio->phys);
+	psm->ports[i].serio = serio;
 
 	return 0;
 }
@@ -196,8 +196,12 @@ static int ps2mult_connect(struct serio *serio, struct serio_driver *drv)
 
 	ps2mult_reset(psm);
 
-	for (i = 0; i <  PS2MULT_NUM_PORTS; i++)
-		serio_register_port(psm->ports[i].serio);
+	for (i = 0; i <  PS2MULT_NUM_PORTS; i++) {
+		struct serio *s = psm->ports[i].serio;
+
+		dev_info(&serio->dev, "%s port at %s\n", s->name, serio->phys);
+		serio_register_port(s);
+	}
 
 	return 0;
 
@@ -243,7 +247,7 @@ static irqreturn_t ps2mult_interrupt(struct serio *serio,
 	if (psm->escape) {
 		psm->escape = false;
 		in_port = psm->in_port;
-		if (in_port->serio)
+		if (in_port->registered)
 			serio_interrupt(in_port->serio, data, dfl);
 		goto out;
 	}
@@ -279,8 +283,9 @@ static irqreturn_t ps2mult_interrupt(struct serio *serio,
 
 	default:
 		in_port = psm->in_port;
-		if (in_port->serio)
+		if (in_port->registered)
 			serio_interrupt(in_port->serio, data, dfl);
+		break;
 	}
 
  out:
#8 lore raw

Hello,

Quoted 35 lines · Dmitry Torokhov
Quoted 34 lines · Dmitry Eremin-Solenikov

Hello,

Quoted 30 lines · Dmitry Torokhov
Quoted 16 lines · Dmitry Eremin-Solenikov

Hello,

Quoted 12 lines · Dmitry Torokhov
Quoted 11 lines · Dmitry Eremin-Solenikov
Quoted 8 lines · Dmitry Eremin-Solenikov

PS2Mult is a simple serial protocol used for multiplexing several PS/2 streams into one serial data stream. It's used e.g. on TQM85xx serie of boards.

---

It actually depends on "serio: multiple children" patch. I'm not resending it as you were the originator of the latest version of the patch.

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

So, what about this version of patch?

Looks better but I think you also need ->start() to make sure you do not try to deliver events too early. Does the following still work for you?

Sorry for the delay. Crashes w/o the attached patch.

Ah, I see, however what I actually wanted is to create ports before hand and handle any errors that might arise and then enable the device and register child ports.

Quoted 8 lines
Quoted 4 lines
Quoted 1 line

If you apply the patch below instead of yours does it still work?

It won't work, as we don't set psm->ports[i].serio before ps2mult_serio_start()

Indeed. I guess we need to set the pointer immediately then and also add a flag to the port structure telling whether it has been registered. Does the following work for you by any chance?

Yeah, works w/o any glitches. Thank you.

Signature · 2 lines
With best wishes
Dmitry
maintainer
#9 lore raw
Quoted 40 lines · Dmitry Eremin-Solenikov

Hello,

Quoted 37 lines · Dmitry Torokhov
Quoted 36 lines · Dmitry Eremin-Solenikov

Hello,

Quoted 31 lines · Dmitry Torokhov
Quoted 16 lines · Dmitry Eremin-Solenikov

Hello,

Quoted 12 lines · Dmitry Torokhov
Quoted 11 lines · Dmitry Eremin-Solenikov
Quoted 8 lines · Dmitry Eremin-Solenikov

PS2Mult is a simple serial protocol used for multiplexing several PS/2 streams into one serial data stream. It's used e.g. on TQM85xx serie of boards.

---

It actually depends on "serio: multiple children" patch. I'm not resending it as you were the originator of the latest version of the patch.

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

So, what about this version of patch?

Looks better but I think you also need ->start() to make sure you do not try to deliver events too early. Does the following still work for you?

Sorry for the delay. Crashes w/o the attached patch.

Ah, I see, however what I actually wanted is to create ports before hand and handle any errors that might arise and then enable the device and register child ports.

If you apply the patch below instead of yours does it still work?

Quoted 9 lines
Quoted 6 lines
Quoted 2 lines

It won't work, as we don't set psm->ports[i].serio before ps2mult_serio_start()

Indeed. I guess we need to set the pointer immediately then and also add a flag to the port structure telling whether it has been registered. Does the following work for you by any chance?

Yeah, works w/o any glitches. Thank you.

Thanks Dmitry.

Signature · 1 line
Dmitry
maintainer
#10 lore raw
Quoted 44 lines · Dmitry Torokhov
Quoted 43 lines · Dmitry Eremin-Solenikov

Hello,

Quoted 40 lines · Dmitry Torokhov
Quoted 38 lines · Dmitry Eremin-Solenikov

Hello,

Quoted 23 lines · Dmitry Torokhov
Quoted 22 lines · Dmitry Eremin-Solenikov

Hello,

Quoted 17 lines · Dmitry Torokhov
Quoted 5 lines · Dmitry Eremin-Solenikov
Quoted 3 lines · Dmitry Eremin-Solenikov

PS2Mult is a simple serial protocol used for multiplexing several PS/2 streams into one serial data stream. It's used e.g. on TQM85xx serie of boards.

Quoted 8 lines
Quoted 5 lines

---

It actually depends on "serio: multiple children" patch. I'm not resending it as you were the originator of the latest version of the patch.

So, what about this version of patch?

Looks better but I think you also need ->start() to make sure you do not try to deliver events too early. Does the following still work for you?

Quoted 8 lines
Quoted 2 lines

Sorry for the delay. Crashes w/o the attached patch.

Ah, I see, however what I actually wanted is to create ports before hand and handle any errors that might arise and then enable the device and register child ports.

If you apply the patch below instead of yours does it still work?

It won't work, as we don't set psm->ports[i].serio before ps2mult_serio_start()

Quoted 9 lines
Quoted 6 lines
Quoted 3 lines

Indeed. I guess we need to set the pointer immediately then and also add a flag to the port structure telling whether it has been registered. Does the following work for you by any chance?

Yeah, works w/o any glitches. Thank you.

Thanks Dmitry.

BTW, is there corresponding patches to inputattach?

Signature · 1 line
Dmitry
#11 lore raw
Quoted 2 lines · Dmitry Torokhov

BTW, is there corresponding patches to inputattach?

Attached.

Signature · 2 lines
With best wishes
Dmitry
utils/inputattach.c +3 -0
Index: joystick-20051019/utils/inputattach.c
===================================================================
@@ -536,6 +536,9 @@
 { "--fujitsu",		"-fjt",	"Fujitsu serial touchscreen",
 	B9600, CS8,
 	SERIO_FUJITSU,		0x00,	0x00,	1,	fujitsu_init },
+{ "--ps2mult",	"-ps2m",	"PS/2 serial multiplexer",
+	B57600, CS8,
+	SERIO_PS2MULT,		0x00,	0x00,	1,	NULL },
 { "--dump",		"-dump",	"Just enable device",
 	B2400, CS8,
 	0,			0x00,	0x00,	0,	dump_init },
utils/serio-ids.h +3 -0
Index: joystick-20051019/utils/serio-ids.h
===================================================================
@@ -122,5 +122,8 @@
 #ifndef SERIO_W8001
 # define SERIO_W8001		0x39
 #endif
+#ifndef SERIO_PSMULT
+# define SERIO_PS2MULT		0x3c
+#endif
 
 #endif
maintainer
#12 lore raw
Quoted 7 lines · Dmitry Eremin-Solenikov
Quoted 2 lines · Dmitry Torokhov

BTW, is there corresponding patches to inputattach?

Attached.

Thank you. Could I get your sign off for it as well, please?

Signature · 1 line
Dmitry