upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-03 22:02:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

axgbe: Make sure driver works on V1000 platform and remove unnecessary reset

Browse source
This commit is contained in:
Stephan de Wit 2021-07-08 12:05:52 +00:00 committed by Franco Fichtner
parent 0c59842367
commit acc6ec8747
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sys/dev/axgbe/if_axgbe_pci.c
View file

@ -392,6 +392,7 @@ axgbe_if_attach_pre(if_ctx_t ctx)
if_softc_ctx_t scctx;
if_shared_ctx_t sctx;
device_t dev;
device_t rdev;
unsigned int ma_lo, ma_hi;
unsigned int reg;
@ -430,8 +431,15 @@ axgbe_if_attach_pre(if_ctx_t ctx)
sc->pdata.xpcs_res = mac_res[1];
/* Set the PCS indirect addressing definition registers*/
pdata->xpcs_window_def_reg = PCS_V2_WINDOW_DEF;
pdata->xpcs_window_sel_reg = PCS_V2_WINDOW_SELECT;
rdev = pci_find_dbsf(0, 0, 0, 0);
if (rdev && pci_get_device(rdev) == 0x15d0
&& pci_get_vendor(rdev) == 0x1022) {
pdata->xpcs_window_def_reg = PCS_V2_RV_WINDOW_DEF;
pdata->xpcs_window_sel_reg = PCS_V2_RV_WINDOW_SELECT;
} else {
pdata->xpcs_window_def_reg = PCS_V2_WINDOW_DEF;
pdata->xpcs_window_sel_reg = PCS_V2_WINDOW_SELECT;
}
/* Configure the PCS indirect addressing support */
reg = XPCS32_IOREAD(pdata, pdata->xpcs_window_def_reg);

3
sys/dev/axgbe/xgbe-phy-v2.c
View file

@ -1478,9 +1478,6 @@ xgbe_phy_sfp_detect(struct xgbe_prv_data *pdata)
struct xgbe_phy_data *phy_data = pdata->phy_data;
int ret, prev_sfp_state = phy_data->sfp_mod_absent;
/* Reset the SFP signals and info */
xgbe_phy_sfp_reset(phy_data);
ret = xgbe_phy_get_comm_ownership(pdata);
if (ret)
return;