From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5FEF6A04B1; Thu, 24 Sep 2020 14:20:07 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E81421DEF9; Thu, 24 Sep 2020 14:14:00 +0200 (CEST) Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [148.163.129.52]) by dpdk.org (Postfix) with ESMTP id D711E1DE24 for ; Thu, 24 Sep 2020 14:13:02 +0200 (CEST) Received: from mx1-us1.ppe-hosted.com (unknown [10.7.65.62]) by dispatch1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id A485A60099 for ; Thu, 24 Sep 2020 12:13:02 +0000 (UTC) Received: from us4-mdac16-7.ut7.mdlocal (unknown [10.7.65.75]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id A31688009E for ; Thu, 24 Sep 2020 12:13:02 +0000 (UTC) X-Virus-Scanned: Proofpoint Essentials engine Received: from mx1-us1.ppe-hosted.com (unknown [10.7.65.174]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id DBCF5280054 for ; Thu, 24 Sep 2020 12:13:01 +0000 (UTC) Received: from webmail.solarflare.com (uk.solarflare.com [193.34.186.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 917721C0077 for ; Thu, 24 Sep 2020 12:13:01 +0000 (UTC) Received: from ukex01.SolarFlarecom.com (10.17.10.4) by ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 24 Sep 2020 13:12:48 +0100 Received: from opal.uk.solarflarecom.com (10.17.10.1) by ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 24 Sep 2020 13:12:48 +0100 Received: from ukv-loginhost.uk.solarflarecom.com (ukv-loginhost.uk.solarflarecom.com [10.17.10.39]) by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id 08OCCmU8026103 for ; Thu, 24 Sep 2020 13:12:48 +0100 Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1]) by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 778B81613A9 for ; Thu, 24 Sep 2020 13:12:48 +0100 (BST) From: Andrew Rybchenko To: Date: Thu, 24 Sep 2020 13:12:28 +0100 Message-ID: <1600949555-28043-54-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1600949555-28043-1-git-send-email-arybchenko@solarflare.com> References: <1600764594-14752-1-git-send-email-arybchenko@solarflare.com> <1600949555-28043-1-git-send-email-arybchenko@solarflare.com> MIME-Version: 1.0 Content-Type: text/plain X-TM-AS-Product-Ver: SMEX-12.5.0.1300-8.6.1012-25674.003 X-TM-AS-Result: No-10.675800-8.000000-10 X-TMASE-MatchedRID: apQ63SaU6u0i+Ly1jF96caiUivh0j2PvhVDnkfzD7uYGmHr1eMxt2UAc 6DyoS2rI5cUDKo8lM0m1jZLsBOhz3POomksYZmRqGjzBgnFZvQ6rlTqw7wfC00b+NncAXqB76Pp MQyXN8yjTSoy/oX1f7sBA6XWhWckfaQrnpNtLnchFo9d++f6R6lJAsn89ih94qfjhfIrCdJmrdy 22UOhsDAB5pFG5VD75eJ4fXQORQoc2lXEsNTKptnCO70QAsBdCQutb7tNByL/svb7MYS5s3h3+O LpZQttd8cZamP2uK5qRlo1QWxTtF6+/EguYor8cFEUknJ/kEl7Dm6Dz1lUoy/oLR4+zsDTtw1tM VU7ONTwTLqq3iD8R26IYcj9Pt9sk33INDDfTBL+HCwKemqBMHQ== X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--10.675800-8.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.6.1012-25674.003 X-MDID: 1600949582-qcjaovkEOK1Z Subject: [dpdk-dev] [PATCH v3 53/60] common/sfc_efx/base: allocate vAdaptor on Riverhead 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Riverhead has EVB support similar to EF10 and NIC must allocate its vAdaptor on init. Signed-off-by: Andrew Rybchenko Reviewed-by: Andy Moreton --- drivers/common/sfc_efx/base/ef10_impl.h | 5 +++ drivers/common/sfc_efx/base/ef10_nic.c | 10 +++++- drivers/common/sfc_efx/base/rhead_nic.c | 43 +++++++++++++++++++++++-- 3 files changed, 55 insertions(+), 3 deletions(-) diff --git a/drivers/common/sfc_efx/base/ef10_impl.h b/drivers/common/sfc_efx/base/ef10_impl.h index e77fb4ddea..d7b3c3db52 100644 --- a/drivers/common/sfc_efx/base/ef10_impl.h +++ b/drivers/common/sfc_efx/base/ef10_impl.h @@ -234,6 +234,11 @@ efx_mcdi_vadaptor_free( __in efx_nic_t *enp, __in uint32_t port_id); +LIBEFX_INTERNAL +extern __checkReturn efx_rc_t +ef10_upstream_port_vadaptor_alloc( + __in efx_nic_t *enp); + LIBEFX_INTERNAL extern __checkReturn efx_rc_t ef10_nic_probe( diff --git a/drivers/common/sfc_efx/base/ef10_nic.c b/drivers/common/sfc_efx/base/ef10_nic.c index 927af87e0d..7a11930242 100644 --- a/drivers/common/sfc_efx/base/ef10_nic.c +++ b/drivers/common/sfc_efx/base/ef10_nic.c @@ -2321,7 +2321,11 @@ ef10_nic_reset( return (rc); } -static __checkReturn efx_rc_t +#endif /* EFX_OPTS_EF10() */ + +#if EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() + + __checkReturn efx_rc_t ef10_upstream_port_vadaptor_alloc( __in efx_nic_t *enp) { @@ -2373,6 +2377,10 @@ ef10_upstream_port_vadaptor_alloc( return (rc); } +#endif /* EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() */ + +#if EFX_OPTS_EF10() + __checkReturn efx_rc_t ef10_nic_init( __in efx_nic_t *enp) diff --git a/drivers/common/sfc_efx/base/rhead_nic.c b/drivers/common/sfc_efx/base/rhead_nic.c index f965c1735e..9b8f09d12c 100644 --- a/drivers/common/sfc_efx/base/rhead_nic.c +++ b/drivers/common/sfc_efx/base/rhead_nic.c @@ -336,6 +336,7 @@ rhead_nic_init( uint32_t vi_count, vi_base, vi_shift; uint32_t vi_window_size; efx_rc_t rc; + boolean_t alloc_vadaptor = B_TRUE; EFSYS_ASSERT(EFX_FAMILY_IS_EF100(enp)); EFSYS_ASSERT3U(edcp->edc_max_piobuf_count, ==, 0); @@ -387,12 +388,34 @@ rhead_nic_init( enp->en_arch.ef10.ena_wc_mem_map_offset = 0; enp->en_arch.ef10.ena_wc_mem_map_size = 0; - enp->en_vport_id = EVB_PORT_ID_NULL; - enp->en_nic_cfg.enc_mcdi_max_payload_length = MCDI_CTL_SDU_LEN_MAX_V2; + /* + * For SR-IOV use case, vAdaptor is allocated for PF and associated VFs + * during NIC initialization when vSwitch is created and vPorts are + * allocated. Hence, skip vAdaptor allocation for EVB and update vPort + * ID in NIC structure with the one allocated for PF. + */ + + enp->en_vport_id = EVB_PORT_ID_ASSIGNED; +#if EFSYS_OPT_EVB + if ((enp->en_vswitchp != NULL) && (enp->en_vswitchp->ev_evcp != NULL)) { + /* For EVB use vPort allocated on vSwitch */ + enp->en_vport_id = enp->en_vswitchp->ev_evcp->evc_vport_id; + alloc_vadaptor = B_FALSE; + } +#endif + if (alloc_vadaptor != B_FALSE) { + /* Allocate a vAdaptor attached to our upstream vPort/pPort */ + if ((rc = ef10_upstream_port_vadaptor_alloc(enp)) != 0) + goto fail5; + } + return (0); +fail5: + EFSYS_PROBE(fail5); + fail4: EFSYS_PROBE(fail4); @@ -497,6 +520,22 @@ rhead_nic_set_hw_unavailable( rhead_nic_fini( __in efx_nic_t *enp) { + boolean_t do_vadaptor_free = B_TRUE; + +#if EFSYS_OPT_EVB + if (enp->en_vswitchp != NULL) { + /* + * For SR-IOV the vAdaptor is freed with the vSwitch, + * so do not free it here. + */ + do_vadaptor_free = B_FALSE; + } +#endif + if (do_vadaptor_free != B_FALSE) { + (void) efx_mcdi_vadaptor_free(enp, enp->en_vport_id); + enp->en_vport_id = EVB_PORT_ID_NULL; + } + (void) efx_mcdi_free_vis(enp); enp->en_arch.ef10.ena_vi_count = 0; } -- 2.17.1