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

enetc: Serialize MDIO transactions

Browse Source 
In theory we can have multiple concurrent accesses to the MDIO bus,
e.g. link status check tick and ifconfig request.
In that case we need to make sure that all MDIO transaction are
serialized.

Obtained from: Semihalf
Sponsored by: Alstom Group
This commit is contained in:
Kornel Duleba 2021-11-29 12:57:24 +01:00 committed by Wojciech Macek
parent b3d4891af0
commit cbac9a3613
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/enetc/enetc.h
View File

@ -70,6 +70,8 @@ struct enetc_ctrl_queue {
struct enetc_softc {
device_t dev;
struct mtx mii_lock;
if_ctx_t ctx;
if_softc_ctx_t shared;
#define tx_num_queues shared->isc_ntxqsets

24
sys/dev/enetc/if_enetc.c
View File

@ -376,6 +376,8 @@ enetc_attach_pre(if_ctx_t ctx)
sc->shared = scctx;
ifp = iflib_get_ifp(ctx);
mtx_init(&sc->mii_lock, "enetc_mdio", NULL, MTX_DEF);
pci_save_state(sc->dev);
pcie_flr(sc->dev, 1000, false);
pci_restore_state(sc->dev);
@ -471,6 +473,8 @@ enetc_detach(if_ctx_t ctx)
if (sc->ctrl_queue.dma.idi_size != 0)
iflib_dma_free(&sc->ctrl_queue.dma);
mtx_destroy(&sc->mii_lock);
return (error);
}
@ -1390,20 +1394,32 @@ static int
enetc_miibus_readreg(device_t dev, int phy, int reg)
{
struct enetc_softc *sc;
int val;
sc = iflib_get_softc(device_get_softc(dev));
return (enetc_mdio_read(sc->regs, ENETC_PORT_BASE + ENETC_EMDIO_BASE,
phy, reg));
mtx_lock(&sc->mii_lock);
val = enetc_mdio_read(sc->regs, ENETC_PORT_BASE + ENETC_EMDIO_BASE,
phy, reg);
mtx_unlock(&sc->mii_lock);
return (val);
}
static int
enetc_miibus_writereg(device_t dev, int phy, int reg, int data)
{
struct enetc_softc *sc;
int ret;
sc = iflib_get_softc(device_get_softc(dev));
return (enetc_mdio_write(sc->regs, ENETC_PORT_BASE + ENETC_EMDIO_BASE,
phy, reg, data));
mtx_lock(&sc->mii_lock);
ret = enetc_mdio_write(sc->regs, ENETC_PORT_BASE + ENETC_EMDIO_BASE,
phy, reg, data);
mtx_unlock(&sc->mii_lock);
return (ret);
}
static void