diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2009-11-03 18:55:24 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2009-11-03 18:55:24 +0000 |
| commit | 8101a0a8c05d61dedce10a8f40516c1d5e898bd4 (patch) | |
| tree | 2ce95dc18fbfb0185fa0ab73045948fff625994e | |
| parent | 61fbe9a52f345a77d0547e6a45a22b4aefc40d3b (diff) | |
use BUS_DMA_{READ,WRITE} hints when mapping mbufs for Rx/Tx even
though this does nothing on i386 and amd64.
| -rw-r--r-- | sys/dev/pci/if_iwn.c | 14 | ||||
| -rw-r--r-- | sys/dev/pci/if_wpi.c | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c index 2ae6e0ca4cd..81dff8d9928 100644 --- a/sys/dev/pci/if_iwn.c +++ b/sys/dev/pci/if_iwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwn.c,v 1.74 2009/11/01 12:01:16 damien Exp $ */ +/* $OpenBSD: if_iwn.c,v 1.75 2009/11/03 18:55:23 damien Exp $ */ /*- * Copyright (c) 2007-2009 Damien Bergamini <damien.bergamini@free.fr> @@ -1121,7 +1121,7 @@ iwn_alloc_rx_ring(struct iwn_softc *sc, struct iwn_rx_ring *ring) error = bus_dmamap_load(sc->sc_dmat, data->map, mtod(data->m, void *), IWN_RBUF_SIZE, NULL, - BUS_DMA_NOWAIT); + BUS_DMA_NOWAIT | BUS_DMA_READ); if (error != 0) { printf("%s: can't not map mbuf (error %d)\n", sc->sc_dev.dv_xname, error); @@ -1877,14 +1877,14 @@ iwn_rx_done(struct iwn_softc *sc, struct iwn_rx_desc *desc, bus_dmamap_unload(sc->sc_dmat, data->map); error = bus_dmamap_load(sc->sc_dmat, data->map, mtod(m1, void *), - IWN_RBUF_SIZE, NULL, BUS_DMA_NOWAIT); + IWN_RBUF_SIZE, NULL, BUS_DMA_NOWAIT | BUS_DMA_READ); if (error != 0) { m_freem(m1); /* Try to reload the old mbuf. */ error = bus_dmamap_load(sc->sc_dmat, data->map, mtod(data->m, void *), IWN_RBUF_SIZE, NULL, - BUS_DMA_NOWAIT); + BUS_DMA_NOWAIT | BUS_DMA_READ); if (error != 0) { panic("%s: could not load old RX mbuf", sc->sc_dev.dv_xname); @@ -2837,7 +2837,7 @@ iwn_tx(struct iwn_softc *sc, struct mbuf *m, struct ieee80211_node *ni) tx->flags = htole32(flags); error = bus_dmamap_load_mbuf(sc->sc_dmat, data->map, m, - BUS_DMA_NOWAIT); + BUS_DMA_NOWAIT | BUS_DMA_WRITE); if (error != 0 && error != EFBIG) { printf("%s: can't map mbuf (error %d)\n", sc->sc_dev.dv_xname, error); @@ -2865,7 +2865,7 @@ iwn_tx(struct iwn_softc *sc, struct mbuf *m, struct ieee80211_node *ni) m = m1; error = bus_dmamap_load_mbuf(sc->sc_dmat, data->map, m, - BUS_DMA_NOWAIT); + BUS_DMA_NOWAIT | BUS_DMA_WRITE); if (error != 0) { printf("%s: can't map mbuf (error %d)\n", sc->sc_dev.dv_xname, error); @@ -3099,7 +3099,7 @@ iwn_cmd(struct iwn_softc *sc, int code, const void *buf, int size, int async) } cmd = mtod(m, struct iwn_tx_cmd *); error = bus_dmamap_load(sc->sc_dmat, data->map, cmd, totlen, - NULL, BUS_DMA_NOWAIT); + NULL, BUS_DMA_NOWAIT | BUS_DMA_WRITE); if (error != 0) { m_freem(m); return error; diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c index 86463d786e9..bc3d847eb4b 100644 --- a/sys/dev/pci/if_wpi.c +++ b/sys/dev/pci/if_wpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wpi.c,v 1.97 2009/10/31 11:52:07 damien Exp $ */ +/* $OpenBSD: if_wpi.c,v 1.98 2009/11/03 18:55:23 damien Exp $ */ /*- * Copyright (c) 2006-2008 @@ -693,7 +693,7 @@ wpi_alloc_rx_ring(struct wpi_softc *sc, struct wpi_rx_ring *ring) error = bus_dmamap_load(sc->sc_dmat, data->map, mtod(data->m, void *), WPI_RBUF_SIZE, NULL, - BUS_DMA_NOWAIT); + BUS_DMA_NOWAIT | BUS_DMA_READ); if (error != 0) { printf("%s: can't map mbuf (error %d)\n", sc->sc_dev.dv_xname, error); @@ -1236,14 +1236,14 @@ wpi_rx_done(struct wpi_softc *sc, struct wpi_rx_desc *desc, bus_dmamap_unload(sc->sc_dmat, data->map); error = bus_dmamap_load(sc->sc_dmat, data->map, mtod(m1, void *), - WPI_RBUF_SIZE, NULL, BUS_DMA_NOWAIT); + WPI_RBUF_SIZE, NULL, BUS_DMA_NOWAIT | BUS_DMA_READ); if (error != 0) { m_freem(m1); /* Try to reload the old mbuf. */ error = bus_dmamap_load(sc->sc_dmat, data->map, mtod(data->m, void *), WPI_RBUF_SIZE, NULL, - BUS_DMA_NOWAIT); + BUS_DMA_NOWAIT | BUS_DMA_READ); if (error != 0) { panic("%s: could not load old RX mbuf", sc->sc_dev.dv_xname); @@ -1838,7 +1838,7 @@ wpi_tx(struct wpi_softc *sc, struct mbuf *m, struct ieee80211_node *ni) tx->flags = htole32(flags); error = bus_dmamap_load_mbuf(sc->sc_dmat, data->map, m, - BUS_DMA_NOWAIT); + BUS_DMA_NOWAIT | BUS_DMA_WRITE); if (error != 0 && error != EFBIG) { printf("%s: can't map mbuf (error %d)\n", sc->sc_dev.dv_xname, error); @@ -1866,7 +1866,7 @@ wpi_tx(struct wpi_softc *sc, struct mbuf *m, struct ieee80211_node *ni) m = m1; error = bus_dmamap_load_mbuf(sc->sc_dmat, data->map, m, - BUS_DMA_NOWAIT); + BUS_DMA_NOWAIT | BUS_DMA_WRITE); if (error != 0) { printf("%s: can't map mbuf (error %d)\n", sc->sc_dev.dv_xname, error); @@ -2096,7 +2096,7 @@ wpi_cmd(struct wpi_softc *sc, int code, const void *buf, int size, int async) } cmd = mtod(m, struct wpi_tx_cmd *); error = bus_dmamap_load(sc->sc_dmat, data->map, cmd, totlen, - NULL, BUS_DMA_NOWAIT); + NULL, BUS_DMA_NOWAIT | BUS_DMA_WRITE); if (error != 0) { m_freem(m); return error; |