lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

e1000e: Fix irq_synchronize in MSI-X case

Browse Source 
Based on original patch/work from Jean Delvare <jdelvare@suse.de>
Synchronize all IRQs when in MSI-X IRQ mode.

Jean's original patch hard coded the sync with the 3 possible vectors,
this patch incorporates more flexibility for the future and aligns
with how igb stores the number of vectors into the adapter structure.

CC: Jean Delvare <jdelvare@suse.de>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Acked-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jeff Kirsher
2010-08-02 14:27:23 +00:00
committed by David S. Miller
parent c128ec2920
commit 8e86acd7d5
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/e1000e/e1000.h
View File

@@ -348,6 +348,7 @@ struct e1000_adapter {
u32 test_icr; u32 test_icr;
u32 msg_enable; u32 msg_enable;
unsigned int num_vectors;
struct msix_entry *msix_entries; struct msix_entry *msix_entries;
int int_mode; int int_mode;
u32 eiac_mask; u32 eiac_mask;

26
drivers/net/e1000e/netdev.c
View File

@@ -1785,25 +1785,25 @@ void e1000e_reset_interrupt_capability(struct e1000_adapter *adapter)
void e1000e_set_interrupt_capability(struct e1000_adapter *adapter) void e1000e_set_interrupt_capability(struct e1000_adapter *adapter)
{ {
int err; int err;
int numvecs, i; int i;
switch (adapter->int_mode) { switch (adapter->int_mode) {
case E1000E_INT_MODE_MSIX: case E1000E_INT_MODE_MSIX:
if (adapter->flags & FLAG_HAS_MSIX) { if (adapter->flags & FLAG_HAS_MSIX) {
numvecs = 3; /* RxQ0, TxQ0 and other */ adapter->num_vectors = 3; /* RxQ0, TxQ0 and other */
adapter->msix_entries = kcalloc(numvecs, adapter->msix_entries = kcalloc(adapter->num_vectors,
sizeof(struct msix_entry), sizeof(struct msix_entry),
GFP_KERNEL); GFP_KERNEL);
if (adapter->msix_entries) { if (adapter->msix_entries) {
for (i = 0; i < numvecs; i++) for (i = 0; i < adapter->num_vectors; i++)
adapter->msix_entries[i].entry = i; adapter->msix_entries[i].entry = i;
err = pci_enable_msix(adapter->pdev, err = pci_enable_msix(adapter->pdev,
adapter->msix_entries, adapter->msix_entries,
numvecs); adapter->num_vectors);
if (err == 0) if (err == 0) {
return; return;
}
} }
/* MSI-X failed, so fall through and try MSI */ /* MSI-X failed, so fall through and try MSI */
e_err("Failed to initialize MSI-X interrupts. " e_err("Failed to initialize MSI-X interrupts. "
@@ -1825,6 +1825,9 @@ void e1000e_set_interrupt_capability(struct e1000_adapter *adapter)
/* Don't do anything; this is the system default */ /* Don't do anything; this is the system default */
break; break;
} }
/* store the number of vectors being used */
adapter->num_vectors = 1;
} }
/** /**
@@ -1946,7 +1949,14 @@ static void e1000_irq_disable(struct e1000_adapter *adapter)
if (adapter->msix_entries) if (adapter->msix_entries)
ew32(EIAC_82574, 0); ew32(EIAC_82574, 0);
e1e_flush(); e1e_flush();
synchronize_irq(adapter->pdev->irq);
if (adapter->msix_entries) {
int i;
for (i = 0; i < adapter->num_vectors; i++)
synchronize_irq(adapter->msix_entries[i].vector);
} else {
synchronize_irq(adapter->pdev->irq);
}
} }
/** /**