From: Andrew Rybchenko <arybchenko@solarflare.com>
Date: Fri, 31 Mar 2017 10:22:13 +0000 (+0100)
Subject: net/sfc: remove unused max entries from EvQ info
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=a96eaf4e659ba2f3f901782a22fe30e7ecdf9c65;p=dpdk.git

net/sfc: remove unused max entries from EvQ info

Fixes: 58294ee65afb ("net/sfc: support event queue")
Cc: stable@dpdk.org

Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Reviewed-by: Andy Moreton <amoreton@solarflare.com>
---

diff --git a/drivers/net/sfc/sfc_ev.c b/drivers/net/sfc/sfc_ev.c
index 46de7a500a..7c8ec3268b 100644
--- a/drivers/net/sfc/sfc_ev.c
+++ b/drivers/net/sfc/sfc_ev.c
@@ -814,7 +814,6 @@ sfc_ev_qinit(struct sfc_adapter *sa, unsigned int sw_index,
 	evq_info = &sa->evq_info[sw_index];
 
 	SFC_ASSERT(rte_is_power_of_2(entries));
-	SFC_ASSERT(entries <= evq_info->max_entries);
 	evq_info->entries = entries;
 
 	rc = ENOMEM;
@@ -871,14 +870,9 @@ static int
 sfc_ev_qinit_info(struct sfc_adapter *sa, unsigned int sw_index)
 {
 	struct sfc_evq_info *evq_info = &sa->evq_info[sw_index];
-	unsigned int max_entries;
 
 	sfc_log_init(sa, "sw_index=%u", sw_index);
 
-	max_entries = sfc_evq_max_entries(sa, sw_index);
-	SFC_ASSERT(rte_is_power_of_2(max_entries));
-
-	evq_info->max_entries = max_entries;
 	evq_info->flags = sa->evq_flags |
 		((sa->intr.lsc_intr && sw_index == sa->mgmt_evq_index) ?
 			EFX_EVQ_FLAGS_NOTIFY_INTERRUPT :
diff --git a/drivers/net/sfc/sfc_ev.h b/drivers/net/sfc/sfc_ev.h
index f5e6415371..8f43d73954 100644
--- a/drivers/net/sfc/sfc_ev.h
+++ b/drivers/net/sfc/sfc_ev.h
@@ -84,11 +84,7 @@ struct sfc_evq {
 };
 
 struct sfc_evq_info {
-	/* Maximum number of EVQ entries taken into account when buffer
-	 * table space is allocated.
-	 */
-	unsigned int		max_entries;
-	/* Real number of EVQ entries, less or equal to max_entries */
+	/* Number of EVQ entries */
 	unsigned int		entries;
 	/* Event queue creation flags */
 	uint32_t		flags;
@@ -113,21 +109,6 @@ sfc_ev_qcount(struct sfc_adapter *sa)
 	return 1 + dev_data->nb_rx_queues + dev_data->nb_tx_queues;
 }
 
-static inline unsigned int
-sfc_evq_max_entries(struct sfc_adapter *sa, unsigned int sw_index)
-{
-	unsigned int max_entries;
-
-	if (sw_index == sa->mgmt_evq_index)
-		max_entries = SFC_MGMT_EVQ_ENTRIES;
-	else if (sw_index <= sa->eth_dev->data->nb_rx_queues)
-		max_entries = EFX_RXQ_MAXNDESCS;
-	else
-		max_entries = efx_nic_cfg_get(sa->nic)->enc_txq_max_ndescs;
-
-	return max_entries;
-}
-
 static inline unsigned int
 sfc_evq_index_by_rxq_sw_index(__rte_unused struct sfc_adapter *sa,
 			      unsigned int rxq_sw_index)