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

sfxge: rename hunt_link_state_t to ef10_link_state_t

Browse Source 
Submitted by:   Mark Spender <mspender at solarflare.com>
Reviewed by:    gnn
Sponsored by:   Solarflare Communications, Inc.
MFC after:      2 days
Differential Revision: https://reviews.freebsd.org/D4932
This commit is contained in:
arybchik 2016-01-15 06:21:39 +00:00
parent b69dd9628f
commit faa81e4b4f
5 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/dev/sfxge/common/hunt_impl.h
View File

@ -482,16 +482,16 @@ ef10_nvram_partn_size(
/* PHY */
typedef struct hunt_link_state_s {
uint32_t hls_adv_cap_mask;
uint32_t hls_lp_cap_mask;
unsigned int hls_fcntl;
efx_link_mode_t hls_link_mode;
typedef struct ef10_link_state_s {
uint32_t els_adv_cap_mask;
uint32_t els_lp_cap_mask;
unsigned int els_fcntl;
efx_link_mode_t els_link_mode;
#if EFSYS_OPT_LOOPBACK
efx_loopback_type_t hls_loopback;
efx_loopback_type_t els_loopback;
#endif
boolean_t hls_mac_up;
} hunt_link_state_t;
boolean_t els_mac_up;
} ef10_link_state_t;
extern void
hunt_phy_link_ev(
@ -502,7 +502,7 @@ hunt_phy_link_ev(
extern __checkReturn efx_rc_t
hunt_phy_get_link(
__in efx_nic_t *enp,
__out hunt_link_state_t *hlsp);
__out ef10_link_state_t *elsp);
extern __checkReturn efx_rc_t
hunt_phy_power(

16
sys/dev/sfxge/common/hunt_mac.c
View File

@ -48,16 +48,16 @@ hunt_mac_poll(
*/
efx_port_t *epp = &(enp->en_port);
hunt_link_state_t hls;
ef10_link_state_t els;
efx_rc_t rc;
if ((rc = hunt_phy_get_link(enp, &hls)) != 0)
if ((rc = hunt_phy_get_link(enp, &els)) != 0)
goto fail1;
epp->ep_adv_cap_mask = hls.hls_adv_cap_mask;
epp->ep_fcntl = hls.hls_fcntl;
epp->ep_adv_cap_mask = els.els_adv_cap_mask;
epp->ep_fcntl = els.els_fcntl;
*link_modep = hls.hls_link_mode;
*link_modep = els.els_link_mode;
return (0);
@ -79,17 +79,17 @@ hunt_mac_up(
* essentially identical.
*/
hunt_link_state_t hls;
ef10_link_state_t els;
efx_rc_t rc;
/*
* Because Huntington doesn't *require* polling, we can't rely on
* hunt_mac_poll() being executed to populate epp->ep_mac_up.
*/
if ((rc = hunt_phy_get_link(enp, &hls)) != 0)
if ((rc = hunt_phy_get_link(enp, &els)) != 0)
goto fail1;
*mac_upp = hls.hls_mac_up;
*mac_upp = els.els_mac_up;
return (0);

8
sys/dev/sfxge/common/hunt_nic.c
View File

@ -1096,7 +1096,7 @@ hunt_board_cfg(
efx_nic_cfg_t *encp = &(enp->en_nic_cfg);
uint8_t mac_addr[6];
uint32_t board_type = 0;
hunt_link_state_t hls;
ef10_link_state_t els;
efx_port_t *epp = &(enp->en_port);
uint32_t port;
uint32_t pf;
@ -1170,10 +1170,10 @@ hunt_board_cfg(
goto fail6;
/* Obtain the default PHY advertised capabilities */
if ((rc = hunt_phy_get_link(enp, &hls)) != 0)
if ((rc = hunt_phy_get_link(enp, &els)) != 0)
goto fail7;
epp->ep_default_adv_cap_mask = hls.hls_adv_cap_mask;
epp->ep_adv_cap_mask = hls.hls_adv_cap_mask;
epp->ep_default_adv_cap_mask = els.els_adv_cap_mask;
epp->ep_adv_cap_mask = els.els_adv_cap_mask;
/*
* Enable firmware workarounds for hardware errata.

12
sys/dev/sfxge/common/hunt_phy.c
View File

@ -219,7 +219,7 @@ fail1:
__checkReturn efx_rc_t
hunt_phy_get_link(
__in efx_nic_t *enp,
__out hunt_link_state_t *hlsp)
__out ef10_link_state_t *elsp)
{
/*
* TBD: consider common Siena/Hunt function: Hunt is very similar
@ -252,14 +252,14 @@ hunt_phy_get_link(
}
hunt_phy_decode_cap(MCDI_OUT_DWORD(req, GET_LINK_OUT_CAP),
&hlsp->hls_adv_cap_mask);
&elsp->els_adv_cap_mask);
hunt_phy_decode_cap(MCDI_OUT_DWORD(req, GET_LINK_OUT_LP_CAP),
&hlsp->hls_lp_cap_mask);
&elsp->els_lp_cap_mask);
hunt_phy_decode_link_mode(enp, MCDI_OUT_DWORD(req, GET_LINK_OUT_FLAGS),
MCDI_OUT_DWORD(req, GET_LINK_OUT_LINK_SPEED),
MCDI_OUT_DWORD(req, GET_LINK_OUT_FCNTL),
&hlsp->hls_link_mode, &hlsp->hls_fcntl);
&elsp->els_link_mode, &elsp->els_fcntl);
#if EFSYS_OPT_LOOPBACK
/* Assert the MC_CMD_LOOPBACK and EFX_LOOPBACK namespace agree */
@ -282,10 +282,10 @@ hunt_phy_get_link(
EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_PCS == EFX_LOOPBACK_PCS);
EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_PMAPMD == EFX_LOOPBACK_PMA_PMD);
hlsp->hls_loopback = MCDI_OUT_DWORD(req, GET_LINK_OUT_LOOPBACK_MODE);
elsp->els_loopback = MCDI_OUT_DWORD(req, GET_LINK_OUT_LOOPBACK_MODE);
#endif /* EFSYS_OPT_LOOPBACK */
hlsp->hls_mac_up = MCDI_OUT_DWORD(req, GET_LINK_OUT_MAC_FAULT) == 0;
elsp->els_mac_up = MCDI_OUT_DWORD(req, GET_LINK_OUT_MAC_FAULT) == 0;
return (0);

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

@ -47,7 +47,7 @@ medford_board_cfg(
efx_nic_cfg_t *encp = &(enp->en_nic_cfg);
uint8_t mac_addr[6] = { 0 };
uint32_t board_type = 0;
hunt_link_state_t hls;
ef10_link_state_t els;
efx_port_t *epp = &(enp->en_port);
uint32_t port;
uint32_t pf;
@ -126,10 +126,10 @@ medford_board_cfg(
goto fail6;
/* Obtain the default PHY advertised capabilities */
if ((rc = hunt_phy_get_link(enp, &hls)) != 0)
if ((rc = hunt_phy_get_link(enp, &els)) != 0)
goto fail7;
epp->ep_default_adv_cap_mask = hls.hls_adv_cap_mask;
epp->ep_adv_cap_mask = hls.hls_adv_cap_mask;
epp->ep_default_adv_cap_mask = els.els_adv_cap_mask;
epp->ep_adv_cap_mask = els.els_adv_cap_mask;
if (EFX_PCI_FUNCTION_IS_VF(encp)) {
/*