From: Giridhar Pemmasani <[EMAIL PROTECTED]>

During initialization, mv643xx driver registers IRQ before setting up tx/rx
rings.  This causes kernel oops because mv643xx_poll, which gets called
right after registering IRQ, calls netif_rx_complete, which accesses the rx
ring (I don't have the oops message anymore; I just remember this sequence
of calls).  Attached (tested) patch first initializes the rx/tx rings and
then registers the IRQ.

Signed-off-by: Giridhar Pemmasani <[EMAIL PROTECTED]>
Cc: Dale Farnsworth <[EMAIL PROTECTED]>
Cc: Jeff Garzik <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 drivers/net/mv643xx_eth.c |   40 +++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff -puN 
drivers/net/mv643xx_eth.c~mv643xx-ethernet-driver-irq-registration-fix 
drivers/net/mv643xx_eth.c
--- a/drivers/net/mv643xx_eth.c~mv643xx-ethernet-driver-irq-registration-fix
+++ a/drivers/net/mv643xx_eth.c
@@ -787,14 +787,6 @@ static int mv643xx_eth_open(struct net_d
        unsigned int size;
        int err;
 
-       err = request_irq(dev->irq, mv643xx_eth_int_handler,
-                       IRQF_SHARED | IRQF_SAMPLE_RANDOM, dev->name, dev);
-       if (err) {
-               printk(KERN_ERR "Can not assign IRQ number to MV643XX_eth%d\n",
-                                                               port_num);
-               return -EAGAIN;
-       }
-
        eth_port_init(mp);
 
        memset(&mp->timeout, 0, sizeof(struct timer_list));
@@ -806,8 +798,7 @@ static int mv643xx_eth_open(struct net_d
                                                                GFP_KERNEL);
        if (!mp->rx_skb) {
                printk(KERN_ERR "%s: Cannot allocate Rx skb ring\n", dev->name);
-               err = -ENOMEM;
-               goto out_free_irq;
+               return -ENOMEM;
        }
        mp->tx_skb = kmalloc(sizeof(*mp->tx_skb) * mp->tx_ring_size,
                                                                GFP_KERNEL);
@@ -861,13 +852,8 @@ static int mv643xx_eth_open(struct net_d
                                                        dev->name, size);
                printk(KERN_ERR "%s: Freeing previously allocated TX queues...",
                                                        dev->name);
-               if (mp->rx_sram_size)
-                       iounmap(mp->p_tx_desc_area);
-               else
-                       dma_free_coherent(NULL, mp->tx_desc_area_size,
-                                       mp->p_tx_desc_area, mp->tx_desc_dma);
                err = -ENOMEM;
-               goto out_free_tx_skb;
+               goto out_free_tx_ring;
        }
        memset((void *)mp->p_rx_desc_area, 0, size);
 
@@ -875,6 +861,14 @@ static int mv643xx_eth_open(struct net_d
 
        mv643xx_eth_rx_refill_descs(dev);       /* Fill RX ring with skb's */
 
+       err = request_irq(dev->irq, mv643xx_eth_int_handler,
+                       IRQF_SHARED | IRQF_SAMPLE_RANDOM, dev->name, dev);
+       if (err) {
+               printk(KERN_ERR "Can not assign IRQ number to MV643XX_eth%d\n",
+                       port_num);
+               goto out_free_rx_ring;
+       }
+
        /* 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);
@@ -900,12 +894,22 @@ static int mv643xx_eth_open(struct net_d
 
        return 0;
 
+out_free_rx_ring:
+       if (mp->rx_sram_size)
+               iounmap(mp->p_rx_desc_area);
+       else
+               dma_free_coherent(NULL, mp->rx_desc_area_size,
+                       mp->p_rx_desc_area, mp->rx_desc_dma);
+out_free_tx_ring:
+       if (mp->tx_sram_size)
+               iounmap(mp->p_tx_desc_area);
+       else
+               dma_free_coherent(NULL, mp->tx_desc_area_size,
+                               mp->p_tx_desc_area, mp->tx_desc_dma);
 out_free_tx_skb:
        kfree(mp->tx_skb);
 out_free_rx_skb:
        kfree(mp->rx_skb);
-out_free_irq:
-       free_irq(dev->irq, dev);
 
        return err;
 }
_
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to