From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [67.231.154.164]) by dpdk.org (Postfix) with ESMTP id 03F582BF2 for ; Fri, 31 Mar 2017 12:22:48 +0200 (CEST) Received: from pure.maildistiller.com (unknown [10.110.50.29]) by dispatch1-us1.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with ESMTP id 95B6060053 for ; Fri, 31 Mar 2017 10:22:47 +0000 (UTC) X-Virus-Scanned: Proofpoint Essentials engine Received: from mx1-us4.ppe-hosted.com (unknown [10.110.49.251]) by pure.maildistiller.com (Proofpoint Essentials ESMTP Server) with ESMTPS id 362E260049 for ; Fri, 31 Mar 2017 10:22:47 +0000 (UTC) Received: from webmail.solarflare.com (webmail.solarflare.com [12.187.104.26]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1-us4.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with ESMTPS id 17DD18006D for ; Fri, 31 Mar 2017 10:22:46 +0000 (UTC) Received: from ocex03.SolarFlarecom.com (10.20.40.36) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1044.25; Fri, 31 Mar 2017 03:22:31 -0700 Received: from opal.uk.solarflarecom.com (10.17.10.1) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1044.25 via Frontend Transport; Fri, 31 Mar 2017 03:22:30 -0700 Received: from uklogin.uk.solarflarecom.com (uklogin.uk.solarflarecom.com [10.17.10.10]) by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id v2VAMT8L030652 for ; Fri, 31 Mar 2017 11:22:29 +0100 Received: from uklogin.uk.solarflarecom.com (localhost.localdomain [127.0.0.1]) by uklogin.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id v2VAMTQl009951 for ; Fri, 31 Mar 2017 11:22:29 +0100 From: Andrew Rybchenko To: Date: Fri, 31 Mar 2017 11:22:17 +0100 Message-ID: <1490955743-9868-8-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.2.3 In-Reply-To: <1490955743-9868-1-git-send-email-arybchenko@solarflare.com> References: <1490955743-9868-1-git-send-email-arybchenko@solarflare.com> MIME-Version: 1.0 Content-Type: text/plain X-MDID: 1490955767-hXF0KeDWU5JP Subject: [dpdk-dev] [PATCH 07/13] net/sfc: move event support init to attach stage X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 Mar 2017 10:22:48 -0000 Prepare to fix device reconfigure. Device arguments should be parsed once on attach. Management event queue should be initialized once on attach. Fixes: 58294ee65afb ("net/sfc: support event queue") Fixes: c22d3c508e0c ("net/sfc: support parameter to choose performance profile") Signed-off-by: Andrew Rybchenko Reviewed-by: Andy Moreton --- drivers/net/sfc/sfc.c | 17 ++++++++--------- drivers/net/sfc/sfc_ev.c | 4 ++-- drivers/net/sfc/sfc_ev.h | 4 ++-- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c index ad3dab1..a5d4736 100644 --- a/drivers/net/sfc/sfc.c +++ b/drivers/net/sfc/sfc.c @@ -409,10 +409,6 @@ sfc_configure(struct sfc_adapter *sa) if (rc != 0) goto fail_intr_configure; - rc = sfc_ev_init(sa); - if (rc != 0) - goto fail_ev_init; - rc = sfc_port_init(sa); if (rc != 0) goto fail_port_init; @@ -436,9 +432,6 @@ sfc_configure(struct sfc_adapter *sa) sfc_port_fini(sa); fail_port_init: - sfc_ev_fini(sa); - -fail_ev_init: sfc_intr_close(sa); fail_intr_configure: @@ -461,7 +454,6 @@ sfc_close(struct sfc_adapter *sa) sfc_tx_fini(sa); sfc_rx_fini(sa); sfc_port_fini(sa); - sfc_ev_fini(sa); sfc_intr_close(sa); sa->state = SFC_ADAPTER_INITIALIZED; @@ -607,6 +599,10 @@ sfc_attach(struct sfc_adapter *sa) if (rc != 0) goto fail_intr_attach; + rc = sfc_ev_attach(sa); + if (rc != 0) + goto fail_ev_attach; + efx_phy_adv_cap_get(sa->nic, EFX_PHY_CAP_PERM, &sa->port.phy_adv_cap_mask); @@ -630,6 +626,9 @@ sfc_attach(struct sfc_adapter *sa) fail_filter_attach: fail_set_rss_defaults: + sfc_ev_detach(sa); + +fail_ev_attach: sfc_intr_detach(sa); fail_intr_attach: @@ -652,7 +651,7 @@ sfc_detach(struct sfc_adapter *sa) sfc_flow_fini(sa); sfc_filter_detach(sa); - + sfc_ev_detach(sa); sfc_intr_detach(sa); sa->state = SFC_ADAPTER_UNINITIALIZED; diff --git a/drivers/net/sfc/sfc_ev.c b/drivers/net/sfc/sfc_ev.c index b007af8..26e6b2f 100644 --- a/drivers/net/sfc/sfc_ev.c +++ b/drivers/net/sfc/sfc_ev.c @@ -869,7 +869,7 @@ sfc_kvarg_perf_profile_handler(__rte_unused const char *key, } int -sfc_ev_init(struct sfc_adapter *sa) +sfc_ev_attach(struct sfc_adapter *sa) { int rc; @@ -908,7 +908,7 @@ sfc_ev_init(struct sfc_adapter *sa) } void -sfc_ev_fini(struct sfc_adapter *sa) +sfc_ev_detach(struct sfc_adapter *sa) { sfc_log_init(sa, "entry"); diff --git a/drivers/net/sfc/sfc_ev.h b/drivers/net/sfc/sfc_ev.h index f73201b..065defe 100644 --- a/drivers/net/sfc/sfc_ev.h +++ b/drivers/net/sfc/sfc_ev.h @@ -106,8 +106,8 @@ sfc_evq_index_by_txq_sw_index(struct sfc_adapter *sa, unsigned int txq_sw_index) return 1 + sa->eth_dev->data->nb_rx_queues + txq_sw_index; } -int sfc_ev_init(struct sfc_adapter *sa); -void sfc_ev_fini(struct sfc_adapter *sa); +int sfc_ev_attach(struct sfc_adapter *sa); +void sfc_ev_detach(struct sfc_adapter *sa); int sfc_ev_start(struct sfc_adapter *sa); void sfc_ev_stop(struct sfc_adapter *sa); -- 2.9.3