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

net/sfc: remove flags from EvQ info

Next step to get rid of EvQ info at all.

Fixes: c22d3c508e0c ("net/sfc: support parameter to choose performance profile")
Fixes: 3b809c27b1fe ("net/sfc: support link status change interrupt")
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 60288ce7a5..bf108f1240 100644
--- a/drivers/net/sfc/sfc_ev.c
+++ b/drivers/net/sfc/sfc_ev.c
@@ -588,6 +588,7 @@ sfc_ev_qstart(struct sfc_adapter *sa, unsigned int sw_index)
 	const struct sfc_evq_info *evq_info;
 	struct sfc_evq *evq;
 	efsys_mem_t *esmp;
+	uint32_t evq_flags = sa->evq_flags;
 	unsigned int total_delay_us;
 	unsigned int delay_us;
 	int rc;
@@ -601,9 +602,14 @@ sfc_ev_qstart(struct sfc_adapter *sa, unsigned int sw_index)
 	/* Clear all events */
 	(void)memset((void *)esmp->esm_base, 0xff, EFX_EVQ_SIZE(evq->entries));
 
+	if (sa->intr.lsc_intr && sw_index == sa->mgmt_evq_index)
+		evq_flags |= EFX_EVQ_FLAGS_NOTIFY_INTERRUPT;
+	else
+		evq_flags |= EFX_EVQ_FLAGS_NOTIFY_DISABLED;
+
 	/* Create the common code event queue */
 	rc = efx_ev_qcreate(sa->nic, sw_index, esmp, evq->entries,
-			    0 /* unused on EF10 */, 0, evq_info->flags,
+			    0 /* unused on EF10 */, 0, evq_flags,
 			    &evq->common);
 	if (rc != 0)
 		goto fail_ev_qcreate;
@@ -867,15 +873,8 @@ sfc_ev_qfini(struct sfc_adapter *sa, unsigned int sw_index)
 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];
-
 	sfc_log_init(sa, "sw_index=%u", sw_index);
 
-	evq_info->flags = sa->evq_flags |
-		((sa->intr.lsc_intr && sw_index == sa->mgmt_evq_index) ?
-			EFX_EVQ_FLAGS_NOTIFY_INTERRUPT :
-			EFX_EVQ_FLAGS_NOTIFY_DISABLED);
-
 	return 0;
 }
 
diff --git a/drivers/net/sfc/sfc_ev.h b/drivers/net/sfc/sfc_ev.h
index a0addd7002..bc96213583 100644
--- a/drivers/net/sfc/sfc_ev.h
+++ b/drivers/net/sfc/sfc_ev.h
@@ -85,8 +85,6 @@ struct sfc_evq {
 };
 
 struct sfc_evq_info {
-	/* Event queue creation flags */
-	uint32_t		flags;
 	/* NUMA-aware EVQ data structure used on datapath */
 	struct sfc_evq		*evq;
 };