[PATCH] e1000: Fix kernel panic with 82541 LOM

[linux-3.10.git] / drivers / net / e1000 / e1000_main.c

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 82549a6fcfb39500bf1a4ccd1d0cafc378e8d002..9c6c1fbbc4122ddc9eb9f04348be94fd026bbf0e 100644 (file)
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -312,17 +312,28 @@ e1000_up(struct e1000_adapter *adapter)
        e1000_configure_rx(adapter);
        e1000_alloc_rx_buffers(adapter);
 
+#ifdef CONFIG_PCI_MSI
+       if(adapter->hw.mac_type > e1000_82547_rev_2) {
+               adapter->have_msi = TRUE;
+               if((err = pci_enable_msi(adapter->pdev))) {
+                       DPRINTK(PROBE, ERR,
+                        "Unable to allocate MSI interrupt Error: %d\n", err);
+                       adapter->have_msi = FALSE;
+               }
+       }
+#endif
        if((err = request_irq(adapter->pdev->irq, &e1000_intr,
                              SA_SHIRQ | SA_SAMPLE_RANDOM,
                              netdev->name, netdev)))
                return err;
 
        mod_timer(&adapter->watchdog_timer, jiffies);
-       e1000_irq_enable(adapter);
 
 #ifdef CONFIG_E1000_NAPI
        netif_poll_enable(netdev);
 #endif
+       e1000_irq_enable(adapter);
+
        return 0;
 }
 
@@ -333,6 +344,11 @@ e1000_down(struct e1000_adapter *adapter)
 
        e1000_irq_disable(adapter);
        free_irq(adapter->pdev->irq, netdev);
+#ifdef CONFIG_PCI_MSI
+       if(adapter->hw.mac_type > e1000_82547_rev_2 &&
+          adapter->have_msi == TRUE)
+               pci_disable_msi(adapter->pdev);
+#endif
        del_timer_sync(&adapter->tx_fifo_stall_timer);
        del_timer_sync(&adapter->watchdog_timer);
        del_timer_sync(&adapter->phy_info_timer);
@@ -356,6 +372,7 @@ e1000_down(struct e1000_adapter *adapter)
                e1000_read_phy_reg(&adapter->hw, PHY_CTRL, &mii_reg);
                mii_reg |= MII_CR_POWER_DOWN;
                e1000_write_phy_reg(&adapter->hw, PHY_CTRL, mii_reg);
+               mdelay(1);
        }
 }