From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [148.163.129.52]) by dpdk.org (Postfix) with ESMTP id E0F7A4CA9 for ; Mon, 21 Jan 2019 07:59:27 +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 A2794480059; Mon, 21 Jan 2019 06:59:26 +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; Sun, 20 Jan 2019 22:59:24 -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; Sun, 20 Jan 2019 22:59:22 -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 x0L6xLWc012809; Mon, 21 Jan 2019 06:59:21 GMT Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1]) by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 87FCA1616EF; Mon, 21 Jan 2019 06:59:21 +0000 (GMT) From: Andrew Rybchenko To: CC: Ivan Malov Date: Mon, 21 Jan 2019 06:58:10 +0000 Message-ID: <1548053892-28817-1-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1547827150-26208-1-git-send-email-arybchenko@solarflare.com> References: <1547827150-26208-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-24376.006 X-TM-AS-Result: No-5.219900-4.000000-10 X-TMASE-MatchedRID: rKSsSOXl6dYTY/HRCFabdEhEDfw/93BuX2p3nhfMHSxUjspoiX02FyvM iqJC3he8scwlj+Tbk+Swiqg6QcdK5yMLnBbRowlYA9lly13c/gFT4DtiSkMnWDrvAe6TNwLlUKk 37LYaElzd/R78GDAj0EohiQH5nMpCbhEHukhL58Huykw7cfAoIH0tCKdnhB589yM15V5aWpj6C0 ePs7A07SSyFhRNlxkTRss/UG7izc7keRLRPkfv2GmvNQE+ah7pH87aYZZUg3BWXGvUUmKP2w== X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--5.219900-4.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.5.1010-24376.006 X-MDID: 1548053967-hxlaTYM0KXOS Subject: [dpdk-stable] [PATCH 17.11 v2 1/3] net/sfc/base: remove Falcon-specific concurrency check X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jan 2019 06:59:28 -0000 From: Ivan Malov [ backported from upstream commit 7e9834276bf761e41c92148ac467d14d7ca694f3 ] Falcon support has been withdrawn from libefx, however, there is still an obsolete Falcon-specific assertion that efx_mac_stats_upload() and efx_port_poll() aren't concurrent. To be consistent with an overall Falcon support revocation it's desirable to remove it. Fix debug build invalid assertion failure. Fixes: 19b64c6ac35f ("net/sfc/base: import libefx base") Fixes: 8c7c723dfe7c ("net/sfc/base: import MAC statistics") Cc: stable@dpdk.org Signed-off-by: Ivan Malov Signed-off-by: Andrew Rybchenko Reviewed-by: Andy Moreton --- drivers/net/sfc/base/efx_impl.h | 1 - drivers/net/sfc/base/efx_mac.c | 9 --------- drivers/net/sfc/base/efx_port.c | 1 - 3 files changed, 11 deletions(-) diff --git a/drivers/net/sfc/base/efx_impl.h b/drivers/net/sfc/base/efx_impl.h index bec20f7..fc56960 100644 --- a/drivers/net/sfc/base/efx_impl.h +++ b/drivers/net/sfc/base/efx_impl.h @@ -296,7 +296,6 @@ uint32_t ep_default_adv_cap_mask; uint32_t ep_phy_cap_mask; boolean_t ep_mac_drain; - boolean_t ep_mac_stats_pending; #if EFSYS_OPT_BIST efx_bist_type_t ep_current_bist; #endif diff --git a/drivers/net/sfc/base/efx_mac.c b/drivers/net/sfc/base/efx_mac.c index 752e720..0cf2731 100644 --- a/drivers/net/sfc/base/efx_mac.c +++ b/drivers/net/sfc/base/efx_mac.c @@ -751,16 +751,9 @@ EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_PORT); EFSYS_ASSERT(emop != NULL); - /* - * Don't assert !ep_mac_stats_pending, because the client might - * have failed to finalise statistics when previously stopping - * the port. - */ if ((rc = emop->emo_stats_upload(enp, esmp)) != 0) goto fail1; - epp->ep_mac_stats_pending = B_TRUE; - return (0); fail1: @@ -820,8 +813,6 @@ EFSYS_ASSERT(emop != NULL); rc = emop->emo_stats_update(enp, esmp, essp, generationp); - if (rc == 0) - epp->ep_mac_stats_pending = B_FALSE; return (rc); } diff --git a/drivers/net/sfc/base/efx_port.c b/drivers/net/sfc/base/efx_port.c index ec8a157..41cbe90 100644 --- a/drivers/net/sfc/base/efx_port.c +++ b/drivers/net/sfc/base/efx_port.c @@ -109,7 +109,6 @@ EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_PORT); EFSYS_ASSERT(emop != NULL); - EFSYS_ASSERT(!epp->ep_mac_stats_pending); if (link_modep == NULL) link_modep = &ignore_link_mode; -- 1.8.3.1