From 13bf43f2786b2083f0e3bb1cfe8ca639100c98e5 Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Sun, 13 Feb 2022 14:05:51 +0000 Subject: [PATCH] eqos(4): membar_* is not appropriate here; use bus_dmamap_sync. --- sys/dev/ic/dwc_eqos.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sys/dev/ic/dwc_eqos.c b/sys/dev/ic/dwc_eqos.c index 264037e55299..e1388c721846 100644 --- a/sys/dev/ic/dwc_eqos.c +++ b/sys/dev/ic/dwc_eqos.c @@ -322,9 +322,13 @@ eqos_setup_txbuf(struct eqos_softc *sc, int index, struct mbuf *m) /* * Defer setting OWN bit on the first descriptor until all - * descriptors have been updated. + * descriptors have been updated. The hardware will not try to + * process any descriptors past the first one still owned by + * software (i.e., with the OWN bit clear). */ - membar_sync(); + bus_dmamap_sync(sc->sc_dmat, sc->sc_tx.desc_map, + DESC_OFF(index), offsetof(struct eqos_dma_desc, tdes3), + BUS_DMASYNC_PREWRITE); sc->sc_tx.desc_ring[index].tdes3 |= htole32(EQOS_TDES3_OWN); return nsegs; @@ -333,10 +337,13 @@ eqos_setup_txbuf(struct eqos_softc *sc, int index, struct mbuf *m) static void eqos_setup_rxdesc(struct eqos_softc *sc, int index, bus_addr_t paddr) { + sc->sc_rx.desc_ring[index].tdes0 = htole32((uint32_t)paddr); sc->sc_rx.desc_ring[index].tdes1 = htole32((uint32_t)(paddr >> 32)); sc->sc_rx.desc_ring[index].tdes2 = htole32(0); - membar_sync(); + bus_dmamap_sync(sc->sc_dmat, sc->sc_rx.desc_map, + DESC_OFF(index), offsetof(struct eqos_dma_desc, tdes3), + BUS_DMASYNC_PREWRITE); sc->sc_rx.desc_ring[index].tdes3 = htole32(EQOS_TDES3_OWN | EQOS_TDES3_IOC | EQOS_TDES3_BUF1V); }