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

sfxge(4): provide option to disable not a local MAC address check

Browse Source 
Option EFSYS_OPT_ALLOW_UNCONFIGURED_NIC disables check that the adapter
MAC address is not a local address (beginning 02).

Submitted by:   Laurence Evans <levans at solarflare.com>
Reviewed by:    gnn
Sponsored by:   Solarflare Communications, Inc.
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D6508
This commit is contained in:
Andrew Rybchenko 2016-05-24 12:15:30 +00:00
parent bdb482bfa0
commit ecaa500c4b
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/sfxge/common/efsys.h
View File

@ -278,6 +278,8 @@ sfxge_map_mbuf_fast(bus_dma_tag_t tag, bus_dmamap_t map,
#define EFSYS_OPT_LICENSING 0 #define EFSYS_OPT_LICENSING 0
#define EFSYS_OPT_ALLOW_UNCONFIGURED_NIC 0
/* ID */ /* ID */
typedef struct __efsys_identifier_s efsys_identifier_t; typedef struct __efsys_identifier_s efsys_identifier_t;

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

@ -334,5 +334,12 @@
# endif # endif
#endif /* EFSYS_OPT_LICENSING */ #endif /* EFSYS_OPT_LICENSING */
/* Support adapters with missing static config (for factory use only) */
#if EFSYS_OPT_ALLOW_UNCONFIGURED_NIC
# if !EFSYS_OPT_MEDFORD
# error "ALLOW_UNCONFIGURED_NIC requires MEDFORD"
# endif
#endif /* EFSYS_OPT_ALLOW_UNCONFIGURED_NIC */
#endif /* _SYS_EFX_CHECK_H */ #endif /* _SYS_EFX_CHECK_H */

7
sys/dev/sfxge/common/medford_nic.c
View File

@ -180,6 +180,12 @@ medford_board_cfg(
/* MAC address for this function */ /* MAC address for this function */
if (EFX_PCI_FUNCTION_IS_PF(encp)) { if (EFX_PCI_FUNCTION_IS_PF(encp)) {
rc = efx_mcdi_get_mac_address_pf(enp, mac_addr); rc = efx_mcdi_get_mac_address_pf(enp, mac_addr);
#if EFSYS_OPT_ALLOW_UNCONFIGURED_NIC
/* Disable static config checking for Medford NICs, ONLY
* for manufacturing test and setup at the factory, to
* allow the static config to be installed.
*/
#else /* EFSYS_OPT_ALLOW_UNCONFIGURED_NIC */
if ((rc == 0) && (mac_addr[0] & 0x02)) { if ((rc == 0) && (mac_addr[0] & 0x02)) {
/* /*
* If the static config does not include a global MAC * If the static config does not include a global MAC
@ -189,6 +195,7 @@ medford_board_cfg(
*/ */
rc = EINVAL; rc = EINVAL;
} }
#endif /* EFSYS_OPT_ALLOW_UNCONFIGURED_NIC */
} else { } else {
rc = efx_mcdi_get_mac_address_vf(enp, mac_addr); rc = efx_mcdi_get_mac_address_vf(enp, mac_addr);
} }