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

net/sfc/base: add Medford2 support to MAC module

Browse Source 
Signed-off-by: Andy Moreton <amoreton@solarflare.com>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
This commit is contained in:
Andy Moreton 2018-02-20 07:33:31 +00:00 committed by Ferruh Yigit
parent 67b6082040
commit c975f36361
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/sfc/base/ef10_mac.c
View File

@ -8,7 +8,7 @@
#include "efx_impl.h" #include "efx_impl.h"
#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD #if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2
__checkReturn efx_rc_t __checkReturn efx_rc_t
ef10_mac_poll( ef10_mac_poll(
@ -356,7 +356,8 @@ ef10_mac_multicast_list_set(
efx_rc_t rc; efx_rc_t rc;
EFSYS_ASSERT(enp->en_family == EFX_FAMILY_HUNTINGTON || EFSYS_ASSERT(enp->en_family == EFX_FAMILY_HUNTINGTON ||
enp->en_family == EFX_FAMILY_MEDFORD); enp->en_family == EFX_FAMILY_MEDFORD ||
enp->en_family == EFX_FAMILY_MEDFORD2);
if ((rc = emop->emo_reconfigure(enp)) != 0) if ((rc = emop->emo_reconfigure(enp)) != 0)
goto fail1; goto fail1;
@ -870,4 +871,4 @@ ef10_mac_stats_update(
#endif /* EFSYS_OPT_MAC_STATS */ #endif /* EFSYS_OPT_MAC_STATS */
#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD */ #endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */

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

@ -65,6 +65,7 @@ typedef enum efx_mac_type_e {
EFX_MAC_SIENA, EFX_MAC_SIENA,
EFX_MAC_HUNTINGTON, EFX_MAC_HUNTINGTON,
EFX_MAC_MEDFORD, EFX_MAC_MEDFORD,
EFX_MAC_MEDFORD2,
EFX_MAC_NTYPES EFX_MAC_NTYPES
} efx_mac_type_t; } efx_mac_type_t;

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

@ -39,7 +39,7 @@ static const efx_mac_ops_t __efx_mac_siena_ops = {
}; };
#endif /* EFSYS_OPT_SIENA */ #endif /* EFSYS_OPT_SIENA */
#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD #if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2
static const efx_mac_ops_t __efx_mac_ef10_ops = { static const efx_mac_ops_t __efx_mac_ef10_ops = {
ef10_mac_poll, /* emo_poll */ ef10_mac_poll, /* emo_poll */
ef10_mac_up, /* emo_up */ ef10_mac_up, /* emo_up */
@ -62,7 +62,7 @@ static const efx_mac_ops_t __efx_mac_ef10_ops = {
ef10_mac_stats_update /* emo_stats_update */ ef10_mac_stats_update /* emo_stats_update */
#endif /* EFSYS_OPT_MAC_STATS */ #endif /* EFSYS_OPT_MAC_STATS */
}; };
#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD */ #endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */
__checkReturn efx_rc_t __checkReturn efx_rc_t
efx_mac_pdu_set( efx_mac_pdu_set(
@ -826,6 +826,13 @@ efx_mac_select(
break; break;
#endif /* EFSYS_OPT_MEDFORD */ #endif /* EFSYS_OPT_MEDFORD */
#if EFSYS_OPT_MEDFORD2
case EFX_FAMILY_MEDFORD2:
emop = &__efx_mac_ef10_ops;
type = EFX_MAC_MEDFORD2;
break;
#endif /* EFSYS_OPT_MEDFORD2 */
default: default:
rc = EINVAL; rc = EINVAL;
goto fail1; goto fail1;