Messages in this thread Patch in this message | | | Date | Thu, 22 Jan 2009 17:12:17 -0800 | From | Greg KH <> | Subject | [patch 23/46] r6040: save and restore MIER correctly in the interrupt routine |
| |
2.6.28-stable review patch. If anyone has any objections, please let us know.
------------------
From: Joe Chou <Joe.Chou@rdc.com.tw>
[ Upstream commit: 3e7c469f07ff14cbf9a814739e1fc99a863e0943 ]
This patch saves the MIER register contents before treating interrupts, then restores them correcty at the end of the interrupt routine.
Signed-off-by: Joe Chou <Joe.Chou@rdc.com.tw> Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- drivers/net/r6040.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
--- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c @@ -681,8 +681,10 @@ static irqreturn_t r6040_interrupt(int i struct net_device *dev = dev_id; struct r6040_private *lp = netdev_priv(dev); void __iomem *ioaddr = lp->base; - u16 status; + u16 misr, status; + /* Save MIER */ + misr = ioread16(ioaddr + MIER); /* Mask off RDC MAC interrupt */ iowrite16(MSK_INT, ioaddr + MIER); /* Read MISR status and clear */ @@ -702,7 +704,7 @@ static irqreturn_t r6040_interrupt(int i dev->stats.rx_fifo_errors++; /* Mask off RX interrupt */ - iowrite16(ioread16(ioaddr + MIER) & ~RX_INTS, ioaddr + MIER); + misr &= ~RX_INTS; netif_rx_schedule(dev, &lp->napi); } @@ -710,6 +712,9 @@ static irqreturn_t r6040_interrupt(int i if (status & TX_INTS) r6040_tx(dev); + /* Restore RDC MAC interrupt */ + iowrite16(misr, ioaddr + MIER); + return IRQ_HANDLED; }
| |