net/bnxt: update ring group after ring stop start

A Rx ring stop start sequence may result in the FW returning
a different set of Rx ring and AGG ring IDs. If the ring group
is not updated with the new IDs, the HW sees the host driver using
incorrect BD types for the Rx ring and AGG ring. This can cause
the chip to go into a bad state or encounter RE_flush issue
or leak mbufs in the HW.

Fix this by issuing a bnxt_hwrm_ring_grp_free() and an
bnxt_hwrm_ring_grp_alloc() to refresh the ring group information.

Fixes: 9b63c6fd70e3 ("net/bnxt: support Rx/Tx queue start/stop")
Cc: stable@dpdk.org
Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>

diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 73deb41f81e3506ccbe9f02f481966b39972ecc2..eb9de45cb9915c95e035a3571fa841c1bce794a7 100644 (file)
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -2717,6 +2717,9 @@ void bnxt_free_hwrm_rx_ring(struct bnxt *bp, int queue_index)
        struct bnxt_ring *ring = rxr->rx_ring_struct;
        struct bnxt_cp_ring_info *cpr = rxq->cp_ring;
 
+       if (BNXT_HAS_RING_GRPS(bp))
+               bnxt_hwrm_ring_grp_free(bp, queue_index);
+
        bnxt_hwrm_ring_free(bp, ring,
                            HWRM_RING_FREE_INPUT_RING_TYPE_RX,
                            cpr->cp_ring_struct->fw_ring_id);

diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c
index b05c470766fce1f2b1c4dec25a0d99da5edc5f32..957b175f1b89d65089d24361212501c706c67280 100644 (file)
--- a/drivers/net/bnxt/bnxt_ring.c
+++ b/drivers/net/bnxt/bnxt_ring.c
@@ -631,6 +631,12 @@ int bnxt_alloc_hwrm_rx_ring(struct bnxt *bp, int queue_index)
        if (rc)
                goto err_out;
 
+       if (BNXT_HAS_RING_GRPS(bp)) {
+               rc = bnxt_hwrm_ring_grp_alloc(bp, queue_index);
+               if (rc)
+                       goto err_out;
+       }
+
        if (rxq->rx_started) {
                if (bnxt_init_one_rx_ring(rxq)) {
                        PMD_DRV_LOG(ERR, "bnxt_init_one_rx_ring failed!\n");