bnx2x: Using DMA engine

Using DMA engine (DMAE) to initialize large consecutive memories in the chip

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

1 files changed, 12 insertions, 39 deletions

diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index 46e2492fc9d0..3ef24b9eab3e 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -4223,10 +4223,10 @@ static void bnx2x_zero_sb(struct bnx2x *bp, int sb_id)
 {
         int port = BP_PORT(bp);
 
-        bnx2x_init_fill(bp, BAR_USTRORM_INTMEM +
+        bnx2x_init_fill(bp, USTORM_INTMEM_ADDR +
                         USTORM_SB_HOST_STATUS_BLOCK_OFFSET(port, sb_id), 0,
                         sizeof(struct ustorm_status_block)/4);
-        bnx2x_init_fill(bp, BAR_CSTRORM_INTMEM +
+        bnx2x_init_fill(bp, CSTORM_INTMEM_ADDR +
                         CSTORM_SB_HOST_STATUS_BLOCK_OFFSET(port, sb_id), 0,
                         sizeof(struct cstorm_status_block)/4);
 }
@@ -4280,18 +4280,18 @@ static void bnx2x_zero_def_sb(struct bnx2x *bp)
 {
         int func = BP_FUNC(bp);
 
-        bnx2x_init_fill(bp, BAR_USTRORM_INTMEM +
+        bnx2x_init_fill(bp, TSTORM_INTMEM_ADDR +
+                        TSTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(func), 0,
+                        sizeof(struct tstorm_def_status_block)/4);
+        bnx2x_init_fill(bp, USTORM_INTMEM_ADDR +
                         USTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(func), 0,
                         sizeof(struct ustorm_def_status_block)/4);
-        bnx2x_init_fill(bp, BAR_CSTRORM_INTMEM +
+        bnx2x_init_fill(bp, CSTORM_INTMEM_ADDR +
                         CSTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(func), 0,
                         sizeof(struct cstorm_def_status_block)/4);
-        bnx2x_init_fill(bp, BAR_XSTRORM_INTMEM +
+        bnx2x_init_fill(bp, XSTORM_INTMEM_ADDR +
                         XSTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(func), 0,
                         sizeof(struct xstorm_def_status_block)/4);
-        bnx2x_init_fill(bp, BAR_TSTRORM_INTMEM +
-                        TSTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(func), 0,
-                        sizeof(struct tstorm_def_status_block)/4);
 }
 
 static void bnx2x_init_def_sb(struct bnx2x *bp,
@@ -5615,37 +5615,10 @@ static int bnx2x_init_common(struct bnx2x *bp)
         bnx2x_init_block(bp, USDM_COMMON_START, USDM_COMMON_END);
         bnx2x_init_block(bp, XSDM_COMMON_START, XSDM_COMMON_END);
 
-        if (CHIP_IS_E1H(bp)) {
-                bnx2x_init_fill(bp, TSTORM_INTMEM_ADDR, 0,
-                                STORM_INTMEM_SIZE_E1H/2);
-                bnx2x_init_fill(bp,
-                                TSTORM_INTMEM_ADDR + STORM_INTMEM_SIZE_E1H/2,
-                                0, STORM_INTMEM_SIZE_E1H/2);
-                bnx2x_init_fill(bp, CSTORM_INTMEM_ADDR, 0,
-                                STORM_INTMEM_SIZE_E1H/2);
-                bnx2x_init_fill(bp,
-                                CSTORM_INTMEM_ADDR + STORM_INTMEM_SIZE_E1H/2,
-                                0, STORM_INTMEM_SIZE_E1H/2);
-                bnx2x_init_fill(bp, XSTORM_INTMEM_ADDR, 0,
-                                STORM_INTMEM_SIZE_E1H/2);
-                bnx2x_init_fill(bp,
-                                XSTORM_INTMEM_ADDR + STORM_INTMEM_SIZE_E1H/2,
-                                0, STORM_INTMEM_SIZE_E1H/2);
-                bnx2x_init_fill(bp, USTORM_INTMEM_ADDR, 0,
-                                STORM_INTMEM_SIZE_E1H/2);
-                bnx2x_init_fill(bp,
-                                USTORM_INTMEM_ADDR + STORM_INTMEM_SIZE_E1H/2,
-                                0, STORM_INTMEM_SIZE_E1H/2);
-        } else { /* E1 */
-                bnx2x_init_fill(bp, TSTORM_INTMEM_ADDR, 0,
-                                STORM_INTMEM_SIZE_E1);
-                bnx2x_init_fill(bp, CSTORM_INTMEM_ADDR, 0,
-                                STORM_INTMEM_SIZE_E1);
-                bnx2x_init_fill(bp, XSTORM_INTMEM_ADDR, 0,
-                                STORM_INTMEM_SIZE_E1);
-                bnx2x_init_fill(bp, USTORM_INTMEM_ADDR, 0,
-                                STORM_INTMEM_SIZE_E1);
-        }
+        bnx2x_init_fill(bp, TSTORM_INTMEM_ADDR, 0, STORM_INTMEM_SIZE(bp));
+        bnx2x_init_fill(bp, USTORM_INTMEM_ADDR, 0, STORM_INTMEM_SIZE(bp));
+        bnx2x_init_fill(bp, CSTORM_INTMEM_ADDR, 0, STORM_INTMEM_SIZE(bp));
+        bnx2x_init_fill(bp, XSTORM_INTMEM_ADDR, 0, STORM_INTMEM_SIZE(bp));
 
         bnx2x_init_block(bp, TSEM_COMMON_START, TSEM_COMMON_END);
         bnx2x_init_block(bp, USEM_COMMON_START, USEM_COMMON_END);