renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 20:23:57 +08:00
Code

tg3: Allow single MSI-X vector allocations

Browse Source 
This patch changes the code to make it legal to allocate only one MSI-X
vector.  It also fixes a bug where the driver was not checking for error
return codes from pci_enable_msix().

Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Matt Carlson 2010-06-05 17:24:34 +00:00 committed by David S. Miller
parent 2601d8a004
commit 2430b031be
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/tg3.c
View File

@ -145,8 +145,6 @@
#define TG3_RX_JMB_BUFF_RING_SIZE \ #define TG3_RX_JMB_BUFF_RING_SIZE \
(sizeof(struct ring_info) * TG3_RX_JUMBO_RING_SIZE) (sizeof(struct ring_info) * TG3_RX_JUMBO_RING_SIZE)
#define TG3_RSS_MIN_NUM_MSIX_VECS 2
/* Due to a hardware bug, the 5701 can only DMA to memory addresses /* Due to a hardware bug, the 5701 can only DMA to memory addresses
* that are at least dword aligned when used in PCIX mode. The driver * that are at least dword aligned when used in PCIX mode. The driver
* works around this bug by double copying the packet. This workaround * works around this bug by double copying the packet. This workaround
@ -8797,9 +8795,9 @@ static bool tg3_enable_msix(struct tg3 *tp)
} }
rc = pci_enable_msix(tp->pdev, msix_ent, tp->irq_cnt); rc = pci_enable_msix(tp->pdev, msix_ent, tp->irq_cnt);
if (rc != 0) { if (rc < 0) {
if (rc < TG3_RSS_MIN_NUM_MSIX_VECS)
return false; return false;
} else if (rc != 0) {
if (pci_enable_msix(tp->pdev, msix_ent, rc)) if (pci_enable_msix(tp->pdev, msix_ent, rc))
return false; return false;
netdev_notice(tp->dev, "Requested %d MSI-X vectors, received %d\n", netdev_notice(tp->dev, "Requested %d MSI-X vectors, received %d\n",
@ -8807,16 +8805,18 @@ static bool tg3_enable_msix(struct tg3 *tp)
tp->irq_cnt = rc; tp->irq_cnt = rc;
} }
tp->tg3_flags3 |= TG3_FLG3_ENABLE_RSS;
for (i = 0; i < tp->irq_max; i++) for (i = 0; i < tp->irq_max; i++)
tp->napi[i].irq_vec = msix_ent[i].vector; tp->napi[i].irq_vec = msix_ent[i].vector;
tp->dev->real_num_tx_queues = 1;
if (tp->irq_cnt > 1) {
tp->tg3_flags3 |= TG3_FLG3_ENABLE_RSS;
if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717) { if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717) {
tp->tg3_flags3 |= TG3_FLG3_ENABLE_TSS; tp->tg3_flags3 |= TG3_FLG3_ENABLE_TSS;
tp->dev->real_num_tx_queues = tp->irq_cnt - 1; tp->dev->real_num_tx_queues = tp->irq_cnt - 1;
} else }
tp->dev->real_num_tx_queues = 1; }
return true; return true;
} }