net/ixgbe: fix zeroing of RSS config

[dpdk.git] / drivers / bus / fslmc / qbman / qbman_sys.h

diff --git a/drivers/bus/fslmc/qbman/qbman_sys.h b/drivers/bus/fslmc/qbman/qbman_sys.h
index e3bd1c5..e59fcfd 100644 (file)
--- a/drivers/bus/fslmc/qbman/qbman_sys.h
+++ b/drivers/bus/fslmc/qbman/qbman_sys.h
@@ -381,6 +381,14 @@ static inline uint32_t qbman_set_swp_cfg(uint8_t max_fill, uint8_t wn,
 #define QMAN_REV_5000  0x05000000
 #define QMAN_REV_MASK  0xffff0000
 
+#define SVR_LS1080A    0x87030000
+#define SVR_LS2080A    0x87010000
+#define SVR_LS2088A    0x87090000
+#define SVR_LX2160A    0x87360000
+
+/* Variable to store DPAA2 platform type */
+extern uint32_t dpaa2_svr_family;
+
 static inline int qbman_swp_sys_init(struct qbman_swp_sys *s,
                                     const struct qbman_swp_desc *d,
                                     uint8_t dqrr_size)
@@ -388,15 +396,17 @@ static inline int qbman_swp_sys_init(struct qbman_swp_sys *s,
        uint32_t reg;
        int i;
        int cena_region_size = 4*1024;
-
-       if ((d->qman_version & QMAN_REV_MASK) >= QMAN_REV_5000)
-               cena_region_size = 64*1024;
+       uint8_t est = 1;
 #ifdef RTE_ARCH_64
        uint8_t wn = CENA_WRITE_ENABLE;
 #else
        uint8_t wn = CINH_WRITE_ENABLE;
 #endif
 
+
+       if ((d->qman_version & QMAN_REV_MASK) >= QMAN_REV_5000
+                       && (d->cena_access_mode == qman_cena_fastest_access))
+               cena_region_size = 64*1024;
        s->addr_cena = d->cena_bar;
        s->addr_cinh = d->cinh_bar;
        s->idx = (uint32_t)d->idx;
@@ -416,7 +426,8 @@ static inline int qbman_swp_sys_init(struct qbman_swp_sys *s,
        reg = qbman_cinh_read(s, QBMAN_CINH_SWP_CFG);
        QBMAN_BUG_ON(reg);
 #endif
-       if ((d->qman_version & QMAN_REV_MASK) >= QMAN_REV_5000)
+       if ((d->qman_version & QMAN_REV_MASK) >= QMAN_REV_5000
+                       && (d->cena_access_mode == qman_cena_fastest_access))
                memset(s->addr_cena, 0, cena_region_size);
        else {
                /* Invalidate the portal memory.
@@ -426,23 +437,27 @@ static inline int qbman_swp_sys_init(struct qbman_swp_sys *s,
                        dccivac(s->addr_cena + i);
        }
 
-       if (s->eqcr_mode == qman_eqcr_vb_array)
+       if (dpaa2_svr_family == SVR_LS1080A)
+               est = 0;
+
+       if (s->eqcr_mode == qman_eqcr_vb_array) {
                reg = qbman_set_swp_cfg(dqrr_size, wn,
                                        0, 3, 2, 3, 1, 1, 1, 1, 1, 1);
-       else {
-               if ((d->qman_version & QMAN_REV_MASK) >= QMAN_REV_5000)
+       } else {
+               if ((d->qman_version & QMAN_REV_MASK) >= QMAN_REV_5000 &&
+                           (d->cena_access_mode == qman_cena_fastest_access))
                        reg = qbman_set_swp_cfg(dqrr_size, wn,
                                                1, 3, 2, 0, 1, 1, 1, 1, 1, 1);
                else
                        reg = qbman_set_swp_cfg(dqrr_size, wn,
-                                               1, 3, 2, 2, 1, 1, 1, 1, 1, 1);
+                                               est, 3, 2, 2, 1, 1, 1, 1, 1, 1);
        }
 
-       if ((d->qman_version & QMAN_REV_MASK) >= QMAN_REV_5000) {
+       if ((d->qman_version & QMAN_REV_MASK) >= QMAN_REV_5000
+                       && (d->cena_access_mode == qman_cena_fastest_access))
                reg |= 1 << SWP_CFG_CPBS_SHIFT | /* memory-backed mode */
                       1 << SWP_CFG_VPM_SHIFT |  /* VDQCR read triggered mode */
                       1 << SWP_CFG_CPM_SHIFT;   /* CR read triggered mode */
-       }
 
        qbman_cinh_write(s, QBMAN_CINH_SWP_CFG, reg);
        reg = qbman_cinh_read(s, QBMAN_CINH_SWP_CFG);
@@ -452,7 +467,8 @@ static inline int qbman_swp_sys_init(struct qbman_swp_sys *s,
                return -1;
        }
 
-       if ((d->qman_version & QMAN_REV_MASK) >= QMAN_REV_5000) {
+       if ((d->qman_version & QMAN_REV_MASK) >= QMAN_REV_5000
+                       && (d->cena_access_mode == qman_cena_fastest_access)) {
                qbman_cinh_write(s, QBMAN_CINH_SWP_EQCR_PI, QMAN_RT_MODE);
                qbman_cinh_write(s, QBMAN_CINH_SWP_RCR_PI, QMAN_RT_MODE);
        }