aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2.c
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2008-11-12 19:02:20 -0500
committerDavid S. Miller <davem@davemloft.net>2008-11-12 19:02:20 -0500
commitd8026d939495c105cf747c0196a8fa738cf2ad20 (patch)
tree9240f3af1002c84bfdedbc4c952234684eef3a92 /drivers/net/bnx2.c
parent5ec6d7bf195c2e70003ff30e4f51390ef7e85a31 (diff)
bnx2: Set rx buffer water marks based on MTU.
The default rx buffer water marks for XOFF/XON are for 1500 MTU. At larger MTUs, these water marks need to be adjusted for effective flow control. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Signed-off-by: Benjamin Li <benli@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2.c')
-rw-r--r--drivers/net/bnx2.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index d28cbce0ec48..a52ffdc3b40a 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -4473,7 +4473,7 @@ bnx2_reset_chip(struct bnx2 *bp, u32 reset_code)
4473static int 4473static int
4474bnx2_init_chip(struct bnx2 *bp) 4474bnx2_init_chip(struct bnx2 *bp)
4475{ 4475{
4476 u32 val; 4476 u32 val, mtu;
4477 int rc, i; 4477 int rc, i;
4478 4478
4479 /* Make sure the interrupt is not active. */ 4479 /* Make sure the interrupt is not active. */
@@ -4565,11 +4565,19 @@ bnx2_init_chip(struct bnx2 *bp)
4565 REG_WR(bp, BNX2_EMAC_BACKOFF_SEED, val); 4565 REG_WR(bp, BNX2_EMAC_BACKOFF_SEED, val);
4566 4566
4567 /* Program the MTU. Also include 4 bytes for CRC32. */ 4567 /* Program the MTU. Also include 4 bytes for CRC32. */
4568 val = bp->dev->mtu + ETH_HLEN + 4; 4568 mtu = bp->dev->mtu;
4569 val = mtu + ETH_HLEN + ETH_FCS_LEN;
4569 if (val > (MAX_ETHERNET_PACKET_SIZE + 4)) 4570 if (val > (MAX_ETHERNET_PACKET_SIZE + 4))
4570 val |= BNX2_EMAC_RX_MTU_SIZE_JUMBO_ENA; 4571 val |= BNX2_EMAC_RX_MTU_SIZE_JUMBO_ENA;
4571 REG_WR(bp, BNX2_EMAC_RX_MTU_SIZE, val); 4572 REG_WR(bp, BNX2_EMAC_RX_MTU_SIZE, val);
4572 4573
4574 if (mtu < 1500)
4575 mtu = 1500;
4576
4577 bnx2_reg_wr_ind(bp, BNX2_RBUF_CONFIG, BNX2_RBUF_CONFIG_VAL(mtu));
4578 bnx2_reg_wr_ind(bp, BNX2_RBUF_CONFIG2, BNX2_RBUF_CONFIG2_VAL(mtu));
4579 bnx2_reg_wr_ind(bp, BNX2_RBUF_CONFIG3, BNX2_RBUF_CONFIG3_VAL(mtu));
4580
4573 for (i = 0; i < BNX2_MAX_MSIX_VEC; i++) 4581 for (i = 0; i < BNX2_MAX_MSIX_VEC; i++)
4574 bp->bnx2_napi[i].last_status_idx = 0; 4582 bp->bnx2_napi[i].last_status_idx = 0;
4575 4583