git: bd0771390ef5 - main - eqos: Call init earlier
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 11 Dec 2023 10:41:14 UTC
The branch main has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=bd0771390ef532ce0ae3f39350acd540125e5620
commit bd0771390ef532ce0ae3f39350acd540125e5620
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2023-12-11 10:29:51 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-12-11 10:31:28 +0000
eqos: Call init earlier
Call the subclassed IF_EQOS_INIT before trying to read the mac, clocks
and reset needs to dealt with before we can read the registers.
---
sys/dev/eqos/if_eqos.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/sys/dev/eqos/if_eqos.c b/sys/dev/eqos/if_eqos.c
index 0dc476acd520..75e3ca957b48 100644
--- a/sys/dev/eqos/if_eqos.c
+++ b/sys/dev/eqos/if_eqos.c
@@ -1119,6 +1119,9 @@ eqos_attach(device_t dev)
return (ENXIO);
}
+ if ((error = IF_EQOS_INIT(dev)))
+ return (error);
+
sc->dev = dev;
ver = RD4(sc, GMAC_MAC_VERSION);
userver = (ver & GMAC_MAC_VERSION_USERVER_MASK) >>
@@ -1142,10 +1145,6 @@ eqos_attach(device_t dev)
sc->hw_feature[2], sc->hw_feature[3]);
}
-
- if ((error = IF_EQOS_INIT(dev)))
- return (error);
-
mtx_init(&sc->lock, "eqos lock", MTX_NETWORK_LOCK, MTX_DEF);
callout_init_mtx(&sc->callout, &sc->lock, 0);