d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sfxge(4): add Medford2 support for tunnel encapsulations

Browse Source 
Submitted by:   Andy Moreton <amoreton at solarflare.com>
Sponsored by:   Solarflare Communications, Inc.
Differential Revision:  https://reviews.freebsd.org/D18203
This commit is contained in:
Andrew Rybchenko 2018-11-28 09:23:52 +00:00
parent ef3b3edeb6
commit edaff290d6
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/sfxge/common/efx_check.h
View File

@ -365,8 +365,8 @@
/* Support hardware assistance for tunnels */
#if EFSYS_OPT_TUNNEL
# if !EFSYS_OPT_MEDFORD
# error "TUNNEL requires MEDFORD"
# if !(EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)
# error "TUNNEL requires MEDFORD or MEDFORD2"
# endif
#endif /* EFSYS_OPT_TUNNEL */

32
sys/dev/sfxge/common/efx_tunnel.c
View File

@ -46,20 +46,20 @@ static const efx_tunnel_ops_t __efx_tunnel_dummy_ops = {
};
#endif /* EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON */
#if EFSYS_OPT_MEDFORD
#if EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2
static __checkReturn boolean_t
medford_udp_encap_supported(
ef10_udp_encap_supported(
__in efx_nic_t *enp);
static __checkReturn efx_rc_t
medford_tunnel_reconfigure(
ef10_tunnel_reconfigure(
__in efx_nic_t *enp);
static const efx_tunnel_ops_t __efx_tunnel_medford_ops = {
medford_udp_encap_supported, /* eto_udp_encap_supported */
medford_tunnel_reconfigure, /* eto_reconfigure */
static const efx_tunnel_ops_t __efx_tunnel_ef10_ops = {
ef10_udp_encap_supported, /* eto_udp_encap_supported */
ef10_tunnel_reconfigure, /* eto_reconfigure */
};
#endif /* EFSYS_OPT_MEDFORD */
#endif /* EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */
static __checkReturn efx_rc_t
efx_mcdi_set_tunnel_encap_udp_ports(
@ -190,10 +190,16 @@ efx_tunnel_init(
#if EFSYS_OPT_MEDFORD
case EFX_FAMILY_MEDFORD:
etop = &__efx_tunnel_medford_ops;
etop = &__efx_tunnel_ef10_ops;
break;
#endif /* EFSYS_OPT_MEDFORD */
#if EFSYS_OPT_MEDFORD2
case EFX_FAMILY_MEDFORD2:
etop = &__efx_tunnel_ef10_ops;
break;
#endif /* EFSYS_OPT_MEDFORD2 */
default:
EFSYS_ASSERT(0);
rc = ENOTSUP;
@ -423,9 +429,9 @@ fail1:
return (rc);
}
#if EFSYS_OPT_MEDFORD
#if EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2
static __checkReturn boolean_t
medford_udp_encap_supported(
ef10_udp_encap_supported(
__in efx_nic_t *enp)
{
const efx_nic_cfg_t *encp = &enp->en_nic_cfg;
@ -439,7 +445,7 @@ medford_udp_encap_supported(
}
static __checkReturn efx_rc_t
medford_tunnel_reconfigure(
ef10_tunnel_reconfigure(
__in efx_nic_t *enp)
{
efx_tunnel_cfg_t *etcp = &enp->en_tunnel_cfg;
@ -452,7 +458,7 @@ medford_tunnel_reconfigure(
memcpy(&etc, etcp, sizeof (etc));
EFSYS_UNLOCK(enp->en_eslp, state);
if (medford_udp_encap_supported(enp) == B_FALSE) {
if (ef10_udp_encap_supported(enp) == B_FALSE) {
/*
* It is OK to apply empty UDP tunnel ports when UDP
* tunnel encapsulations are not supported - just nothing
@ -487,6 +493,6 @@ fail1:
return (rc);
}
#endif /* EFSYS_OPT_MEDFORD */
#endif /* EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */
#endif /* EFSYS_OPT_TUNNEL */