bnx2x: Increase DMAE max write size for 57711

Increase DMAE max write size for 57711 to the maximum allowed value.

Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/bnx2x.h b/drivers/net/bnx2x.h
index 694c8cd59e099153b9ddc17fd6e0f4844fd39c2f..150bd08ed5beff4bc6ee9d44f6232a63d36a117c 100644 (file)
--- a/drivers/net/bnx2x.h
+++ b/drivers/net/bnx2x.h
@@ -1168,7 +1168,7 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms,
 #define DMAE_CMD_E1HVN_SHIFT           DMAE_COMMAND_E1HVN_SHIFT
 
 #define DMAE_LEN32_RD_MAX              0x80
-#define DMAE_LEN32_WR_MAX              0x400
+#define DMAE_LEN32_WR_MAX(bp)          (CHIP_IS_E1(bp) ? 0x400 : 0x2000)
 
 #define DMAE_COMP_VAL                  0xe0d0d0ae
 

diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index d0884862b96c09c7c7576a9a37c9f54952be1ab6..3325592e5dab2cdf70bf77ddbfe27982b1515703 100644 (file)
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -352,13 +352,14 @@ void bnx2x_read_dmae(struct bnx2x *bp, u32 src_addr, u32 len32)
 void bnx2x_write_dmae_phys_len(struct bnx2x *bp, dma_addr_t phys_addr,
                               u32 addr, u32 len)
 {
+       int dmae_wr_max = DMAE_LEN32_WR_MAX(bp);
        int offset = 0;
 
-       while (len > DMAE_LEN32_WR_MAX) {
+       while (len > dmae_wr_max) {
                bnx2x_write_dmae(bp, phys_addr + offset,
-                                addr + offset, DMAE_LEN32_WR_MAX);
-               offset += DMAE_LEN32_WR_MAX * 4;
-               len -= DMAE_LEN32_WR_MAX;
+                                addr + offset, dmae_wr_max);
+               offset += dmae_wr_max * 4;
+               len -= dmae_wr_max;
        }
 
        bnx2x_write_dmae(bp, phys_addr + offset, addr + offset, len);