Imported Upstream version 16.11.2

[deb_dpdk.git] / drivers / net / qede / qede_rxtx.c

diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c
index 2e181c8..9cce13d 100644 (file)
--- a/drivers/net/qede/qede_rxtx.c
+++ b/drivers/net/qede/qede_rxtx.c
@@ -435,13 +435,15 @@ int qede_alloc_fp_resc(struct qede_dev *qdev)
        struct ecore_dev *edev = &qdev->edev;
        struct qede_fastpath *fp;
        uint32_t num_sbs;
-       int rc, i;
+       uint16_t i;
+       uint16_t sb_idx;
+       int rc;
 
        if (IS_VF(edev))
                ecore_vf_get_num_sbs(ECORE_LEADING_HWFN(edev), &num_sbs);
        else
-               num_sbs = (ecore_cxt_get_proto_cid_count
-                         (ECORE_LEADING_HWFN(edev), PROTOCOLID_ETH, NULL)) / 2;
+               num_sbs = ecore_cxt_get_proto_cid_count
+                         (ECORE_LEADING_HWFN(edev), PROTOCOLID_ETH, NULL);
 
        if (num_sbs == 0) {
                DP_ERR(edev, "No status blocks available\n");
@@ -459,7 +461,11 @@ int qede_alloc_fp_resc(struct qede_dev *qdev)
 
        for (i = 0; i < QEDE_QUEUE_CNT(qdev); i++) {
                fp = &qdev->fp_array[i];
-               if (qede_alloc_mem_sb(qdev, fp->sb_info, i % num_sbs)) {
+               if (IS_VF(edev))
+                       sb_idx = i % num_sbs;
+               else
+                       sb_idx = i;
+               if (qede_alloc_mem_sb(qdev, fp->sb_info, sb_idx)) {
                        qede_free_fp_arrays(qdev);
                        return -ENOMEM;
                }
@@ -1312,10 +1318,6 @@ int qede_dev_start(struct rte_eth_dev *eth_dev)
        /* Bring-up the link */
        qede_dev_set_link_state(eth_dev, true);
 
-       /* Reset ring */
-       if (qede_reset_fp_rings(qdev))
-               return -ENOMEM;
-
        /* Start/resume traffic */
        qdev->ops->fastpath_start(edev);
 
@@ -1484,6 +1486,7 @@ int qede_reset_fp_rings(struct qede_dev *qdev)
                        }
                }
        }
+       qede_reset_fp_rings(qdev);
 
        return 0;
 }