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 0E77B1B583 for ; Thu, 7 Feb 2019 17:30:37 +0100 (CET) X-Virus-Scanned: Proofpoint Essentials engine Received: from webmail.solarflare.com (webmail.solarflare.com [12.187.104.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mx1-us3.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with ESMTPS id BD392B800D0; Thu, 7 Feb 2019 16:30:35 +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.1395.4; Thu, 7 Feb 2019 08:30:31 -0800 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.1395.4 via Frontend Transport; Thu, 7 Feb 2019 08:30:31 -0800 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 x17GUTbB015302; Thu, 7 Feb 2019 16:30:29 GMT Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1]) by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id BE0011613E4; Thu, 7 Feb 2019 16:30:29 +0000 (GMT) From: Andrew Rybchenko To: CC: Igor Romanov Date: Thu, 7 Feb 2019 16:29:19 +0000 Message-ID: <1549556983-10896-15-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549556983-10896-1-git-send-email-arybchenko@solarflare.com> References: <1549556983-10896-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.5.1010-24412.006 X-TM-AS-Result: No-1.640700-4.000000-10 X-TMASE-MatchedRID: xwCqL1bJw76XC3sMAGu+nyZm6wdY+F8K+Gz435tISEFBDVeC8J7uwfU7 2nYVxvYNJdM7MS2/RDLijpjet3oGSEb3S8jQ+0Q0syNb+yeIRArXLq4lttlH/1Hy5abV66gJ3lr UhsHZbAnLxRBGlN4sNHPtAg7MfdN9Tei0PFxIQJMMH4SsGvRsA30tCKdnhB589yM15V5aWpj6C0 ePs7A07YVH0dq7wY7u/H1dadJVZy/1gMdngNMMUNa7T08dGzOfDTtKtx/mFQv8Sa422ZrZ8Nt3f Z5KJlKjGTv6/g14O6vVlyfiqLK3Zzhzz9JT3GzK1pPGvuXkFGs4oGQUCbwY5Q+g7mdwjo656FtD ZCmYBJ1ty4Dch3o7okMMprcbiest X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--1.640700-4.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.5.1010-24412.006 X-MDID: 1549557036-KBmbMXE2enLM Subject: [dpdk-dev] [PATCH 14/38] net/sfc/base: move EVQ descs number check to generic place 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: Thu, 07 Feb 2019 16:30:37 -0000 From: Igor Romanov Now we have min/max limits in NIC config, so we can do check against min/max in a generic place instead of NIC family specific functions. Check that the descriptors number is a power of 2 is also can be made common. It removes code duplication and makes NIC family specific functions a bit shorter. Signed-off-by: Igor Romanov Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/base/ef10_ev.c | 19 ++++----------- drivers/net/sfc/base/efx_ev.c | 42 ++++++++++++++++++---------------- 2 files changed, 26 insertions(+), 35 deletions(-) diff --git a/drivers/net/sfc/base/ef10_ev.c b/drivers/net/sfc/base/ef10_ev.c index 12125c6db..4f711992e 100644 --- a/drivers/net/sfc/base/ef10_ev.c +++ b/drivers/net/sfc/base/ef10_ev.c @@ -446,24 +446,15 @@ ef10_ev_qcreate( efx_rc_t rc; _NOTE(ARGUNUSED(id)) /* buftbl id managed by MC */ - EFSYS_ASSERT(ISP2(encp->enc_evq_max_nevs)); - EFSYS_ASSERT(ISP2(encp->enc_evq_min_nevs)); - - if (!ISP2(ndescs) || - (ndescs < encp->enc_evq_min_nevs) || - (ndescs > encp->enc_evq_max_nevs)) { - rc = EINVAL; - goto fail1; - } if (index >= encp->enc_evq_limit) { rc = EINVAL; - goto fail2; + goto fail1; } if (us > encp->enc_evq_timer_max_us) { rc = EINVAL; - goto fail3; + goto fail2; } /* Set up the handler table */ @@ -503,7 +494,7 @@ ef10_ev_qcreate( rc = efx_mcdi_init_evq_v2(enp, index, esmp, ndescs, irq, us, flags); if (rc != 0) - goto fail4; + goto fail3; } else { /* * On Huntington we need to specify the settings to use. @@ -520,13 +511,11 @@ ef10_ev_qcreate( rc = efx_mcdi_init_evq(enp, index, esmp, ndescs, irq, us, flags, low_latency); if (rc != 0) - goto fail5; + goto fail4; } return (0); -fail5: - EFSYS_PROBE(fail5); fail4: EFSYS_PROBE(fail4); fail3: diff --git a/drivers/net/sfc/base/efx_ev.c b/drivers/net/sfc/base/efx_ev.c index f1788cad2..51c422c2d 100644 --- a/drivers/net/sfc/base/efx_ev.c +++ b/drivers/net/sfc/base/efx_ev.c @@ -206,6 +206,7 @@ efx_ev_qcreate( { const efx_ev_ops_t *eevop = enp->en_eevop; efx_evq_t *eep; + const efx_nic_cfg_t *encp = efx_nic_cfg_get(enp); efx_rc_t rc; EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC); @@ -228,11 +229,21 @@ efx_ev_qcreate( goto fail2; } + EFSYS_ASSERT(ISP2(encp->enc_evq_max_nevs)); + EFSYS_ASSERT(ISP2(encp->enc_evq_min_nevs)); + + if (!ISP2(ndescs) || + ndescs < encp->enc_evq_min_nevs || + ndescs > encp->enc_evq_max_nevs) { + rc = EINVAL; + goto fail3; + } + /* Allocate an EVQ object */ EFSYS_KMEM_ALLOC(enp->en_esip, sizeof (efx_evq_t), eep); if (eep == NULL) { rc = ENOMEM; - goto fail3; + goto fail4; } eep->ee_magic = EFX_EVQ_MAGIC; @@ -255,16 +266,18 @@ efx_ev_qcreate( if ((rc = eevop->eevo_qcreate(enp, index, esmp, ndescs, id, us, flags, eep)) != 0) - goto fail4; + goto fail5; return (0); -fail4: - EFSYS_PROBE(fail4); +fail5: + EFSYS_PROBE(fail5); *eepp = NULL; enp->en_ev_qcount--; EFSYS_KMEM_FREE(enp->en_esip, sizeof (efx_evq_t), eep); +fail4: + EFSYS_PROBE(fail4); fail3: EFSYS_PROBE(fail3); fail2: @@ -1285,24 +1298,15 @@ siena_ev_qcreate( _NOTE(ARGUNUSED(esmp)) - EFSYS_ASSERT(ISP2(encp->enc_evq_max_nevs)); - EFSYS_ASSERT(ISP2(encp->enc_evq_min_nevs)); - - if (!ISP2(ndescs) || - (ndescs < encp->enc_evq_min_nevs) || - (ndescs > encp->enc_evq_max_nevs)) { - rc = EINVAL; - goto fail1; - } if (index >= encp->enc_evq_limit) { rc = EINVAL; - goto fail2; + goto fail1; } #if EFSYS_OPT_RX_SCALE if (enp->en_intr.ei_type == EFX_INTR_LINE && index >= EFX_MAXRSS_LEGACY) { rc = EINVAL; - goto fail3; + goto fail2; } #endif for (size = 0; @@ -1312,7 +1316,7 @@ siena_ev_qcreate( break; if (id + (1 << size) >= encp->enc_buftbl_limit) { rc = EINVAL; - goto fail4; + goto fail3; } /* Set up the handler table */ @@ -1344,14 +1348,12 @@ siena_ev_qcreate( return (0); -fail4: - EFSYS_PROBE(fail4); -#if EFSYS_OPT_RX_SCALE fail3: EFSYS_PROBE(fail3); -#endif +#if EFSYS_OPT_RX_SCALE fail2: EFSYS_PROBE(fail2); +#endif fail1: EFSYS_PROBE1(fail1, efx_rc_t, rc); -- 2.17.1