e1000e: add netpoll support for MSI/MSI-X IRQ modes

[net-next-2.6.git] / drivers / net / e1000e / netdev.c

diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index c4ca1629f532e49b502c78b76e0e99226c728379..9b3f0a996b00903763458150b82a32311645c1bd 100644 (file)
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -4595,7 +4595,7 @@ dma_error:
                        i += tx_ring->count;
                i--;
                buffer_info = &tx_ring->buffer_info[i];
-               e1000_put_txbuf(adapter, buffer_info);;
+               e1000_put_txbuf(adapter, buffer_info);
        }
 
        return 0;
@@ -5465,6 +5465,36 @@ static void e1000_shutdown(struct pci_dev *pdev)
 }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
+
+static irqreturn_t e1000_intr_msix(int irq, void *data)
+{
+       struct net_device *netdev = data;
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       int vector, msix_irq;
+
+       if (adapter->msix_entries) {
+               vector = 0;
+               msix_irq = adapter->msix_entries[vector].vector;
+               disable_irq(msix_irq);
+               e1000_intr_msix_rx(msix_irq, netdev);
+               enable_irq(msix_irq);
+
+               vector++;
+               msix_irq = adapter->msix_entries[vector].vector;
+               disable_irq(msix_irq);
+               e1000_intr_msix_tx(msix_irq, netdev);
+               enable_irq(msix_irq);
+
+               vector++;
+               msix_irq = adapter->msix_entries[vector].vector;
+               disable_irq(msix_irq);
+               e1000_msix_other(msix_irq, netdev);
+               enable_irq(msix_irq);
+       }
+
+       return IRQ_HANDLED;
+}
+
 /*
  * Polling 'interrupt' - used by things like netconsole to send skbs
  * without having to re-enable interrupts. It's not called while
@@ -5474,10 +5504,21 @@ static void e1000_netpoll(struct net_device *netdev)
 {
        struct e1000_adapter *adapter = netdev_priv(netdev);
 
-       disable_irq(adapter->pdev->irq);
-       e1000_intr(adapter->pdev->irq, netdev);
-
-       enable_irq(adapter->pdev->irq);
+       switch (adapter->int_mode) {
+       case E1000E_INT_MODE_MSIX:
+               e1000_intr_msix(adapter->pdev->irq, netdev);
+               break;
+       case E1000E_INT_MODE_MSI:
+               disable_irq(adapter->pdev->irq);
+               e1000_intr_msi(adapter->pdev->irq, netdev);
+               enable_irq(adapter->pdev->irq);
+               break;
+       default: /* E1000E_INT_MODE_LEGACY */
+               disable_irq(adapter->pdev->irq);
+               e1000_intr(adapter->pdev->irq, netdev);
+               enable_irq(adapter->pdev->irq);
+               break;
+       }
 }
 #endif