DPDK patches and discussions
 help / color / mirror / Atom feed
From: Andrew Rybchenko <arybchenko@solarflare.com>
To: <dev@dpdk.org>
Subject: [dpdk-dev] [PATCH 03/13] net/sfc: remove unused max entries from EvQ info
Date: Fri, 31 Mar 2017 11:22:13 +0100	[thread overview]
Message-ID: <1490955743-9868-4-git-send-email-arybchenko@solarflare.com> (raw)
In-Reply-To: <1490955743-9868-1-git-send-email-arybchenko@solarflare.com>

Fixes: 58294ee65afb ("net/sfc: support event queue")

Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Reviewed-by: Andy Moreton <amoreton@solarflare.com>
---
 drivers/net/sfc/sfc_ev.c |  6 ------
 drivers/net/sfc/sfc_ev.h | 21 +--------------------
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/drivers/net/sfc/sfc_ev.c b/drivers/net/sfc/sfc_ev.c
index 46de7a5..7c8ec32 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 f5e6415..8f43d73 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;
@@ -114,21 +110,6 @@ sfc_ev_qcount(struct sfc_adapter *sa)
 }
 
 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)
 {
-- 
2.9.3

  parent reply	other threads:[~2017-03-31 10:22 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-31 10:22 [dpdk-dev] [PATCH 00/13] net/sfc: fix device reconfigure Andrew Rybchenko
2017-03-31 10:22 ` [dpdk-dev] [PATCH 01/13] net/sfc: clarify interrupts support function names Andrew Rybchenko
2017-03-31 10:22 ` [dpdk-dev] [PATCH 02/13] net/sfc: bind EvQ DMA space to EvQ type and type-local index Andrew Rybchenko
2017-03-31 10:22 ` Andrew Rybchenko [this message]
2017-03-31 10:22 ` [dpdk-dev] [PATCH 04/13] net/sfc: move EvQ entries to the EvQ control structure Andrew Rybchenko
2017-03-31 10:22 ` [dpdk-dev] [PATCH 05/13] net/sfc: remove flags from EvQ info Andrew Rybchenko
2017-03-31 10:22 ` [dpdk-dev] [PATCH 06/13] net/sfc: remove EvQ info array to simplify reconfigure Andrew Rybchenko
2017-03-31 10:22 ` [dpdk-dev] [PATCH 07/13] net/sfc: move event support init to attach stage Andrew Rybchenko
2017-03-31 10:22 ` [dpdk-dev] [PATCH 08/13] net/sfc: initialize port data on attach Andrew Rybchenko
2017-03-31 10:22 ` [dpdk-dev] [PATCH 09/13] net/sfc: clarify Rx subsystem configure/close function names Andrew Rybchenko
2017-03-31 10:22 ` [dpdk-dev] [PATCH 10/13] net/sfc: clarify Tx " Andrew Rybchenko
2017-03-31 10:22 ` [dpdk-dev] [PATCH 11/13] net/sfc: support changing the number of receive queues Andrew Rybchenko
2017-03-31 10:22 ` [dpdk-dev] [PATCH 12/13] net/sfc: support changing the number of transmit queues Andrew Rybchenko
2017-03-31 10:22 ` [dpdk-dev] [PATCH 13/13] net/sfc: fix device reconfigure Andrew Rybchenko
2017-03-31 15:31 ` [dpdk-dev] [PATCH 00/13] " Ferruh Yigit

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1490955743-9868-4-git-send-email-arybchenko@solarflare.com \
    --to=arybchenko@solarflare.com \
    --cc=dev@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).