openbsd/src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2026-04-30 09:06:11 +00:00
Code Issues Projects Releases Wiki Activity

Make the output of bse(4) mp-safe. Use consumer and provider indexes

Browse Source 
instead of sc_tx.queued to determine the number of used tx slots.

Tested on RPI4.

Feedback and OK from jmatthew@/
This commit is contained in:
mvs
2026-01-15 03:12:49 +00:00
parent c1b67e90d0
commit 1f32effba9
2 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
sys/dev/ic/bcmgenet.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: bcmgenet.c,v 1.10 2026/01/05 11:49:01 mvs Exp $ */
/* $OpenBSD: bcmgenet.c,v 1.11 2026/01/15 03:12:49 mvs Exp $ */
/* $NetBSD: bcmgenet.c,v 1.3 2020/02/27 17:30:07 jmcneill Exp $ */
/*-
@@ -195,7 +195,6 @@ genet_setup_txdesc(struct genet_softc *sc, int index, int flags,
uint32_t status;
status = flags | __SHIFTIN(len, GENET_TX_DESC_STATUS_BUFLEN);
++sc->sc_tx.queued;
WR4(sc, GENET_TX_DESC_ADDRESS_LO(index), (uint32_t)paddr);
WR4(sc, GENET_TX_DESC_ADDRESS_HI(index), (uint32_t)(paddr >> 32));
@@ -206,7 +205,7 @@ int
genet_setup_txbuf(struct genet_softc *sc, int index, struct mbuf *m)
{
bus_dma_segment_t *segs;
int error, nsegs, cur, i;
int error, queued, nsegs, cur, i;
uint32_t flags;
/*
@@ -233,8 +232,9 @@ genet_setup_txbuf(struct genet_softc *sc, int index, struct mbuf *m)
segs = sc->sc_tx.buf_map[index].map->dm_segs;
nsegs = sc->sc_tx.buf_map[index].map->dm_nsegs;
queued = (sc->sc_tx.pidx - sc->sc_tx.cidx) & 0xffff;
if (sc->sc_tx.queued >= GENET_DMA_DESC_COUNT - nsegs) {
if (queued >= GENET_DMA_DESC_COUNT - nsegs) {
bus_dmamap_unload(sc->sc_tx.buf_tag,
sc->sc_tx.buf_map[index].map);
return -1;
@@ -520,7 +520,6 @@ genet_init_rings(struct genet_softc *sc, int qid)
/* TX ring */
sc->sc_tx.next = 0;
sc->sc_tx.queued = 0;
sc->sc_tx.cidx = sc->sc_tx.pidx = 0;
WR4(sc, GENET_TX_SCB_BURST_SIZE, 0x08);
@@ -657,6 +656,7 @@ genet_stop(struct genet_softc *sc)
ifp->if_flags &= ~IFF_RUNNING;
ifq_clr_oactive(&ifp->if_snd);
ifq_barrier(&ifp->if_snd);
intr_barrier(sc->sc_ih);
/* Clean RX ring. */
@@ -749,17 +749,15 @@ genet_txintr(struct genet_softc *sc, int qid)
{
struct ifnet *ifp = &sc->sc_ac.ac_if;
struct genet_bufmap *bmap;
uint32_t cidx, total;
int i;
uint32_t queued;
cidx = RD4(sc, GENET_TX_DMA_CONS_INDEX(qid)) & 0xffff;
total = (cidx - sc->sc_tx.cidx) & 0xffff;
queued = (RD4(sc, GENET_TX_DMA_PROD_INDEX(qid)) -
sc->sc_tx.cidx) & 0xffff;
for (i = sc->sc_tx.next; sc->sc_tx.queued > 0 && total > 0;
i = TX_NEXT(i), total--) {
while (queued > 0) {
/* XXX check for errors */
bmap = &sc->sc_tx.buf_map[i];
bmap = &sc->sc_tx.buf_map[sc->sc_tx.next];
if (bmap->mbuf != NULL) {
bus_dmamap_sync(sc->sc_tx.buf_tag, bmap->map,
0, bmap->map->dm_mapsize,
@@ -769,21 +767,20 @@ genet_txintr(struct genet_softc *sc, int qid)
bmap->mbuf = NULL;
}
--sc->sc_tx.queued;
queued--;
sc->sc_tx.cidx++;
sc->sc_tx.next = TX_NEXT(sc->sc_tx.next);
}
if (sc->sc_tx.cidx != cidx) {
sc->sc_tx.next = i;
sc->sc_tx.cidx = cidx;
if (ifq_is_oactive(&ifp->if_snd))
ifq_restart(&ifp->if_snd);
}
if (ifq_is_oactive(&ifp->if_snd))
ifq_restart(&ifp->if_snd);
}
void
genet_start(struct ifnet *ifp)
genet_qstart(struct ifqueue *ifq)
{
struct ifnet *ifp = ifq->ifq_if;
struct genet_softc *sc = ifp->if_softc;
struct mbuf *m;
const int qid = GENET_DMA_DEFAULT_QUEUE;
@@ -971,7 +968,8 @@ genet_attach(struct genet_softc *sc)
ifp->if_softc = sc;
snprintf(ifp->if_xname, IFNAMSIZ, "%s", sc->sc_dev.dv_xname);
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_start = genet_start;
ifp->if_xflags = IFXF_MPSAFE;
ifp->if_qstart = genet_qstart;
ifp->if_ioctl = genet_ioctl;
ifq_init_maxlen(&ifp->if_snd, IFQ_MAXLEN);

4
sys/dev/ic/bcmgenetvar.h
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: bcmgenetvar.h,v 1.1 2020/04/14 21:02:39 kettenis Exp $ */
/* $OpenBSD: bcmgenetvar.h,v 1.2 2026/01/15 03:12:49 mvs Exp $ */
/* $NetBSD: bcmgenetvar.h,v 1.1 2020/02/22 00:28:35 jmcneill Exp $ */
/*-
@@ -51,7 +51,7 @@ struct genet_bufmap {
struct genet_ring {
bus_dma_tag_t buf_tag;
struct genet_bufmap buf_map[GENET_DMA_DESC_COUNT];
u_int next, queued;
u_int next;
uint32_t cidx, pidx;
};