d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/sfc/base: remove Falcon-specific concurrency check

Browse Source 
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 <ivan.malov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Reviewed-by: Andy Moreton <amoreton@solarflare.com>
This commit is contained in:
Ivan Malov 2017-11-20 11:01:36 +00:00 committed by Ferruh Yigit
parent 2a7e4bf28c
commit 7e9834276b
3 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/sfc/base/efx_impl.h
View File

@ -296,7 +296,6 @@ typedef struct efx_port_s {
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

9
drivers/net/sfc/base/efx_mac.c
View File

@ -751,16 +751,9 @@ efx_mac_stats_upload(
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 @@ efx_mac_stats_update(
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);
}

1
drivers/net/sfc/base/efx_port.c
View File

@ -109,7 +109,6 @@ efx_port_poll(
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;