X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fbnxt%2Fbnxt_rxq.c;h=f7fbb28561e1e462fff2b20646cd4be105f6c83f;hb=c9fb3c62896f;hp=bfa5308ad596c8488e32c7ff3be4c7ee8a0404a5;hpb=a2033fda22ab20df22f98978b1ee0c28de5d5797;p=dpdk.git

diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c
index bfa5308ad5..f7fbb28561 100644
--- a/drivers/net/bnxt/bnxt_rxq.c
+++ b/drivers/net/bnxt/bnxt_rxq.c
@@ -68,7 +68,6 @@ int bnxt_mq_rx_configure(struct bnxt *bp)
 	struct bnxt_filter_info *filter;
 	enum rte_eth_nb_pools pools = bp->rx_cp_nr_rings, max_pools = 0;
 	struct bnxt_rx_queue *rxq;
-	bool rss_dflt_cr = false;
 
 	bp->nr_vnics = 0;
 
@@ -119,7 +118,7 @@ int bnxt_mq_rx_configure(struct bnxt *bp)
 				pools = max_pools;
 			break;
 		case ETH_MQ_RX_RSS:
-			pools = 1;
+			pools = bp->rx_cp_nr_rings;
 			break;
 		default:
 			RTE_LOG(ERR, PMD, "Unsupported mq_mod %d\n",
@@ -128,13 +127,6 @@ int bnxt_mq_rx_configure(struct bnxt *bp)
 			goto err_out;
 		}
 	}
-	/*
-	 * If MQ RX w/o RSS no need for per VNIC filter.
-	 */
-	if ((dev_conf->rxmode.mq_mode & ETH_MQ_RX_VMDQ_DCB) ||
-	    (bp->rx_cp_nr_rings &&
-	     !(dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS)))
-		rss_dflt_cr = true;
 
 	nb_q_per_grp = bp->rx_cp_nr_rings / pools;
 	start_grp_id = 0;
@@ -151,7 +143,7 @@ int bnxt_mq_rx_configure(struct bnxt *bp)
 		STAILQ_INSERT_TAIL(&bp->ff_pool[i], vnic, next);
 		bp->nr_vnics++;
 
-		for (j = 0, ring_idx = 0; j < nb_q_per_grp; j++, ring_idx++) {
+		for (j = 0; j < nb_q_per_grp; j++, ring_idx++) {
 			rxq = bp->eth_dev->data->rx_queues[ring_idx];
 			rxq->vnic = vnic;
 		}
@@ -166,8 +158,10 @@ int bnxt_mq_rx_configure(struct bnxt *bp)
 		vnic->start_grp_id = start_grp_id;
 		vnic->end_grp_id = end_grp_id;
 
-		if (rss_dflt_cr && i) {
-			vnic->rss_dflt_cr = true;
+		if (i) {
+			if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_VMDQ_DCB ||
+			    !(dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS))
+				vnic->rss_dflt_cr = true;
 			goto skip_filter_allocation;
 		}
 		filter = bnxt_alloc_filter(bp);
@@ -176,17 +170,6 @@ int bnxt_mq_rx_configure(struct bnxt *bp)
 			rc = -ENOMEM;
 			goto err_out;
 		}
-		for (j = 0; j < conf->nb_pool_maps; j++) {
-			if (conf->pool_map[j].pools & (1UL << i)) {
-				RTE_LOG(ERR, PMD,
-					"Add vlan %u to vmdq pool %u\n",
-					conf->pool_map[j].vlan_id, i);
-
-				filter->l2_ivlan = conf->pool_map[j].vlan_id;
-				filter->enables |=
-				HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_OVLAN;
-			}
-		}
 		/*
 		 * TODO: Configure & associate CFA rule for
 		 * each VNIC for each VMDq with MACVLAN, MACVLAN+TC
@@ -223,7 +206,7 @@ out:
 
 		for (i = 0; i < bp->nr_vnics; i++) {
 			STAILQ_FOREACH(vnic, &bp->ff_pool[i], next) {
-			vnic->hash_type |= hash_type;
+			vnic->hash_type = hash_type;
 
 			/*
 			 * Use the supplied key if the key length is
@@ -328,6 +311,13 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev,
 	struct bnxt_rx_queue *rxq;
 	int rc = 0;
 
+	if (queue_idx >= bp->max_rx_rings) {
+		RTE_LOG(ERR, PMD,
+			"Cannot create Rx ring %d. Only %d rings available\n",
+			queue_idx, bp->max_rx_rings);
+		return -ENOSPC;
+	}
+
 	if (!nb_desc || nb_desc > MAX_RX_DESC_CNT) {
 		RTE_LOG(ERR, PMD, "nb_desc %d is invalid\n", nb_desc);
 		rc = -EINVAL;