diff options
author | Jason Wright <jason@cvs.openbsd.org> | 2001-05-14 22:29:29 +0000 |
---|---|---|
committer | Jason Wright <jason@cvs.openbsd.org> | 2001-05-14 22:29:29 +0000 |
commit | 4304b6c9e984e25807c420d856fd8f17903cc947 (patch) | |
tree | 84465b36aadc834c915e4ae956a0790c07d74ec6 /sys/dev/pci | |
parent | 8d56d4b543eee231601a21fdc0a385eb8a42835e (diff) |
use bus_dmamap_sync() as appropriate
Diffstat (limited to 'sys/dev/pci')
-rw-r--r-- | sys/dev/pci/hifn7751.c | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/sys/dev/pci/hifn7751.c b/sys/dev/pci/hifn7751.c index efeffef04bc..8589432aaf2 100644 --- a/sys/dev/pci/hifn7751.c +++ b/sys/dev/pci/hifn7751.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hifn7751.c,v 1.64 2001/05/14 03:07:06 jason Exp $ */ +/* $OpenBSD: hifn7751.c,v 1.65 2001/05/14 22:29:28 jason Exp $ */ /* * Invertex AEON / Hi/fn 7751 driver @@ -299,6 +299,9 @@ hifn_attach(parent, self, aux) NULL, NULL, NULL); } + bus_dmamap_sync(sc->sc_dmat, sc->sc_dmamap, + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); + return; fail_intr: @@ -1019,8 +1022,14 @@ hifn_crypto(sc, cmd, crp) cmd->src_map->dm_nsegs, cmd->dst_map->dm_nsegs); #endif + bus_dmamap_sync(sc->sc_dmat, cmd->src_map, BUS_DMASYNC_PREREAD); + bus_dmamap_sync(sc->sc_dmat, cmd->dst_map, BUS_DMASYNC_PREWRITE); + s = splnet(); + bus_dmamap_sync(sc->sc_dmat, sc->sc_dmamap, + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); + /* * need 1 cmd, and 1 res * need N src, and N dst @@ -1029,6 +1038,8 @@ hifn_crypto(sc, cmd, crp) dma->srcu+cmd->src_map->dm_nsegs > HIFN_D_SRC_RSIZE || dma->dstu+cmd->dst_map->dm_nsegs > HIFN_D_DST_RSIZE || dma->resu+1 > HIFN_D_RES_RSIZE) { + bus_dmamap_sync(sc->sc_dmat, sc->sc_dmamap, + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); splx(s); goto err_dstmap; } @@ -1094,6 +1105,9 @@ hifn_crypto(sc, cmd, crp) READ_REG_1(sc, HIFN_1_DMA_CSR), READ_REG_1(sc, HIFN_1_DMA_IER)); #endif + bus_dmamap_sync(sc->sc_dmat, sc->sc_dmamap, + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); + splx(s); return 0; /* success */ @@ -1132,6 +1146,9 @@ hifn_intr(arg) if ((dmacsr & sc->sc_dmaier) == 0) return (0); + bus_dmamap_sync(sc->sc_dmat, sc->sc_dmamap, + BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD); + if (dma->resu > HIFN_D_RES_RSIZE) printf("%s: Internal Error -- ring overflow\n", sc->sc_dv.dv_xname); @@ -1193,6 +1210,8 @@ hifn_intr(arg) * interrupt, this will interupt us again. */ WRITE_REG_1(sc, HIFN_1_DMA_CSR, HIFN_DMACSR_R_DONE|HIFN_DMACSR_C_WAIT); + bus_dmamap_sync(sc->sc_dmat, sc->sc_dmamap, + BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); return (1); } @@ -1482,6 +1501,9 @@ hifn_callback(sc, cmd, macbuf) struct mbuf *m; int totlen; + bus_dmamap_sync(sc->sc_dmat, cmd->src_map, BUS_DMASYNC_POSTREAD); + bus_dmamap_sync(sc->sc_dmat, cmd->dst_map, BUS_DMASYNC_POSTWRITE); + if (crp->crp_flags & CRYPTO_F_IMBUF) { if (cmd->src_m != cmd->dst_m) { m_freem(cmd->src_m); |