Commit 2dd201d7 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller

[BNX2]: Disable jumbo rx paging on 5709 Ax.

The chip has problem running in this mode and needs to be disabled.
Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 819d772b
...@@ -4669,7 +4669,7 @@ bnx2_set_rx_ring_size(struct bnx2 *bp, u32 size) ...@@ -4669,7 +4669,7 @@ bnx2_set_rx_ring_size(struct bnx2 *bp, u32 size)
bp->rx_pg_ring_size = 0; bp->rx_pg_ring_size = 0;
bp->rx_max_pg_ring = 0; bp->rx_max_pg_ring = 0;
bp->rx_max_pg_ring_idx = 0; bp->rx_max_pg_ring_idx = 0;
if (rx_space > PAGE_SIZE) { if ((rx_space > PAGE_SIZE) && !(bp->flags & JUMBO_BROKEN_FLAG)) {
int pages = PAGE_ALIGN(bp->dev->mtu - 40) >> PAGE_SHIFT; int pages = PAGE_ALIGN(bp->dev->mtu - 40) >> PAGE_SHIFT;
jumbo_size = size * pages; jumbo_size = size * pages;
...@@ -7031,6 +7031,8 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev) ...@@ -7031,6 +7031,8 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
goto err_out_unmap; goto err_out_unmap;
} }
bp->flags |= PCIE_FLAG; bp->flags |= PCIE_FLAG;
if (CHIP_REV(bp) == CHIP_REV_Ax)
bp->flags |= JUMBO_BROKEN_FLAG;
} else { } else {
bp->pcix_cap = pci_find_capability(pdev, PCI_CAP_ID_PCIX); bp->pcix_cap = pci_find_capability(pdev, PCI_CAP_ID_PCIX);
if (bp->pcix_cap == 0) { if (bp->pcix_cap == 0) {
......
...@@ -6582,6 +6582,7 @@ struct bnx2 { ...@@ -6582,6 +6582,7 @@ struct bnx2 {
#define PCIE_FLAG 0x00000200 #define PCIE_FLAG 0x00000200
#define USING_MSIX_FLAG 0x00000400 #define USING_MSIX_FLAG 0x00000400
#define USING_MSI_OR_MSIX_FLAG (USING_MSI_FLAG | USING_MSIX_FLAG) #define USING_MSI_OR_MSIX_FLAG (USING_MSI_FLAG | USING_MSIX_FLAG)
#define JUMBO_BROKEN_FLAG 0x00000800
/* Put tx producer and consumer fields in separate cache lines. */ /* Put tx producer and consumer fields in separate cache lines. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment