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

neta: split fixed and in-band link status configuration

Browse source 
Fixed-link mode requires different handling than the in-band
managed connection. Update interrupt, link-up/down and
autonegotiation settings for the former.

Reviewed by: mw
MFC after: 1 week
Obtained from: Stormshield
Differential Revision: https://reviews.freebsd.org/D34394
This commit is contained in:
Sebastien Bini 2022-03-22 16:44:09 +01:00 committed by Marcin Wojtas
parent 04cd74b4cd
commit 231237bbb0
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sys/dev/neta/if_mvneta.c
View file

@ -1679,7 +1679,7 @@ mvneta_enable_intr(struct mvneta_softc *sc)
reg |= MVNETA_PRXTXTI_PMISCICSUMMARY;
MVNETA_WRITE(sc, MVNETA_PRXTXTIM, reg);
if (sc->use_inband_status) {
if (!sc->phy_attached || sc->use_inband_status) {
/* Enable Port MISC Intr. (via RXTX_TH_Summary bit) */
MVNETA_WRITE(sc, MVNETA_PMIM, MVNETA_PMI_PHYSTATUSCHNG |
MVNETA_PMI_LINKCHANGE | MVNETA_PMI_PSCSYNCCHANGE);
@ -1711,7 +1711,7 @@ mvneta_rxtxth_intr(void *arg)
/* Ack maintance interrupt first */
if (__predict_false((ic & MVNETA_PRXTXTI_PMISCICSUMMARY) &&
sc->use_inband_status)) {
(!sc->phy_attached || sc->use_inband_status))) {
mvneta_sc_lock(sc);
mvneta_misc_intr(sc);
mvneta_sc_unlock(sc);
@ -2466,7 +2466,7 @@ mvneta_update_media(struct mvneta_softc *sc, int media)
sc->autoneg = (IFM_SUBTYPE(media) == IFM_AUTO);
if (sc->use_inband_status)
if (!sc->phy_attached || sc->use_inband_status)
mvneta_update_autoneg(sc, IFM_SUBTYPE(media) == IFM_AUTO);
mvneta_update_eee(sc);
@ -2629,7 +2629,7 @@ mvneta_linkup(struct mvneta_softc *sc)
KASSERT_SC_MTX(sc);
if (!sc->use_inband_status) {
if (!sc->phy_attached || !sc->use_inband_status) {
reg = MVNETA_READ(sc, MVNETA_PANC);
reg |= MVNETA_PANC_FORCELINKPASS;
reg &= ~MVNETA_PANC_FORCELINKFAIL;
@ -2649,7 +2649,7 @@ mvneta_linkdown(struct mvneta_softc *sc)
KASSERT_SC_MTX(sc);
if (!sc->use_inband_status) {
if (!sc->phy_attached || !sc->use_inband_status) {
reg = MVNETA_READ(sc, MVNETA_PANC);
reg &= ~MVNETA_PANC_FORCELINKPASS;
reg |= MVNETA_PANC_FORCELINKFAIL;