Skip to contentSkip to conversation

omap-keypad: Use disable_irq_nosync() from within irq handlers.

PATCH Applied Ben Nizette 3 participants 6 messages Apr 16, 2009 – Apr 20, 2009

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

PATCH 3/9 omap-keypad: Use disable_irq_nosync() from within irq handlers.

disable_irq() should wait for all running handlers to complete before returning. As such, if it's used to disable an interrupt from that interrupt's handler it will deadlock. This replaces the dangerous instances with the _nosync() variant which doesn't have this problem.

This patch may be overly paranoid, it'd be cleaner to just disable all the row irqs _nosync() but it wouldn't be as correct. Up to $MAINTAINER :-)

---

drivers/input/keyboard/omap-keypad.c +10 -2
index 058fa8b..9606a1c 100644
@@ -100,8 +100,16 @@ static irqreturn_t omap_kp_interrupt(int irq, void *dev_id)
 	/* disable keyboard interrupt and schedule for handling */
 	if (cpu_is_omap24xx()) {
 		int i;
-		for (i = 0; i < omap_kp->rows; i++)
-			disable_irq(gpio_to_irq(row_gpios[i]));
+		for (i = 0; i < omap_kp->rows; i++) {
+			/* The interrupt which we're currently handling should
+			 * be disabled _nosync() to avoid deadlocks waiting
+			 * for this handler to complete.  All others should
+			 * be disabled the regular way for SMP safety. */
+			if (gpio_to_irq(row_gpios[i]) == irq)
+				disable_irq_nosync(gpio_to_irq(row_gpios[i]));
+			else
+				disable_irq(gpio_to_irq(row_gpios[i]));
+		}
 	} else
 		/* disable keyboard interrupt and schedule for handling */
 		omap_writew(1, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
Signature · 1 line
1.6.0.2
#1 lore raw

HowTo write a driver for 2 multiplexed PS/2 ports over 1 UART?

Hello,

I maybe get a projekt, where I have 2 PS/2 ports (a keyboard and a mousse) connected to one UART and the multiplexing is done by a PIC.

I searched in actual 2.6 Kernel sources for such a solution, but couln;t find one. Overlooked I something?

For 2.4er Kernel there was such a driver, see

http://git.denx.de/?p=linuxppc_2_4_devel.git;a=blob;f=drivers/char/ps2mult.c

but, I think, this is no longer portable to 2.6.

So, thats why I am here and want to ask the experts how to solve this problem in a mainline acceptable way, before I make a hack, that never has a chance to go in mainline.

Some suggestions from me (maybe they are all bad)

I looked in drivers/input/serio/serio.c and could think of adding the multiplexing in serio_interrupt(), and call serio_driver specific serio->drv->interrupt functions, when I know, which byte come from which device. But, if I see it right, I can only add one "struct serio_driver *drv;" driver to one serio port, so it is not possible to handle 2 or more devices over one serio port :-(
Maybe we enhance this too ... ?

Or I make a combinated (keyboard/mousse) driver which uses one serio port ... but I think thats a bad idea, also no idea, in which directory i have to add such a driver.

So I think it would nice to have the possibility to add more than one serio_driver to a serio_port and add a "multiplexer" layer ... but I am new to the input layer, so I ask the experts.

Hopefully I just missed something in actual code, and there is better/easier way? ;-)

TIA
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
maintainer
#2 lore raw

Re: HowTo write a driver for 2 multiplexed PS/2 ports over 1 UART?

Hi Heiko,

Quoted 32 lines · Heiko Schocher

Hello,

I maybe get a projekt, where I have 2 PS/2 ports (a keyboard and a mousse) connected to one UART and the multiplexing is done by a PIC.

I searched in actual 2.6 Kernel sources for such a solution, but couln;t find one. Overlooked I something?

For 2.4er Kernel there was such a driver, see

http://git.denx.de/?p=linuxppc_2_4_devel.git;a=blob;f=drivers/char/ps2mult.c

but, I think, this is no longer portable to 2.6.

So, thats why I am here and want to ask the experts how to solve this problem in a mainline acceptable way, before I make a hack, that never has a chance to go in mainline.

Some suggestions from me (maybe they are all bad)

I looked in drivers/input/serio/serio.c and could think of adding the multiplexing in serio_interrupt(), and call serio_driver specific serio->drv->interrupt functions, when I know, which byte come from which device. But, if I see it right, I can only add one "struct serio_driver *drv;" driver to one serio port, so it is not possible to handle 2 or more devices over one serio port :-(
Maybe we enhance this too ... ?

Or I make a combinated (keyboard/mousse) driver which uses one serio port ... but I think thats a bad idea, also no idea, in which directory i have to add such a driver.

Quoted 7 lines

So I think it would nice to have the possibility to add more than one serio_driver to a serio_port and add a "multiplexer" layer ... but I am new to the input layer, so I ask the experts.

Hopefully I just missed something in actual code, and there is better/easier way? ;-)

You need to create 2 serio ports in your driver and have it send data into appropriate port, depending on what device it came from. If you take a look at i8042 driver it does exactly that. We have 1 serio port for keyboard and eithe 1 or 4 AUX serio ports. In i8042_interrupt we check the status bit to figure to which serio port incoming byte should be routed and act accordingly.

Hope this helps.

Signature · 1 line
Dmitry
#3 lore raw

Re: HowTo write a driver for 2 multiplexed PS/2 ports over 1 UART?

Hello Dmitry,

Quoted 41 lines · Dmitry Torokhov
Quoted 32 lines · Heiko Schocher

Hello,

I maybe get a projekt, where I have 2 PS/2 ports (a keyboard and a mousse) connected to one UART and the multiplexing is done by a PIC.

I searched in actual 2.6 Kernel sources for such a solution, but couln;t find one. Overlooked I something?

For 2.4er Kernel there was such a driver, see

http://git.denx.de/?p=linuxppc_2_4_devel.git;a=blob;f=drivers/char/ps2mult.c

but, I think, this is no longer portable to 2.6.

So, thats why I am here and want to ask the experts how to solve this problem in a mainline acceptable way, before I make a hack, that never has a chance to go in mainline.

Some suggestions from me (maybe they are all bad)

I looked in drivers/input/serio/serio.c and could think of adding the multiplexing in serio_interrupt(), and call serio_driver specific serio->drv->interrupt functions, when I know, which byte come from which device. But, if I see it right, I can only add one "struct serio_driver *drv;" driver to one serio port, so it is not possible to handle 2 or more devices over one serio port :-(
Maybe we enhance this too ... ?

Or I make a combinated (keyboard/mousse) driver which uses one serio port ... but I think thats a bad idea, also no idea, in which directory i have to add such a driver.

Quoted 7 lines

So I think it would nice to have the possibility to add more than one serio_driver to a serio_port and add a "multiplexer" layer ... but I am new to the input layer, so I ask the experts.

Hopefully I just missed something in actual code, and there is better/easier way? ;-)

Quoted 6 lines

You need to create 2 serio ports in your driver and have it send data into appropriate port, depending on what device it came from. If you take a look at i8042 driver it does exactly that. We have 1 serio port for keyboard and eithe 1 or 4 AUX serio ports. In i8042_interrupt we check the status bit to figure to which serio port incoming byte should be routed and act accordingly.

Ah, thanks for this hint :-)

OK, so I have to write a serial driver for the uart on my hardware, and add this in drivers/serio, right?

Hmm.. spontaneous I think (maybe it is a bad thought), what do you think to the following approach:

I didn;t want to write a new serio driver for my uart (mpc5200 internal PSC Uart), because there is a working tty driver for this, and the multi- plexing functionality is just a protocoll ... so I think of using the drivers/serio/serport.c and add this "multiplexing" functionality to the serport.c driver ... is this worth about to think?

this should be a more general approach then writting a special serial driver for "my" UART ... what do you think?

Quoted 1 line

Hope this helps.

of course, thanks!

bye
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
maintainer
#4 lore raw

Re: HowTo write a driver for 2 multiplexed PS/2 ports over 1 UART?

Hi Heiko,

Quoted 19 lines · On Sunday 19 April 2009 03:04:25 Heiko Schocher wrote:

Hello Dmitry,

Quoted 7 lines · Dmitry Torokhov

You need to create 2 serio ports in your driver and have it send data into appropriate port, depending on what device it came from. If you take a look at i8042 driver it does exactly that. We have 1 serio port for keyboard and eithe 1 or 4 AUX serio ports. In i8042_interrupt we check the status bit to figure to which serio port incoming byte should be routed and act accordingly.

Ah, thanks for this hint :-)

OK, so I have to write a serial driver for the uart on my hardware, and add this in drivers/serio, right?

Hmm.. spontaneous I think (maybe it is a bad thought), what do you think to the following approach:

Quoted 9 lines

I didn;t want to write a new serio driver for my uart (mpc5200 internal PSC Uart), because there is a working tty driver for this, and the multi- plexing functionality is just a protocoll ... so I think of using the drivers/serio/serport.c and add this "multiplexing" functionality to the serport.c driver ... is this worth about to think?

this should be a more general approach then writting a special serial driver for "my" UART ... what do you think?

Yes, this is definitely better solution. I did not realize that there was a working driver for your UART. It would be best if your solution extended (and was compatible with) current N_MOUSE line discipline.

Signature · 1 line
Dmitry
#5 lore raw

Re: HowTo write a driver for 2 multiplexed PS/2 ports over 1 UART?

Hello Dmitry,

Quoted 24 lines · Dmitry Torokhov
Quoted 23 lines · On Sunday 19 April 2009 03:04:25 Heiko Schocher wrote:

Hello Dmitry,

Quoted 6 lines · Dmitry Torokhov

You need to create 2 serio ports in your driver and have it send data into appropriate port, depending on what device it came from. If you take a look at i8042 driver it does exactly that. We have 1 serio port for keyboard and eithe 1 or 4 AUX serio ports. In i8042_interrupt we check the status bit to figure to which serio port incoming byte should be routed and act accordingly.

Ah, thanks for this hint :-)

OK, so I have to write a serial driver for the uart on my hardware, and add this in drivers/serio, right?

Hmm.. spontaneous I think (maybe it is a bad thought), what do you think to the following approach:

I didn;t want to write a new serio driver for my uart (mpc5200 internal PSC Uart), because there is a working tty driver for this, and the multi- plexing functionality is just a protocoll ... so I think of using the drivers/serio/serport.c and add this "multiplexing" functionality to the serport.c driver ... is this worth about to think?

Quoted 7 lines
Quoted 3 lines

this should be a more general approach then writting a special serial driver for "my" UART ... what do you think?

Yes, this is definitely better solution. I did not realize that there was a working driver for your UART. It would be best if your solution extended (and was compatible with) current N_MOUSE line discipline.

OK, thanks for your info, I hope I get this project, so I can do this job.

bye
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany