* [PATCH 1/2] r6040: restore MIER register correctly when IRQ line is shared
@ 2009-07-08 13:05 Florian Fainelli
2009-07-08 17:50 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Florian Fainelli @ 2009-07-08 13:05 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Steve Holland, Joe Chou
When the r6040 device IRQ line is shared we will enter the driver
interrupt service routine, mask off the device interrupt enable
register (MIER) and return with IRQ_NONE, we would then leave the
device with interrupts disabled, this patch fixes that issue.
Reported-by: Steve Holland <sdh4@iastate.edu>
Signed-off-by: Joe Chou <joe.chou@rdc.com.tw>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
index 57c31b8..e532be4 100644
--- a/drivers/net/r6040.c
+++ b/drivers/net/r6040.c
@@ -704,8 +704,11 @@ static irqreturn_t r6040_interrupt(int irq, void *dev_id)
/* Read MISR status and clear */
status = ioread16(ioaddr + MISR);
- if (status == 0x0000 || status == 0xffff)
+ if (status == 0x0000 || status == 0xffff) {
+ /* Restore RDC MAC interrupt */
+ iowrite16(misr, ioaddr + MIER);
return IRQ_NONE;
+ }
/* RX interrupt request */
if (status & RX_INTS) {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/2] r6040: restore MIER register correctly when IRQ line is shared
2009-07-08 13:05 [PATCH 1/2] r6040: restore MIER register correctly when IRQ line is shared Florian Fainelli
@ 2009-07-08 17:50 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2009-07-08 17:50 UTC (permalink / raw)
To: florian; +Cc: netdev, sdh4, joe.chou
From: Florian Fainelli <florian@openwrt.org>
Date: Wed, 8 Jul 2009 15:05:14 +0200
> When the r6040 device IRQ line is shared we will enter the driver
> interrupt service routine, mask off the device interrupt enable
> register (MIER) and return with IRQ_NONE, we would then leave the
> device with interrupts disabled, this patch fixes that issue.
>
> Reported-by: Steve Holland <sdh4@iastate.edu>
> Signed-off-by: Joe Chou <joe.chou@rdc.com.tw>
> Signed-off-by: Florian Fainelli <florian@openwrt.org>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-07-08 17:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-08 13:05 [PATCH 1/2] r6040: restore MIER register correctly when IRQ line is shared Florian Fainelli
2009-07-08 17:50 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).