upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-02-18 18:20:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "e1000: Try auto-negotiation for fixed 100 or 10 configuration"

Browse source 
We've gotten a report of this breaking a fixed no autoneg setup.

Since no link is worse than what this intends to fix (negotiating full
duplex at forced speed), revert for the undeway 15.0 release cycle
until this can be further reviewed.

PR:		288827
Differential Revision:	https://reviews.freebsd.org/D47336

This reverts commit 645c45e297.

(cherry picked from commit 3ff0231c87f360afa4521e635b46f6c711dc4ee3)
This commit is contained in:
Kevin Bowling 2025-08-19 09:45:48 -07:00 committed by Franco Fichtner
parent fac137be86
commit 0c619fee3f
2 changed files with 8 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sys/dev/e1000/e1000_phy.c
View file

@ -1707,10 +1707,9 @@ s32 e1000_setup_copper_link_generic(struct e1000_hw *hw)
* autonegotiation.
*/
ret_val = e1000_copper_link_autoneg(hw);
if (ret_val && !hw->mac.forced_speed_duplex)
if (ret_val)
return ret_val;
}
if (!hw->mac.autoneg || (ret_val && hw->mac.forced_speed_duplex)) {
} else {
/* PHY will be set to 10H, 10F, 100H or 100F
* depending on user settings.
*/

44
sys/dev/e1000/if_em.c
View file

@ -2002,18 +2002,7 @@ em_if_media_status(if_ctx_t ctx, struct ifmediareq *ifmr)
(sc->hw.phy.media_type == e1000_media_type_internal_serdes)) {
if (sc->hw.mac.type == e1000_82545)
fiber_type = IFM_1000_LX;
switch (sc->link_speed) {
case 10:
ifmr->ifm_active |= IFM_10_FL;
break;
case 100:
ifmr->ifm_active |= IFM_100_FX;
break;
case 1000:
default:
ifmr->ifm_active |= fiber_type | IFM_FDX;
break;
}
ifmr->ifm_active |= fiber_type | IFM_FDX;
} else {
switch (sc->link_speed) {
case 10:
@ -2026,12 +2015,11 @@ em_if_media_status(if_ctx_t ctx, struct ifmediareq *ifmr)
ifmr->ifm_active |= IFM_1000_T;
break;
}
if (sc->link_duplex == FULL_DUPLEX)
ifmr->ifm_active |= IFM_FDX;
else
ifmr->ifm_active |= IFM_HDX;
}
if (sc->link_duplex == FULL_DUPLEX)
ifmr->ifm_active |= IFM_FDX;
else
ifmr->ifm_active |= IFM_HDX;
}
/*********************************************************************
@ -2065,26 +2053,6 @@ em_if_media_change(if_ctx_t ctx)
sc->hw.phy.autoneg_advertised = ADVERTISE_1000_FULL;
break;
case IFM_100_TX:
sc->hw.mac.autoneg = DO_AUTO_NEG;
if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) {
sc->hw.phy.autoneg_advertised = ADVERTISE_100_FULL;
sc->hw.mac.forced_speed_duplex = ADVERTISE_100_FULL;
} else {
sc->hw.phy.autoneg_advertised = ADVERTISE_100_HALF;
sc->hw.mac.forced_speed_duplex = ADVERTISE_100_HALF;
}
break;
case IFM_10_T:
sc->hw.mac.autoneg = DO_AUTO_NEG;
if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) {
sc->hw.phy.autoneg_advertised = ADVERTISE_10_FULL;
sc->hw.mac.forced_speed_duplex = ADVERTISE_10_FULL;
} else {
sc->hw.phy.autoneg_advertised = ADVERTISE_10_HALF;
sc->hw.mac.forced_speed_duplex = ADVERTISE_10_HALF;
}
break;
case IFM_100_FX:
sc->hw.mac.autoneg = false;
sc->hw.phy.autoneg_advertised = 0;
if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX)
@ -2092,7 +2060,7 @@ em_if_media_change(if_ctx_t ctx)
else
sc->hw.mac.forced_speed_duplex = ADVERTISE_100_HALF;
break;
case IFM_10_FL:
case IFM_10_T:
sc->hw.mac.autoneg = false;
sc->hw.phy.autoneg_advertised = 0;
if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX)