diff options
| author | Michael Chan <mchan@broadcom.com> | 2008-01-21 17:06:09 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:10:13 -0800 |
| commit | 2dd201d7b735f252df1a915a3f2e6a71910a3d87 (patch) | |
| tree | 09a3fa5be7947c52a30cf640c40b230eb6cc72d6 /drivers/net | |
| parent | 819d772b0ceddebb5b4907d5aa5505c99aec985b (diff) | |
| download | op-kernel-dev-2dd201d7b735f252df1a915a3f2e6a71910a3d87.zip op-kernel-dev-2dd201d7b735f252df1a915a3f2e6a71910a3d87.tar.gz | |
[BNX2]: Disable jumbo rx paging on 5709 Ax.
The chip has problem running in this mode and needs to be disabled.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/bnx2.c | 4 | ||||
| -rw-r--r-- | drivers/net/bnx2.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 3bb69d5..4473461 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -4669,7 +4669,7 @@ bnx2_set_rx_ring_size(struct bnx2 *bp, u32 size) bp->rx_pg_ring_size = 0; bp->rx_max_pg_ring = 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; jumbo_size = size * pages; @@ -7031,6 +7031,8 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev) goto err_out_unmap; } bp->flags |= PCIE_FLAG; + if (CHIP_REV(bp) == CHIP_REV_Ax) + bp->flags |= JUMBO_BROKEN_FLAG; } else { bp->pcix_cap = pci_find_capability(pdev, PCI_CAP_ID_PCIX); if (bp->pcix_cap == 0) { diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h index 09bd665..c1ab30b 100644 --- a/drivers/net/bnx2.h +++ b/drivers/net/bnx2.h @@ -6582,6 +6582,7 @@ struct bnx2 { #define PCIE_FLAG 0x00000200 #define USING_MSIX_FLAG 0x00000400 #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. */ |
