[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20070308052123.GA5077@xyzzy.farnsworth.org>
Date: Wed, 7 Mar 2007 22:21:23 -0700
From: "Dale Farnsworth" <dale@...nsworth.org>
To: Jeff Garzik <jeff@...zik.org>
Cc: akpm@...ux-foundation.org, netdev@...r.kernel.org,
giri@....cs.sunysb.edu, Giridhar Pemmasani <pgiri@...oo.com>
Subject: [PATCH] mv643xx: Clear pending interrupts before calling request_irq
From: Dale Farnsworth <dale@...nsworth.org>
Signed-off-by: Dale Farnsworth <dale@...nsworth.org>
Acked-by: Giridhar Pemmasani <pgiri@...oo.com>
---
Giri, thank you very much for reporting the problem and confirming
the fix.
Jeff, please apply.
Andrew, this patch supersedes the -mm patch:
mv643xx-ethernet-driver-irq-registration-fix.patch
drivers/net/mv643xx_eth.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 3e045a6..192b390 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -787,6 +787,12 @@ static int mv643xx_eth_open(struct net_device *dev)
unsigned int size;
int err;
+ /* Clear any pending ethernet port interrupts */
+ mv_write(MV643XX_ETH_INTERRUPT_CAUSE_REG(port_num), 0);
+ mv_write(MV643XX_ETH_INTERRUPT_CAUSE_EXTEND_REG(port_num), 0);
+ /* wait for previous write to complete */
+ mv_read (MV643XX_ETH_INTERRUPT_CAUSE_EXTEND_REG(port_num));
+
err = request_irq(dev->irq, mv643xx_eth_int_handler,
IRQF_SHARED | IRQF_SAMPLE_RANDOM, dev->name, dev);
if (err) {
@@ -875,10 +881,6 @@ static int mv643xx_eth_open(struct net_device *dev)
mv643xx_eth_rx_refill_descs(dev); /* Fill RX ring with skb's */
- /* Clear any pending ethernet port interrupts */
- mv_write(MV643XX_ETH_INTERRUPT_CAUSE_REG(port_num), 0);
- mv_write(MV643XX_ETH_INTERRUPT_CAUSE_EXTEND_REG(port_num), 0);
-
eth_port_start(dev);
/* Interrupt Coalescing */
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists