diff options
| author |   oga <oga@openbsd.org> | 2010-04-22 12:33:30 +0000 |
|---|---|---|
| committer | oga <oga@openbsd.org> | 2010-04-22 12:33:30 +0000 |
| commit | 579ce6c34c8f35e78fd48758842e57a76d090a92 (patch) | |
| tree | 1e61513ec938ad29d8b73cb784258177f5fb3f57 | |
| parent | - kill the runner_imsg_compose wrapper to reduce indirection (diff) | |
| download | wireguard-openbsd-579ce6c34c8f35e78fd48758842e57a76d090a92.tar.xz wireguard-openbsd-579ce6c34c8f35e78fd48758842e57a76d090a92.zip | |
use BUS_DMA_ZERO on alloc instead of bzeroing after.
ok dlg@, marco@
| -rw-r--r-- | sys/dev/ic/mfi.c | 5 | ||||
| -rw-r--r-- | sys/dev/ic/mpi.c | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c index acd67bc88a0..d388097110c 100644 --- a/sys/dev/ic/mfi.c +++ b/sys/dev/ic/mfi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfi.c,v 1.102 2010/04/10 17:29:59 marco Exp $ */ +/* $OpenBSD: mfi.c,v 1.103 2010/04/22 12:33:30 oga Exp $ */ /* * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us> * @@ -303,7 +303,7 @@ mfi_allocmem(struct mfi_softc *sc, size_t size) goto amfree; if (bus_dmamem_alloc(sc->sc_dmat, size, PAGE_SIZE, 0, &mm->am_seg, 1, - &nsegs, BUS_DMA_NOWAIT) != 0) + &nsegs, BUS_DMA_NOWAIT | BUS_DMA_ZERO) != 0) goto destroy; if (bus_dmamem_map(sc->sc_dmat, &mm->am_seg, nsegs, size, &mm->am_kva, @@ -317,7 +317,6 @@ mfi_allocmem(struct mfi_softc *sc, size_t size) DNPRINTF(MFI_D_MEM, " kva: %p dva: %p map: %p\n", mm->am_kva, mm->am_map->dm_segs[0].ds_addr, mm->am_map); - memset(mm->am_kva, 0, size); return (mm); unmap: diff --git a/sys/dev/ic/mpi.c b/sys/dev/ic/mpi.c index fbb4955d91f..fbd974b474a 100644 --- a/sys/dev/ic/mpi.c +++ b/sys/dev/ic/mpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpi.c,v 1.144 2010/04/22 03:14:35 marco Exp $ */ +/* $OpenBSD: mpi.c,v 1.145 2010/04/22 12:33:30 oga Exp $ */ /* * Copyright (c) 2005, 2006, 2009 David Gwynne <dlg@openbsd.org> @@ -904,7 +904,7 @@ mpi_dmamem_alloc(struct mpi_softc *sc, size_t size) goto mdmfree; if (bus_dmamem_alloc(sc->sc_dmat, size, PAGE_SIZE, 0, &mdm->mdm_seg, - 1, &nsegs, BUS_DMA_NOWAIT) != 0) + 1, &nsegs, BUS_DMA_NOWAIT | BUS_DMA_ZERO) != 0) goto destroy; if (bus_dmamem_map(sc->sc_dmat, &mdm->mdm_seg, nsegs, size, @@ -915,8 +915,6 @@ mpi_dmamem_alloc(struct mpi_softc *sc, size_t size) NULL, BUS_DMA_NOWAIT) != 0) goto unmap; - bzero(mdm->mdm_kva, size); - DNPRINTF(MPI_D_MEM, "%s: mpi_dmamem_alloc size: %d mdm: %#x " "map: %#x nsegs: %d segs: %#x kva: %x\n", DEVNAME(sc), size, mdm->mdm_map, nsegs, mdm->mdm_seg, mdm->mdm_kva); |