 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus_dma.c,v 1.57 2012/09/11 17:54:12 matt Exp $	*/
+/*	$NetBSD: bus_dma.c,v 1.58 2012/09/18 05:47:26 matt Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -23,52 +23,86 @@
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.57 2012/09/11 17:54:12 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.58 2012/09/18 05:47:26 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/vnode.h>
 #include <sys/device.h>
 #include <uvm/uvm.h>
 #include <sys/bus.h>
 #include <machine/cpu.h>
 #include <arm/cpufunc.h>
 static struct evcnt bus_dma_creates =
 	EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, "busdma", "creates");
 static struct evcnt bus_dma_bounced_creates =
 	EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, "busdma", "bounced creates");
 static struct evcnt bus_dma_loads =
 	EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, "busdma", "loads");
 static struct evcnt bus_dma_bounced_loads =
 	EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, "busdma", "bounced loads");
 static struct evcnt bus_dma_read_bounces =
 	EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, "busdma", "read bounces");
 static struct evcnt bus_dma_write_bounces =
 	EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, "busdma", "write bounces");
 static struct evcnt bus_dma_bounced_unloads =
 	EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, "busdma", "bounced unloads");
 static struct evcnt bus_dma_unloads =
 	EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, "busdma", "unloads");
 static struct evcnt bus_dma_bounced_destroys =
 	EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, "busdma", "bounced destroys");
 static struct evcnt bus_dma_destroys =
 	EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, "busdma", "destroys");
 EVCNT_ATTACH_STATIC(bus_dma_creates);
 EVCNT_ATTACH_STATIC(bus_dma_bounced_creates);
 EVCNT_ATTACH_STATIC(bus_dma_loads);
 EVCNT_ATTACH_STATIC(bus_dma_bounced_loads);
 EVCNT_ATTACH_STATIC(bus_dma_read_bounces);
 EVCNT_ATTACH_STATIC(bus_dma_write_bounces);
 EVCNT_ATTACH_STATIC(bus_dma_unloads);
 EVCNT_ATTACH_STATIC(bus_dma_bounced_unloads);
 EVCNT_ATTACH_STATIC(bus_dma_destroys);
 EVCNT_ATTACH_STATIC(bus_dma_bounced_destroys);
 #define	STAT_INCR(x)	(bus_dma_ ## x.ev_count++)
 int	_bus_dmamap_load_buffer(bus_dma_tag_t, bus_dmamap_t, void *,
 	    bus_size_t, struct vmspace *, int);
-struct arm32_dma_range *_bus_dma_inrange(struct arm32_dma_range *,
+static struct arm32_dma_range *
-	    int, bus_addr_t);
+	_bus_dma_inrange(struct arm32_dma_range *, int, bus_addr_t);
 /*
  * Check to see if the specified page is in an allowed DMA range.
  */
 inline struct arm32_dma_range *
 _bus_dma_inrange(struct arm32_dma_range *ranges, int nranges,
     bus_addr_t curaddr)
+{
 	struct arm32_dma_range *dr;
 	int i;
 	for (i = 0, dr = ranges; i < nranges; i++, dr++) {
 		if (curaddr >= dr->dr_sysbase &&
 @@ -79,33 +113,36 @@ _bus_dma_inrange(struct arm32_dma_range
 	return (NULL);
+}
 /*
  * Common function to load the specified physical address into the
  * DMA map, coalescing segments and boundary checking as necessary.
  */
 static int
 _bus_dmamap_load_paddr(bus_dma_tag_t t, bus_dmamap_t map,
     bus_addr_t paddr, bus_size_t size)
+{
 	bus_dma_segment_t * const segs = map->dm_segs;
 	int nseg = map->dm_nsegs;
-	bus_addr_t lastaddr = 0xdead;	/* XXX gcc */
+	bus_addr_t lastaddr;
 	bus_addr_t bmask = ~(map->_dm_boundary - 1);
 	bus_addr_t curaddr;
 	bus_size_t sgsize;
 	if (nseg > 0)
 		lastaddr = segs[nseg-1].ds_addr + segs[nseg-1].ds_len;
 	else
 		lastaddr = 0xdead;
  again:
 	sgsize = size;
 	/* Make sure we're in an allowed DMA range. */
 	if (t->_ranges != NULL) {
 		/* XXX cache last result? */
 		const struct arm32_dma_range * const dr =
 		    _bus_dma_inrange(t->_ranges, t->_nranges, paddr);
 		if (dr == NULL)
 			return (EINVAL);
 		/*
 		 * In a valid DMA range.  Translate the physical
 @@ -146,26 +183,75 @@ _bus_dmamap_load_paddr(bus_dma_tag_t t,
+	}
 	lastaddr = curaddr + sgsize;
 	paddr += sgsize;
 	size -= sgsize;
 	if (size > 0)
 		goto again;
 	map->dm_nsegs = nseg;
 	return (0);
+}
 #ifdef _ARM32_NEED_BUS_DMA_BOUNCE
 static int _bus_dma_alloc_bouncebuf(bus_dma_tag_t t, bus_dmamap_t map,
 	    bus_size_t size, int flags);
 static void _bus_dma_free_bouncebuf(bus_dma_tag_t t, bus_dmamap_t map);
 static int _bus_dma_uiomove(void *buf, struct uio *uio, size_t n,
 	    int direction);
 static int
 _bus_dma_load_bouncebuf(bus_dma_tag_t t, bus_dmamap_t map, void *buf,
 	size_t buflen, int buftype, int flags)
+{
 	struct arm32_bus_dma_cookie * const cookie = map->_dm_cookie;
 	struct vmspace * const vm = vmspace_kernel();
 	int error;
 	KASSERT(cookie != NULL);
 	KASSERT(cookie->id_flags & _BUS_DMA_MIGHT_NEED_BOUNCE);
 	/*
 	 * Allocate bounce pages, if necessary.
 	 */
 	if ((cookie->id_flags & _BUS_DMA_HAS_BOUNCE) == 0) {
 		error = _bus_dma_alloc_bouncebuf(t, map, buflen, flags);
 		if (error)
 			return (error);
+	}
 	/*
 	 * Cache a pointer to the caller's buffer and load the DMA map
 	 * with the bounce buffer.
 	 */
 	cookie->id_origbuf = buf;
 	cookie->id_origbuflen = buflen;
 	error = _bus_dmamap_load_buffer(t, map, cookie->id_bouncebuf,
 	    buflen, vm, flags);
 	if (error)
 		return (error);
 	STAT_INCR(bounced_loads);
 	map->dm_mapsize = buflen;
 	map->_dm_vmspace = vm;
 	map->_dm_buftype = buftype;
 	/* ...so _bus_dmamap_sync() knows we're bouncing */
 	cookie->id_flags |= _BUS_DMA_IS_BOUNCING;
 	return 0;
+}
 #endif /* _ARM32_NEED_BUS_DMA_BOUNCE */
 /*
  * Common function for DMA map creation.  May be called by bus-specific
  * DMA map creation functions.
  */
 int
 _bus_dmamap_create(bus_dma_tag_t t, bus_size_t size, int nsegments,
     bus_size_t maxsegsz, bus_size_t boundary, int flags, bus_dmamap_t *dmamp)
+{
 	struct arm32_bus_dmamap *map;
 	void *mapstore;
 	size_t mapsize;
 #ifdef DEBUG_DMA
 @@ -177,159 +263,249 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
 	 * Allocate and initialize the DMA map.  The end of the map
 	 * is a variable-sized array of segments, so we allocate enough
 	 * room for them in one shot.
+	 *
 	 * Note we don't preserve the WAITOK or NOWAIT flags.  Preservation
 	 * of ALLOCNOW notifies others that we've reserved these resources,
 	 * and they are not to be freed.
+	 *
 	 * The bus_dmamap_t includes one bus_dma_segment_t, hence
 	 * the (nsegments - 1).
 	 */
 	mapsize = sizeof(struct arm32_bus_dmamap) +
 	    (sizeof(bus_dma_segment_t) * (nsegments - 1));
-	if ((mapstore = malloc(mapsize, M_DMAMAP,
+	const int mallocflags = M_ZERO|(flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK;
-	    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK)) == NULL)
+	if ((mapstore = malloc(mapsize, M_DMAMAP, mallocflags)) == NULL)
 		return (ENOMEM);
 	memset(mapstore, 0, mapsize);
 	map = (struct arm32_bus_dmamap *)mapstore;
 	map->_dm_size = size;
 	map->_dm_segcnt = nsegments;
 	map->_dm_maxmaxsegsz = maxsegsz;
 	map->_dm_boundary = boundary;
 	map->_dm_flags = flags & ~(BUS_DMA_WAITOK|BUS_DMA_NOWAIT);
 	map->_dm_origbuf = NULL;
-	map->_dm_buftype = ARM32_BUFTYPE_INVALID;
+	map->_dm_buftype = _BUS_DMA_BUFTYPE_INVALID;
 	map->_dm_vmspace = vmspace_kernel();
 	map->_dm_cookie = NULL;
 	map->dm_maxsegsz = maxsegsz;
 	map->dm_mapsize = 0;		/* no valid mappings */
 	map->dm_nsegs = 0;
 	*dmamp = map;
 #ifdef _ARM32_NEED_BUS_DMA_BOUNCE
 	struct arm32_bus_dma_cookie *cookie;
 	int cookieflags;
 	void *cookiestore;
 	size_t cookiesize;
 	int error;
 	cookieflags = 0;
 	if (t->_may_bounce != NULL) {
 		error = (*t->_may_bounce)(t, map, flags, &cookieflags);
 		if (error != 0)
 			goto out;
+	}
 	if (t->_ranges != NULL)
 		cookieflags |= _BUS_DMA_MIGHT_NEED_BOUNCE;
 	if ((cookieflags & _BUS_DMA_MIGHT_NEED_BOUNCE) == 0) {
 		STAT_INCR(creates);
 		return 0;
+	}
 	cookiesize = sizeof(struct arm32_bus_dma_cookie) +
 	    (sizeof(bus_dma_segment_t) * map->_dm_segcnt);
 	/*
 	 * Allocate our cookie.
 	 */
 	if ((cookiestore = malloc(cookiesize, M_DMAMAP, mallocflags)) == NULL) {
 		error = ENOMEM;
 		goto out;
+	}
 	cookie = (struct arm32_bus_dma_cookie *)cookiestore;
 	cookie->id_flags = cookieflags;
 	map->_dm_cookie = cookie;
 	STAT_INCR(bounced_creates);
 	error = _bus_dma_alloc_bouncebuf(t, map, size, flags);
  out:
 	if (error)
 		_bus_dmamap_destroy(t, map);
 #else
 	STAT_INCR(creates);
 #endif /* _ARM32_NEED_BUS_DMA_BOUNCE */
 #ifdef DEBUG_DMA
 	printf("dmamap_create:map=%p\n", map);
 #endif	/* DEBUG_DMA */
 	return (0);
+}
 /*
  * Common function for DMA map destruction.  May be called by bus-specific
  * DMA map destruction functions.
  */
 void
 _bus_dmamap_destroy(bus_dma_tag_t t, bus_dmamap_t map)
+{
 #ifdef DEBUG_DMA
 	printf("dmamap_destroy: t=%p map=%p\n", t, map);
 #endif	/* DEBUG_DMA */
 #ifdef _ARM32_NEED_BUS_DMA_BOUNCE
 	struct arm32_bus_dma_cookie *cookie = map->_dm_cookie;
 	/*
-	 * Explicit unload.
+	 * Free any bounce pages this map might hold.
 	 */
-	map->dm_maxsegsz = map->_dm_maxmaxsegsz;
+	if (cookie != NULL) {
-	map->dm_mapsize = 0;
+		if (cookie->id_flags & _BUS_DMA_IS_BOUNCING)
-	map->dm_nsegs = 0;
+			STAT_INCR(bounced_unloads);
-	map->_dm_origbuf = NULL;
+		map->dm_nsegs = 0;
-	map->_dm_buftype = ARM32_BUFTYPE_INVALID;
+		if (cookie->id_flags & _BUS_DMA_HAS_BOUNCE)
-	map->_dm_vmspace = NULL;
+			_bus_dma_free_bouncebuf(t, map);
 		STAT_INCR(bounced_destroys);
 		free(cookie, M_DMAMAP);
 	} else
 #endif
 	STAT_INCR(destroys);
 	if (map->dm_nsegs > 0)
 		STAT_INCR(unloads);
 	free(map, M_DMAMAP);
+}
 /*
  * Common function for loading a DMA map with a linear buffer.  May
  * be called by bus-specific DMA map load functions.
  */
 int
 _bus_dmamap_load(bus_dma_tag_t t, bus_dmamap_t map, void *buf,
     bus_size_t buflen, struct proc *p, int flags)
+{
 	int error;
 	struct vmspace *vm;
 	int error;
 #ifdef DEBUG_DMA
 	printf("dmamap_load: t=%p map=%p buf=%p len=%lx p=%p f=%d\n",
 	    t, map, buf, buflen, p, flags);
 #endif	/* DEBUG_DMA */
 	if (map->dm_nsegs > 0) {
 #ifdef _ARM32_NEED_BUS_DMA_BOUNCE
 		struct arm32_bus_dma_cookie *cookie = map->_dm_cookie;
 		if (cookie != NULL) {
 			if (cookie->id_flags & _BUS_DMA_IS_BOUNCING) {
 				STAT_INCR(bounced_unloads);
 				cookie->id_flags &= ~_BUS_DMA_IS_BOUNCING;
+			}
 		} else
 #endif
 		STAT_INCR(unloads);
+	}
 	/*
 	 * Make sure that on error condition we return "no valid mappings".
 	 */
 	map->dm_mapsize = 0;
 	map->dm_nsegs = 0;
 	map->_dm_buftype = _BUS_DMA_BUFTYPE_INVALID;
 	KASSERT(map->dm_maxsegsz <= map->_dm_maxmaxsegsz);
 	if (buflen > map->_dm_size)
 		return (EINVAL);
 	if (p != NULL) {
 		vm = p->p_vmspace;
 	} else {
 		vm = vmspace_kernel();
+	}
 	/* _bus_dmamap_load_buffer() clears this if we're not... */
-	map->_dm_flags |= ARM32_DMAMAP_COHERENT;
+	map->_dm_flags |= _BUS_DMAMAP_COHERENT;
 	error = _bus_dmamap_load_buffer(t, map, buf, buflen, vm, flags);
 	if (error == 0) {
 		map->dm_mapsize = buflen;
 		map->_dm_origbuf = buf;
 		map->_dm_buftype = ARM32_BUFTYPE_LINEAR;
 		map->_dm_vmspace = vm;
 		map->_dm_origbuf = buf;
 		map->_dm_buftype = _BUS_DMA_BUFTYPE_LINEAR;
 		return 0;
+	}
-#ifdef DEBUG_DMA
+#ifdef _ARM32_NEED_BUS_DMA_BOUNCE
-	printf("dmamap_load: error=%d\n", error);
+	struct arm32_bus_dma_cookie * const cookie = map->_dm_cookie;
-#endif	/* DEBUG_DMA */
+	if (cookie != NULL && (cookie->id_flags & _BUS_DMA_MIGHT_NEED_BOUNCE)) {
 		error = _bus_dma_load_bouncebuf(t, map, buf, buflen,
 		    _BUS_DMA_BUFTYPE_LINEAR, flags);
+	}
 #endif
 	return (error);
+}
 /*
  * Like _bus_dmamap_load(), but for mbufs.
  */
 int
 _bus_dmamap_load_mbuf(bus_dma_tag_t t, bus_dmamap_t map, struct mbuf *m0,
     int flags)
+{
 	int error;
 	struct mbuf *m;
 #ifdef DEBUG_DMA
 	printf("dmamap_load_mbuf: t=%p map=%p m0=%p f=%d\n",
 	    t, map, m0, flags);
 #endif	/* DEBUG_DMA */
 	if (map->dm_nsegs > 0) {
 #ifdef _ARM32_NEED_BUS_DMA_BOUNCE
 		struct arm32_bus_dma_cookie *cookie = map->_dm_cookie;
 		if (cookie != NULL) {
 			if (cookie->id_flags & _BUS_DMA_IS_BOUNCING) {
 				STAT_INCR(bounced_unloads);
 				cookie->id_flags &= ~_BUS_DMA_IS_BOUNCING;
+			}
 		} else
 #endif
 		STAT_INCR(unloads);
+	}
 	/*
 	 * Make sure that on error condition we return "no valid mappings."
 	 */
 	map->dm_mapsize = 0;
 	map->dm_nsegs = 0;
 	map->_dm_buftype = _BUS_DMA_BUFTYPE_INVALID;
 	KASSERT(map->dm_maxsegsz <= map->_dm_maxmaxsegsz);
 #ifdef DIAGNOSTIC
 	if ((m0->m_flags & M_PKTHDR) == 0)
 		panic("_bus_dmamap_load_mbuf: no packet header");
 #endif	/* DIAGNOSTIC */
 	if (m0->m_pkthdr.len > map->_dm_size)
 		return (EINVAL);
 	/*
 	 * Mbuf chains should almost never have coherent (i.e.
 	 * un-cached) mappings, so clear that flag now.
 	 */
-	map->_dm_flags &= ~ARM32_DMAMAP_COHERENT;
+	map->_dm_flags &= ~_BUS_DMAMAP_COHERENT;
 	error = 0;
 	for (m = m0; m != NULL && error == 0; m = m->m_next) {
 		int offset;
 		int remainbytes;
 		const struct vm_page * const *pgs;
 		paddr_t paddr;
 		int size;
 		if (m->m_len == 0)
 			continue;
 		/*
 		 * Don't allow reads in read-only mbufs.
 @@ -387,78 +563,83 @@ _bus_dmamap_load_mbuf(bus_dma_tag_t t, b
 			    (m->m_data - M_BUFADDR(m));
 			size = m->m_len;
 			error = _bus_dmamap_load_paddr(t, map, paddr, size);
 			break;
 		default:
 			error = _bus_dmamap_load_buffer(t, map, m->m_data,
 			    m->m_len, vmspace_kernel(), flags);
+		}
+	}
 	if (error == 0) {
 		map->dm_mapsize = m0->m_pkthdr.len;
 		map->_dm_origbuf = m0;
-		map->_dm_buftype = ARM32_BUFTYPE_MBUF;
+		map->_dm_buftype = _BUS_DMA_BUFTYPE_MBUF;
 		map->_dm_vmspace = vmspace_kernel();	/* always kernel */
 		return 0;
+	}
-#ifdef DEBUG_DMA
+#ifdef _ARM32_NEED_BUS_DMA_BOUNCE
-	printf("dmamap_load_mbuf: error=%d\n", error);
+	struct arm32_bus_dma_cookie * const cookie = map->_dm_cookie;
-#endif	/* DEBUG_DMA */
+	if (cookie != NULL && (cookie->id_flags & _BUS_DMA_MIGHT_NEED_BOUNCE)) {
 		error = _bus_dma_load_bouncebuf(t, map, m0, m0->m_pkthdr.len,
 		    _BUS_DMA_BUFTYPE_MBUF, flags);
+	}
 #endif
 	return (error);
+}
 /*
  * Like _bus_dmamap_load(), but for uios.
  */
 int
 _bus_dmamap_load_uio(bus_dma_tag_t t, bus_dmamap_t map, struct uio *uio,
     int flags)
+{
 	int i, error;
 	bus_size_t minlen, resid;
 	struct iovec *iov;
 	void *addr;
 	/*
 	 * Make sure that on error condition we return "no valid mappings."
 	 */
 	map->dm_mapsize = 0;
 	map->dm_nsegs = 0;
 	KASSERT(map->dm_maxsegsz <= map->_dm_maxmaxsegsz);
 	resid = uio->uio_resid;
 	iov = uio->uio_iov;
 	/* _bus_dmamap_load_buffer() clears this if we're not... */
-	map->_dm_flags |= ARM32_DMAMAP_COHERENT;
+	map->_dm_flags |= _BUS_DMAMAP_COHERENT;
 	error = 0;
 	for (i = 0; i < uio->uio_iovcnt && resid != 0 && error == 0; i++) {
 		/*
 		 * Now at the first iovec to load.  Load each iovec
 		 * until we have exhausted the residual count.
 		 */
 		minlen = resid < iov[i].iov_len ? resid : iov[i].iov_len;
 		addr = (void *)iov[i].iov_base;
 		error = _bus_dmamap_load_buffer(t, map, addr, minlen,
 		    uio->uio_vmspace, flags);
 		resid -= minlen;
+	}
 	if (error == 0) {
 		map->dm_mapsize = uio->uio_resid;
 		map->_dm_origbuf = uio;
-		map->_dm_buftype = ARM32_BUFTYPE_UIO;
+		map->_dm_buftype = _BUS_DMA_BUFTYPE_UIO;
 		map->_dm_vmspace = uio->uio_vmspace;
+	}
 	return (error);
+}
 /*
  * Like _bus_dmamap_load(), but for raw memory allocated with
  * bus_dmamem_alloc().
  */
 int
 _bus_dmamap_load_raw(bus_dma_tag_t t, bus_dmamap_t map,
     bus_dma_segment_t *segs, int nsegs, bus_size_t size, int flags)
+{
 @@ -475,27 +656,27 @@ _bus_dmamap_unload(bus_dma_tag_t t, bus_
+{
 #ifdef DEBUG_DMA
 	printf("dmamap_unload: t=%p map=%p\n", t, map);
 #endif	/* DEBUG_DMA */
 	/*
 	 * No resources to free; just mark the mappings as
 	 * invalid.
 	 */
 	map->dm_mapsize = 0;
 	map->dm_nsegs = 0;
 	map->_dm_origbuf = NULL;
-	map->_dm_buftype = ARM32_BUFTYPE_INVALID;
+	map->_dm_buftype = _BUS_DMA_BUFTYPE_INVALID;
 	map->_dm_vmspace = NULL;
+}
 static void
 _bus_dmamap_sync_segment(vaddr_t va, paddr_t pa, vsize_t len, int ops, bool readonly_p)
+{
 	KASSERT((va & PAGE_MASK) == (pa & PAGE_MASK));
 	switch (ops) {
 	case BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE:
 		if (!readonly_p) {
 			cpu_dcache_wbinv_range(va, len);
 			cpu_sdcache_wbinv_range(va, pa, len);
 @@ -530,28 +711,37 @@ _bus_dmamap_sync_segment(vaddr_t va, pad
+	}
 	case BUS_DMASYNC_PREWRITE:
 		cpu_dcache_wb_range(va, len);
 		cpu_sdcache_wb_range(va, pa, len);
 		break;
+	}
+}
 static inline void
 _bus_dmamap_sync_linear(bus_dma_tag_t t, bus_dmamap_t map, bus_addr_t offset,
     bus_size_t len, int ops)
+{
 #ifdef _ARM32_NEED_BUS_DMA_BOUNCE
 	struct arm32_bus_dma_cookie * const cookie = map->_dm_cookie;
 	bool bouncing = (cookie != NULL && (cookie->id_flags & _BUS_DMA_IS_BOUNCING));
 #endif
 	bus_dma_segment_t *ds = map->dm_segs;
 	vaddr_t va = (vaddr_t) map->_dm_origbuf;
 #ifdef _ARM32_NEED_BUS_DMA_BOUNCE
 	if (bouncing) {
 		va = (vaddr_t) cookie->id_bouncebuf;
+	}
 #endif
 	while (len > 0) {
 		while (offset >= ds->ds_len) {
 			offset -= ds->ds_len;
 			va += ds->ds_len;
 			ds++;
+		}
 		paddr_t pa = ds->ds_addr + offset;
 		size_t seglen = min(len, ds->ds_len - offset);
 		_bus_dmamap_sync_segment(va + offset, pa, seglen, ops, false);
 @@ -658,26 +848,27 @@ _bus_dmamap_sync_uio(bus_dma_tag_t t, bu
+ *
  * This version works for the Virtually Indexed Virtually Tagged
  * cache found on 32-bit ARM processors.
+ *
  * XXX Should have separate versions for write-through vs.
  * XXX write-back caches.  We currently assume write-back
  * XXX here, which is not as efficient as it could be for
  * XXX the write-through case.
  */
 void
 _bus_dmamap_sync(bus_dma_tag_t t, bus_dmamap_t map, bus_addr_t offset,
     bus_size_t len, int ops)
+{
 	bool bouncing = false;
 #ifdef DEBUG_DMA
 	printf("dmamap_sync: t=%p map=%p offset=%lx len=%lx ops=%x\n",
 	    t, map, offset, len, ops);
 #endif	/* DEBUG_DMA */
 	/*
 	 * Mixing of PRE and POST operations is not allowed.
 	 */
 	if ((ops & (BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE)) != 0 &&
 	    (ops & (BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE)) != 0)
 		panic("_bus_dmamap_sync: mix PRE and POST");
 @@ -694,75 +885,168 @@ _bus_dmamap_sync(bus_dma_tag_t t, bus_dm
 	 * to do the following things:
+	 *
 	 *	PREREAD -- Invalidate the D-cache.  We do this
 	 *	here in case a write-back is required by the back-end.
+	 *
 	 *	PREWRITE -- Write-back the D-cache.  Note that if
 	 *	we are doing a PREREAD|PREWRITE, we can collapse
 	 *	the whole thing into a single Wb-Inv.
+	 *
 	 *	POSTREAD -- Nothing.
+	 *
 	 *	POSTWRITE -- Nothing.
 	 */
 #ifdef _ARM32_NEED_BUS_DMA_BOUNCE
 	struct arm32_bus_dma_cookie * const cookie = map->_dm_cookie;
 	bouncing = (cookie != NULL && (cookie->id_flags & _BUS_DMA_IS_BOUNCING));
 #endif
-	ops &= (BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE);
+	const int pre_ops = ops & (BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE);
-	if (ops == 0)
+	if (!bouncing && pre_ops == 0)
 		return;
 #ifdef _ARM32_NEED_BUS_DMA_BOUNCE
 	if (bouncing && (ops & BUS_DMASYNC_PREWRITE)) {
 		STAT_INCR(write_bounces);
 		char * const dataptr = (char *)cookie->id_bouncebuf + offset;
 		/*
 		 * Copy the caller's buffer to the bounce buffer.
 		 */
 		switch (map->_dm_buftype) {
 		case _BUS_DMA_BUFTYPE_LINEAR:
 			memcpy(dataptr, cookie->id_origlinearbuf + offset, len);
 			break;
 		case _BUS_DMA_BUFTYPE_MBUF:
 			m_copydata(cookie->id_origmbuf, offset, len, dataptr);
 			break;
 		case _BUS_DMA_BUFTYPE_UIO:
 			_bus_dma_uiomove(dataptr, cookie->id_origuio, len, UIO_WRITE);
 			break;
 #ifdef DIAGNOSTIC
 		case _BUS_DMA_BUFTYPE_RAW:
 			panic("_bus_dmamap_sync(pre): _BUS_DMA_BUFTYPE_RAW");
 			break;
 		case _BUS_DMA_BUFTYPE_INVALID:
 			panic("_bus_dmamap_sync(pre): _BUS_DMA_BUFTYPE_INVALID");
 			break;
 		default:
 			panic("_bus_dmamap_sync(pre): map %p: unknown buffer type %d\n",
 			    map, map->_dm_buftype);
 			break;
 #endif /* DIAGNOSTIC */
+		}
+	}
 #endif /* _ARM32_NEED_BUS_DMA_BOUNCE */
 	/* Skip cache frobbing if mapping was COHERENT. */
-	if (map->_dm_flags & ARM32_DMAMAP_COHERENT) {
+	if (!bouncing && (map->_dm_flags & _BUS_DMAMAP_COHERENT)) {
 		/* Drain the write buffer. */
 		cpu_drain_writebuf();
 		return;
+	}
 #ifdef _ARM32_NEED_BUS_DMA_BOUNCE
 	if (bouncing && ((map->_dm_flags & _BUS_DMAMAP_COHERENT) || pre_ops == 0)) {
 		goto bounce_it;
+	}
 #endif /* _ARM32_NEED_BUS_DMA_BOUNCE */
 	/*
 	 * If the mapping belongs to a non-kernel vmspace, and the
 	 * vmspace has not been active since the last time a full
 	 * cache flush was performed, we don't need to do anything.
 	 */
 	if (__predict_false(!VMSPACE_IS_KERNEL_P(map->_dm_vmspace) &&
 	    vm_map_pmap(&map->_dm_vmspace->vm_map)->pm_cstate.cs_cache_d == 0))
 		return;
-	switch (map->_dm_buftype) {
+	int buftype = map->_dm_buftype;
-	case ARM32_BUFTYPE_LINEAR:
+#ifdef _ARM32_NEED_BUS_DMA_BOUNCE
 	if (bouncing) {
 		buftype = _BUS_DMA_BUFTYPE_LINEAR;
+	}
 #endif
 	switch (buftype) {
 	case _BUS_DMA_BUFTYPE_LINEAR:
 		_bus_dmamap_sync_linear(t, map, offset, len, ops);
 		break;
-	case ARM32_BUFTYPE_MBUF:
+	case _BUS_DMA_BUFTYPE_MBUF:
 		_bus_dmamap_sync_mbuf(t, map, offset, len, ops);
 		break;
-	case ARM32_BUFTYPE_UIO:
+	case _BUS_DMA_BUFTYPE_UIO:
 		_bus_dmamap_sync_uio(t, map, offset, len, ops);
 		break;
-	case ARM32_BUFTYPE_RAW:
+	case _BUS_DMA_BUFTYPE_RAW:
-		panic("_bus_dmamap_sync: ARM32_BUFTYPE_RAW");
+		panic("_bus_dmamap_sync: _BUS_DMA_BUFTYPE_RAW");
 		break;
-	case ARM32_BUFTYPE_INVALID:
+	case _BUS_DMA_BUFTYPE_INVALID:
-		panic("_bus_dmamap_sync: ARM32_BUFTYPE_INVALID");
+		panic("_bus_dmamap_sync: _BUS_DMA_BUFTYPE_INVALID");
 		break;
 	default:
-		printf("unknown buffer type %d\n", map->_dm_buftype);
+		panic("_bus_dmamap_sync: map %p: unknown buffer type %d\n",
-		panic("_bus_dmamap_sync");
+		    map, map->_dm_buftype);
+	}
 	/* Drain the write buffer. */
 	cpu_drain_writebuf();
 #ifdef _ARM32_NEED_BUS_DMA_BOUNCE
   bounce_it:
 	if ((ops & BUS_DMASYNC_POSTREAD) == 0
 	    || cookie == NULL
 	    || (cookie->id_flags & _BUS_DMA_IS_BOUNCING) == 0)
 		return;
 	char * const dataptr = (char *)cookie->id_bouncebuf + offset;
 	STAT_INCR(read_bounces);
 	/*
 	 * Copy the bounce buffer to the caller's buffer.
 	 */
 	switch (map->_dm_buftype) {
 	case _BUS_DMA_BUFTYPE_LINEAR:
 		memcpy(cookie->id_origlinearbuf + offset, dataptr, len);
 		break;
 	case _BUS_DMA_BUFTYPE_MBUF:
 		m_copyback(cookie->id_origmbuf, offset, len, dataptr);
 		break;
 	case _BUS_DMA_BUFTYPE_UIO:
 		_bus_dma_uiomove(dataptr, cookie->id_origuio, len, UIO_READ);
 		break;
 #ifdef DIAGNOSTIC
 	case _BUS_DMA_BUFTYPE_RAW:
 		panic("_bus_dmamap_sync(post): _BUS_DMA_BUFTYPE_RAW");
 		break;
 	case _BUS_DMA_BUFTYPE_INVALID:
 		panic("_bus_dmamap_sync(post): _BUS_DMA_BUFTYPE_INVALID");
 		break;
 	default:
 		panic("_bus_dmamap_sync(post): map %p: unknown buffer type %d\n",
 		    map, map->_dm_buftype);
 		break;
 #endif
+	}
 #endif /* _ARM32_NEED_BUS_DMA_BOUNCE */
+}
 /*
  * Common function for DMA-safe memory allocation.  May be called
  * by bus-specific DMA memory allocation functions.
  */
 extern paddr_t physical_start;
 extern paddr_t physical_end;
 int
 _bus_dmamem_alloc(bus_dma_tag_t t, bus_size_t size, bus_size_t alignment,
     bus_size_t boundary, bus_dma_segment_t *segs, int nsegs, int *rsegs,
 @@ -999,51 +1283,51 @@ _bus_dmamap_load_buffer(bus_dma_tag_t t,
 		if (__predict_true(pmap == pmap_kernel())) {
 			(void) pmap_get_pde_pte(pmap, vaddr, &pde, &ptep);
 			if (__predict_false(pmap_pde_section(pde))) {
 				paddr_t s_frame = L1_S_FRAME;
 				paddr_t s_offset = L1_S_OFFSET;
 #if (ARM_MMU_V6 + ARM_MMU_V7) > 0
 				if (__predict_false(pmap_pde_supersection(pde))) {
 					s_frame = L1_SS_FRAME;
 					s_frame = L1_SS_OFFSET;
+}
 #endif
 				curaddr = (*pde & s_frame) | (vaddr & s_offset);
 				if (*pde & L1_S_CACHE_MASK) {
-					map->_dm_flags &= ~ARM32_DMAMAP_COHERENT;
+					map->_dm_flags &= ~_BUS_DMAMAP_COHERENT;
+				}
 			} else {
 				pte = *ptep;
 				KDASSERT((pte & L2_TYPE_MASK) != L2_TYPE_INV);
 				if (__predict_false((pte & L2_TYPE_MASK)
 						    == L2_TYPE_L)) {
 					curaddr = (pte & L2_L_FRAME) |
 					    (vaddr & L2_L_OFFSET);
 					if (pte & L2_L_CACHE_MASK) {
 						map->_dm_flags &=
-						    ~ARM32_DMAMAP_COHERENT;
+						    ~_BUS_DMAMAP_COHERENT;
+					}
 				} else {
 					curaddr = (pte & L2_S_FRAME) |
 					    (vaddr & L2_S_OFFSET);
 					if (pte & L2_S_CACHE_MASK) {
 						map->_dm_flags &=
-						    ~ARM32_DMAMAP_COHERENT;
+						    ~_BUS_DMAMAP_COHERENT;
+					}
+				}
+			}
 		} else {
 			(void) pmap_extract(pmap, vaddr, &curaddr);
-			map->_dm_flags &= ~ARM32_DMAMAP_COHERENT;
+			map->_dm_flags &= ~_BUS_DMAMAP_COHERENT;
+		}
 		/*
 		 * Compute the segment size, and adjust counts.
 		 */
 		sgsize = PAGE_SIZE - ((u_long)vaddr & PGOFSET);
 		if (buflen < sgsize)
 			sgsize = buflen;
 		error = _bus_dmamap_load_paddr(t, map, curaddr, sgsize);
 		if (error)
 			return (error);
 @@ -1153,13 +1437,199 @@ arm32_dma_range_intersect(struct arm32_d
 			/*
 			 * End of region intersects with this range.
 			 */
 			*pap = trunc_page(dr->dr_sysbase);
 			*sizep = round_page(min((pa + size) - dr->dr_sysbase,
 			    dr->dr_len));
 			return (1);
+		}
+	}
 	/* No intersection found. */
 	return (0);
+}
 #ifdef _ARM32_NEED_BUS_DMA_BOUNCE
 static int
 _bus_dma_alloc_bouncebuf(bus_dma_tag_t t, bus_dmamap_t map,
     bus_size_t size, int flags)
+{
 	struct arm32_bus_dma_cookie *cookie = map->_dm_cookie;
 	int error = 0;
 #ifdef DIAGNOSTIC
 	if (cookie == NULL)
 		panic("_bus_dma_alloc_bouncebuf: no cookie");
 #endif
 	cookie->id_bouncebuflen = round_page(size);
 	error = _bus_dmamem_alloc(t, cookie->id_bouncebuflen,
 	    PAGE_SIZE, map->_dm_boundary, cookie->id_bouncesegs,
 	    map->_dm_segcnt, &cookie->id_nbouncesegs, flags);
 	if (error)
 		goto out;
 	error = _bus_dmamem_map(t, cookie->id_bouncesegs,
 	    cookie->id_nbouncesegs, cookie->id_bouncebuflen,
 	    (void **)&cookie->id_bouncebuf, flags);
  out:
 	if (error) {
 		_bus_dmamem_free(t, cookie->id_bouncesegs,
 		    cookie->id_nbouncesegs);
 		cookie->id_bouncebuflen = 0;
 		cookie->id_nbouncesegs = 0;
 	} else {
 		cookie->id_flags |= _BUS_DMA_HAS_BOUNCE;
+	}
 	return (error);
+}
 static void
 _bus_dma_free_bouncebuf(bus_dma_tag_t t, bus_dmamap_t map)
+{
 	struct arm32_bus_dma_cookie *cookie = map->_dm_cookie;
 #ifdef DIAGNOSTIC
 	if (cookie == NULL)
 		panic("_bus_dma_alloc_bouncebuf: no cookie");
 #endif
 	_bus_dmamem_unmap(t, cookie->id_bouncebuf, cookie->id_bouncebuflen);
 	_bus_dmamem_free(t, cookie->id_bouncesegs,
 	    cookie->id_nbouncesegs);
 	cookie->id_bouncebuflen = 0;
 	cookie->id_nbouncesegs = 0;
 	cookie->id_flags &= ~_BUS_DMA_HAS_BOUNCE;
+}
 /*
  * This function does the same as uiomove, but takes an explicit
  * direction, and does not update the uio structure.
  */
 static int
 _bus_dma_uiomove(void *buf, struct uio *uio, size_t n, int direction)
+{
 	struct iovec *iov;
 	int error;
 	struct vmspace *vm;
 	char *cp;
 	size_t resid, cnt;
 	int i;
 	iov = uio->uio_iov;
 	vm = uio->uio_vmspace;
 	cp = buf;
 	resid = n;
 	for (i = 0; i < uio->uio_iovcnt && resid > 0; i++) {
 		iov = &uio->uio_iov[i];
 		if (iov->iov_len == 0)
 			continue;
 		cnt = MIN(resid, iov->iov_len);
 		if (!VMSPACE_IS_KERNEL_P(vm) &&
 		    (curlwp->l_cpu->ci_schedstate.spc_flags & SPCF_SHOULDYIELD)
 		    != 0) {
 			preempt();
+		}
 		if (direction == UIO_READ) {
 			error = copyout_vmspace(vm, cp, iov->iov_base, cnt);
 		} else {
 			error = copyin_vmspace(vm, iov->iov_base, cp, cnt);
+		}
 		if (error)
 			return (error);
 		cp += cnt;
 		resid -= cnt;
+	}
 	return (0);
+}
 #endif /* _ARM32_NEED_BUS_DMA_BOUNCE */
 int
 _bus_dmatag_subregion(bus_dma_tag_t tag, bus_addr_t min_addr,
     bus_addr_t max_addr, bus_dma_tag_t *newtag, int flags)
+{
 #ifdef _ARM32_NEED_BUS_DMA_BOUNCE
 	struct arm32_dma_range *dr;
 	bool subset = false;
 	size_t nranges = 0;
 	size_t i;
 	for (i = 0, dr = tag->_ranges; i < tag->_nranges; i++, dr++) {
 		if (dr->dr_sysbase <= min_addr
 		    && max_addr <= dr->dr_sysbase + dr->dr_len - 1) {
 			subset = true;
+		}
 		if (min_addr <= dr->dr_sysbase + dr->dr_len
 		    && max_addr >= dr->dr_sysbase) {
 			nranges++;
+		}
+	}
 	if (subset) {
 		*newtag = tag;
 		/* if the tag must be freed, add a reference */
 		if (tag->_tag_needs_free)
 			(tag->_tag_needs_free)++;
 		return 0;
+	}
 	if (nranges == 0) {
 		nranges = 1;
+	}
 	size_t mallocsize = sizeof(*tag) + nranges * sizeof(*dr);
 	if ((*newtag = malloc(mallocsize, M_DMAMAP,
 	    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK)) == NULL)
 		return ENOMEM;
 	dr = (void *)(*newtag + 1);
 	**newtag = *tag;
 	(*newtag)->_tag_needs_free = 1;
 	(*newtag)->_ranges = dr;
 	(*newtag)->_nranges = nranges;
 	if (tag->_ranges == NULL) {
 		dr->dr_sysbase = min_addr;
 		dr->dr_busbase = min_addr;
 		dr->dr_len = max_addr + 1 - min_addr;
 	} else {
 		for (i = 0; i < nranges; i++) {
 			if (min_addr > dr->dr_sysbase + dr->dr_len
 			    || max_addr < dr->dr_sysbase)
 				continue;
 			dr[0] = tag->_ranges[i];
 			if (dr->dr_sysbase < min_addr) {
 				psize_t diff = min_addr - dr->dr_sysbase;
 				dr->dr_busbase += diff;
 				dr->dr_len -= diff;
 				dr->dr_sysbase += diff;
+			}
 			if (max_addr != 0xffffffff
 			    && max_addr + 1 < dr->dr_sysbase + dr->dr_len) {
 				dr->dr_len = max_addr + 1 - dr->dr_sysbase;
+			}
 			dr++;
+		}
+	}
 	return 0;
 #else
 	return EOPNOTSUPP;
 #endif /* _ARM32_NEED_BUS_DMA_BOUNCE */
+}
 void
 _bus_dmatag_destroy(bus_dma_tag_t tag)
+{
 #ifdef _ARM32_NEED_BUS_DMA_BOUNCE
 	switch (tag->_tag_needs_free) {
 	case 0:
 		break;				/* not allocated with malloc */
 	case 1:
 		free(tag, M_DMAMAP);		/* last reference to tag */
 		break;
 	default:
 		(tag->_tag_needs_free)--;	/* one less reference */
+	}
 #endif
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: at91_bus_dma.c,v 1.4 2011/07/01 19:31:16 dyoung Exp $ */
+/*	$NetBSD: at91_bus_dma.c,v 1.5 2012/09/18 05:47:27 matt Exp $ */
 /*
  * Copyright (c) 2004 Jesse Off
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -23,48 +23,31 @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * bus_dma tag for EP93xx CPUs
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91_bus_dma.c,v 1.4 2011/07/01 19:31:16 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91_bus_dma.c,v 1.5 2012/09/18 05:47:27 matt Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/extent.h>
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/bus.h>
 #include <arm/at91/at91var.h>
 struct arm32_bus_dma_tag at91_bd_tag = {
-	NULL,			/* _ranges: set by platform specific routine */
+	_BUS_DMAMAP_FUNCS,
-,			/* _nranges */
+	_BUS_DMAMEM_FUNCS,
 	_BUS_DMAMAP_FUNCS,
 	NULL,			/* _cookie */
 	_bus_dmamap_create,
 	_bus_dmamap_destroy,
 	_bus_dmamap_load,
 	_bus_dmamap_load_mbuf,
 	_bus_dmamap_load_uio,
 	_bus_dmamap_load_raw,
 	_bus_dmamap_unload,
 	_bus_dmamap_sync,
 	NULL,			/* sync_post */
 	_bus_dmamem_alloc,
 	_bus_dmamem_free,
 	_bus_dmamem_map,
 	_bus_dmamem_unmap,
 	_bus_dmamem_mmap,
 };

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bcm2835_dma.c,v 1.1 2012/07/26 06:21:57 skrll Exp $	*/
+/*	$NetBSD: bcm2835_dma.c,v 1.2 2012/09/18 05:47:27 matt Exp $	*/
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Nick Hudson
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,42 +20,25 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_dma.c,v 1.1 2012/07/26 06:21:57 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_dma.c,v 1.2 2012/09/18 05:47:27 matt Exp $");
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
 #include <sys/bus.h>
 struct arm32_bus_dma_tag bcm2835_bus_dma_tag = {
-	NULL,			/* _ranges: set by platform specific routine */
+	_BUS_DMAMAP_FUNCS,
-,			/* _nranges */
+	_BUS_DMAMEM_FUNCS,
 	_BUS_DMATAG_FUNCS,
 	NULL,			/* _cookie */
 	_bus_dmamap_create,
 	_bus_dmamap_destroy,
 	_bus_dmamap_load,
 	_bus_dmamap_load_mbuf,
 	_bus_dmamap_load_uio,
 	_bus_dmamap_load_raw,
 	_bus_dmamap_unload,
 	_bus_dmamap_sync,
 	NULL,			/* sync_post */
 	_bus_dmamem_alloc,
 	_bus_dmamem_free,
 	_bus_dmamem_map,
 	_bus_dmamem_unmap,
 	_bus_dmamem_mmap,
 };

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bcm53xx_board.c,v 1.2 2012/09/07 11:52:30 matt Exp $	*/
+/*	$NetBSD: bcm53xx_board.c,v 1.3 2012/09/18 05:47:27 matt Exp $	*/
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas of 3am Software Foundry.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -24,27 +24,27 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "opt_broadcom.h"
 #define	_ARM32_BUS_DMA_PRIVATE
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_board.c,v 1.2 2012/09/07 11:52:30 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_board.c,v 1.3 2012/09/18 05:47:27 matt Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <prop/proplib.h>
 #define CRU_PRIVATE
 #define DDR_PRIVATE
 #define DMU_PRIVATE
 #define ARMCORE_PRIVATE
 @@ -54,40 +54,29 @@ __KERNEL_RCSID(1, "$NetBSD: bcm53xx_boar
 #include <arm/broadcom/bcm53xx_reg.h>
 #include <arm/broadcom/bcm53xx_var.h>
 bus_space_tag_t bcm53xx_ioreg_bst = &bcmgen_bs_tag;
 bus_space_handle_t bcm53xx_ioreg_bsh;
 bus_space_tag_t bcm53xx_armcore_bst = &bcmgen_bs_tag;
 bus_space_handle_t bcm53xx_armcore_bsh;
 static struct cpu_softc cpu_softc;
 static struct bcm53xx_clock_info clk_info;
 struct arm32_bus_dma_tag bcm53xx_dma_tag = {
-	._dmamap_create = _bus_dmamap_create,
+	_BUS_DMAMAP_FUNCS,
-	._dmamap_destroy = _bus_dmamap_destroy,
+	_BUS_DMAMEM_FUNCS,
-	._dmamap_load = _bus_dmamap_load,
+	_BUS_DMATAG_FUNCS,
 	._dmamap_load_mbuf = _bus_dmamap_load_mbuf,
 	._dmamap_load_uio = _bus_dmamap_load_uio,
 	._dmamap_load_raw = _bus_dmamap_load_raw,
 	._dmamap_unload = _bus_dmamap_unload,
 	._dmamap_sync_pre = _bus_dmamap_sync,
 	._dmamap_sync_post = NULL,
 	._dmamem_alloc = _bus_dmamem_alloc,
 	._dmamem_free = _bus_dmamem_free,
 	._dmamem_map = _bus_dmamem_map,
 	._dmamem_unmap = _bus_dmamem_unmap,
 	._dmamem_mmap = _bus_dmamem_mmap
 };
 #ifdef BCM53XX_CONSOLE_EARLY
 #include <dev/ic/ns16550reg.h>
 #include <dev/ic/comreg.h>
 #include <dev/cons.h>
 static vaddr_t com_base;
 static inline uint32_t
 uart_read(bus_size_t o)
+{
 	return *(volatile uint8_t *)(com_base + o);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ep93xx_busdma.c,v 1.4 2011/07/01 19:31:17 dyoung Exp $ */
+/*	$NetBSD: ep93xx_busdma.c,v 1.5 2012/09/18 05:47:27 matt Exp $ */
 /*
  * Copyright (c) 2004 Jesse Off
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -23,48 +23,31 @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * bus_dma tag for EP93xx CPUs
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ep93xx_busdma.c,v 1.4 2011/07/01 19:31:17 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ep93xx_busdma.c,v 1.5 2012/09/18 05:47:27 matt Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/extent.h>
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/bus.h>
 #include <arm/ep93xx/ep93xxvar.h>
 struct arm32_bus_dma_tag ep93xx_bus_dma = {
-	NULL,			/* _ranges: set by platform specific routine */
+	_BUS_DMAMAP_FUNCS,
-,			/* _nranges */
+	_BUS_DMAMEM_FUNCS,
 	_BUS_DMATAG_FUNCS,
 	NULL,			/* _cookie */
 	_bus_dmamap_create,
 	_bus_dmamap_destroy,
 	_bus_dmamap_load,
 	_bus_dmamap_load_mbuf,
 	_bus_dmamap_load_uio,
 	_bus_dmamap_load_raw,
 	_bus_dmamap_unload,
 	_bus_dmamap_sync,
 	NULL,			/* sync_post */
 	_bus_dmamem_alloc,
 	_bus_dmamem_free,
 	_bus_dmamem_map,
 	_bus_dmamem_unmap,
 	_bus_dmamem_mmap,
 };

 @@ -1,14 +1,14 @@
-/*	$NetBSD: footbridge_pci.c,v 1.22 2012/02/12 16:34:07 matt Exp $	*/
+/*	$NetBSD: footbridge_pci.c,v 1.23 2012/09/18 05:47:27 matt Exp $	*/
 /*
  * Copyright (c) 1997,1998 Mark Brinicombe.
  * Copyright (c) 1997,1998 Causality Limited
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -25,27 +25,27 @@
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: footbridge_pci.c,v 1.22 2012/02/12 16:34:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: footbridge_pci.c,v 1.23 2012/09/18 05:47:27 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/bus.h>
 #include <machine/intr.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 @@ -92,43 +92,31 @@ struct arm32_pci_chipset footbridge_pci_
 	footbridge_pci_intr_string,
 	footbridge_pci_intr_evcnt,
 	footbridge_pci_intr_establish,
 	footbridge_pci_intr_disestablish
 };
 struct arm32_dma_range footbridge_dma_ranges[1];
 /*
  * PCI doesn't have any special needs; just use the generic versions
  * of these functions.
  */
 struct arm32_bus_dma_tag footbridge_pci_bus_dma_tag = {
-	footbridge_dma_ranges,
+	._ranges = footbridge_dma_ranges,
-,
+	._nranges = 1,
-	NULL,
+	_BUS_DMAMAP_FUNCS,
-	_bus_dmamap_create,
+	_BUS_DMAMEM_FUNCS,
-	_bus_dmamap_destroy,
+	_BUS_DMATAG_FUNCS,
 	_bus_dmamap_load,
 	_bus_dmamap_load_mbuf,
 	_bus_dmamap_load_uio,
 	_bus_dmamap_load_raw,
 	_bus_dmamap_unload,
 	_bus_dmamap_sync,	/* pre */
 	NULL,			/* post */
 	_bus_dmamem_alloc,
 	_bus_dmamem_free,
 	_bus_dmamem_map,
 	_bus_dmamem_unmap,
 	_bus_dmamem_mmap,
 };
 /*
  * Currently we only support 12 devices as we select directly in the
  * type 0 config cycle
  * (See conf_{read,write} for more detail
  */
 #define MAX_PCI_DEVICES	21
 /*static int
 pci_intr(void *arg)
+{
 	printf("pci int %x\n", (int)arg);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: gemini_dma.c,v 1.2 2011/07/01 19:32:28 dyoung Exp $	*/
+/*	$NetBSD: gemini_dma.c,v 1.3 2012/09/18 05:47:27 matt Exp $	*/
 /* adapted from:
  *	NetBSD: pxa2x0_dma.c,v 1.4 2005/12/11 12:16:51 christos Exp
  */
 /*
  * Copyright (c) 2002  Genetec Corporation.  All rights reserved.
  * Written by Hiroyuki Bessho for Genetec Corporation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -33,46 +33,32 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * bus dma tag for PXA2[15]0 processor.
  * (Currently used only for LCD frame buffer)
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_dma.c,v 1.2 2011/07/01 19:32:28 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_dma.c,v 1.3 2012/09/18 05:47:27 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <uvm/uvm_extern.h>
 #define	_ARM32_BUS_DMA_PRIVATE
 #include <sys/bus.h>
 struct arm32_bus_dma_tag gemini_bus_dma_tag = {
-,
+	_BUS_DMAMAP_FUNCS,
-,
+	_BUS_DMAMEM_FUNCS,
-	NULL,			/* _cookie */
+	_BUS_DMATAG_FUNCS,
 	_bus_dmamap_create,
 	_bus_dmamap_destroy,
 	_bus_dmamap_load,
 	_bus_dmamap_load_mbuf,
 	_bus_dmamap_load_uio,
 	_bus_dmamap_load_raw,
 	_bus_dmamap_unload,
 	_bus_dmamap_sync,
 	NULL,			/* sync_post */
 	_bus_dmamem_alloc,
 	_bus_dmamem_free,
 	_bus_dmamem_map,
 	_bus_dmamem_unmap,
 	_bus_dmamem_mmap
 };

 @@ -1,14 +1,14 @@
-/*	$NetBSD: imx_dma.c,v 1.2 2011/07/01 20:27:50 dyoung Exp $ */
+/*	$NetBSD: imx_dma.c,v 1.3 2012/09/18 05:47:27 matt Exp $ */
 /*
  * Copyright (c) 2009  Genetec Corporation.  All rights reserved.
  * Written by Hashimoto Kenichi for Genetec Corporation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -22,46 +22,32 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * bus dma tag for i.MX31 processor.
  * (Currently used only for LCD frame buffer)
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx_dma.c,v 1.2 2011/07/01 20:27:50 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx_dma.c,v 1.3 2012/09/18 05:47:27 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <uvm/uvm_extern.h>
 #define	_ARM32_BUS_DMA_PRIVATE
 #include <sys/bus.h>
 struct arm32_bus_dma_tag imx_bus_dma_tag = {
-,
+	_BUS_DMAMAP_FUNCS,
-,
+	_BUS_DMAMEM_FUNCS,
-	NULL,			/* _cookie */
+	_BUS_DMATAG_FUNCS,
 	_bus_dmamap_create,
 	_bus_dmamap_destroy,
 	_bus_dmamap_load,
 	_bus_dmamap_load_mbuf,
 	_bus_dmamap_load_uio,
 	_bus_dmamap_load_raw,
 	_bus_dmamap_unload,
 	_bus_dmamap_sync,
 	NULL,			/* sync_post */
 	_bus_dmamem_alloc,
 	_bus_dmamem_free,
 	_bus_dmamem_map,
 	_bus_dmamem_unmap,
 	_bus_dmamem_mmap
 };

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus_defs.h,v 1.1 2011/07/01 17:09:58 dyoung Exp $	*/
+/*	$NetBSD: bus_defs.h,v 1.2 2012/09/18 05:47:27 matt Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -289,27 +289,27 @@ struct bus_space {
 #define	BUS_DMA_COHERENT	0x004	/* hint: map memory DMA coherent */
 #define	BUS_DMA_STREAMING	0x008	/* hint: sequential, unidirectional */
 #define	BUS_DMA_BUS1		0x010	/* placeholders for bus functions... */
 #define	BUS_DMA_BUS2		0x020
 #define	BUS_DMA_BUS3		0x040
 #define	BUS_DMA_BUS4		0x080
 #define	BUS_DMA_READ		0x100	/* mapping is device -> memory only */
 #define	BUS_DMA_WRITE		0x200	/* mapping is memory -> device only */
 #define	BUS_DMA_NOCACHE		0x400	/* hint: map non-cached memory */
 /*
  * Private flags stored in the DMA map.
  */
-#define	ARM32_DMAMAP_COHERENT	0x10000	/* no cache flush necessary on sync */
+#define	_BUS_DMAMAP_COHERENT	0x10000	/* no cache flush necessary on sync */
 /* Forwards needed by prototypes below. */
 struct mbuf;
 struct uio;
 /*
  * Operations performed by bus_dmamap_sync().
  */
 #define	BUS_DMASYNC_PREREAD	0x01	/* pre-read synchronization */
 #define	BUS_DMASYNC_POSTREAD	0x02	/* post-read synchronization */
 #define	BUS_DMASYNC_PREWRITE	0x04	/* pre-write synchronization */
 #define	BUS_DMASYNC_POSTWRITE	0x08	/* post-write synchronization */
 @@ -388,26 +388,39 @@ struct arm32_bus_dma_tag {
 	/*
 	 * DMA memory utility functions.
 	 */
 	int	(*_dmamem_alloc)(bus_dma_tag_t, bus_size_t, bus_size_t,
 		    bus_size_t, bus_dma_segment_t *, int, int *, int);
 	void	(*_dmamem_free)(bus_dma_tag_t,
 		    bus_dma_segment_t *, int);
 	int	(*_dmamem_map)(bus_dma_tag_t, bus_dma_segment_t *,
 		    int, size_t, void **, int);
 	void	(*_dmamem_unmap)(bus_dma_tag_t, void *, size_t);
 	paddr_t	(*_dmamem_mmap)(bus_dma_tag_t, bus_dma_segment_t *,
 		    int, off_t, int, int);
 	/*
 	 * DMA tag utility functions
 	 */
 	int	(*_dmatag_subregion)(bus_dma_tag_t, bus_addr_t, bus_addr_t,
 		     bus_dma_tag_t *, int);
 	void	(*_dmatag_destroy)(bus_dma_tag_t);
 	/*
 	 * State for bounce buffers
 	 */
 	int	_tag_needs_free;
 	int	(*_may_bounce)(bus_dma_tag_t, bus_dmamap_t, int, int *);
 };
 /*
  *	bus_dmamap_t
+ *
  *	Describes a DMA mapping.
  */
 struct arm32_bus_dmamap {
 	/*
 	 * PRIVATE MEMBERS: not for use by machine-independent code.
 	 */
 	bus_size_t	_dm_size;	/* largest DMA transfer mappable */
 	int		_dm_segcnt;	/* number of segs this map can map */
 @@ -420,25 +433,61 @@ struct arm32_bus_dmamap {
 	struct vmspace	*_dm_vmspace;	/* vmspace that owns the mapping */
 	void		*_dm_cookie;	/* cookie for bus-specific functions */
 	/*
 	 * PUBLIC MEMBERS: these are used by machine-independent code.
 	 */
 	bus_size_t	dm_maxsegsz;	/* largest possible segment */
 	bus_size_t	dm_mapsize;	/* size of the mapping */
 	int		dm_nsegs;	/* # valid segments in mapping */
 	bus_dma_segment_t dm_segs[1];	/* segments; variable length */
 };
 /* _dm_buftype */
 #define	_BUS_DMA_BUFTYPE_INVALID	0
 #define	_BUS_DMA_BUFTYPE_LINEAR		1
 #define	_BUS_DMA_BUFTYPE_MBUF		2
 #define	_BUS_DMA_BUFTYPE_UIO		3
 #define	_BUS_DMA_BUFTYPE_RAW		4
 #ifdef _ARM32_BUS_DMA_PRIVATE
 #define	_BUS_AVAIL_END	physical_end
 /*
  * Cookie used for bounce buffers. A pointer to one of these it stashed in
  * the DMA map.
  */
 struct arm32_bus_dma_cookie {
 	int	id_flags;		/* flags; see below */
-/* _dm_buftype */
+	/*
-#define	ARM32_BUFTYPE_INVALID		0
+	 * Information about the original buffer used during
-#define	ARM32_BUFTYPE_LINEAR		1
+	 * DMA map syncs.  Note that origibuflen is only used
-#define	ARM32_BUFTYPE_MBUF		2
+	 * for ID_BUFTYPE_LINEAR.
-#define	ARM32_BUFTYPE_UIO		3
+	 */
-#define	ARM32_BUFTYPE_RAW		4
+	union {
 		void	*un_origbuf;		/* pointer to orig buffer if
 						   bouncing */
 		char	*un_linearbuf;
 		struct mbuf	*un_mbuf;
 		struct uio	*un_uio;
 	} id_origbuf_un;
 #define	id_origbuf		id_origbuf_un.un_origbuf
 #define	id_origlinearbuf	id_origbuf_un.un_linearbuf
 #define	id_origmbuf		id_origbuf_un.un_mbuf
 #define	id_origuio		id_origbuf_un.un_uio
 	bus_size_t id_origbuflen;	/* ...and size */
 	void	*id_bouncebuf;		/* pointer to the bounce buffer */
 	bus_size_t id_bouncebuflen;	/* ...and size */
 	int	id_nbouncesegs;		/* number of valid bounce segs */
 	bus_dma_segment_t id_bouncesegs[0]; /* array of bounce buffer
 					       physical memory segments */
 };
 /* id_flags */
 #define	_BUS_DMA_IS_BOUNCING		0x04	/* is bouncing current xfer */
 #define	_BUS_DMA_HAS_BOUNCE		0x02	/* has bounce buffers */
 #endif /* _ARM32_BUS_DMA_PRIVATE */
 #define	_BUS_DMA_MIGHT_NEED_BOUNCE	0x01	/* may need bounce buffers */
 #endif /* _ARM32_BUS_DEFS_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus_funcs.h,v 1.2 2012/07/15 20:44:20 matt Exp $	*/
+/*	$NetBSD: bus_funcs.h,v 1.3 2012/09/18 05:47:27 matt Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -596,55 +596,94 @@ do {									\
 } while (/*CONSTCOND*/0)
 #define	bus_dmamem_alloc(t, s, a, b, sg, n, r, f)		\
 	(*(t)->_dmamem_alloc)((t), (s), (a), (b), (sg), (n), (r), (f))
 #define	bus_dmamem_free(t, sg, n)				\
 	(*(t)->_dmamem_free)((t), (sg), (n))
 #define	bus_dmamem_map(t, sg, n, s, k, f)			\
 	(*(t)->_dmamem_map)((t), (sg), (n), (s), (k), (f))
 #define	bus_dmamem_unmap(t, k, s)				\
 	(*(t)->_dmamem_unmap)((t), (k), (s))
 #define	bus_dmamem_mmap(t, sg, n, o, p, f)			\
 	(*(t)->_dmamem_mmap)((t), (sg), (n), (o), (p), (f))
-#define bus_dmatag_subregion(t, mna, mxa, nt, f) EOPNOTSUPP
+#define	bus_dmatag_subregion(t, mna, mxa, nt, f)		\
-#define bus_dmatag_destroy(t)
+	(*(t)->_dmatag_subregion)((t), (mna), (mxa), (nt), (f))
 #define	bus_dmatag_destroy(t)					\
 	(*(t)->_dmatag_destroy)(t)
 #ifdef _ARM32_BUS_DMA_PRIVATE
 extern paddr_t physical_start, physical_end;
 int	arm32_dma_range_intersect(struct arm32_dma_range *, int,
 	    paddr_t pa, psize_t size, paddr_t *pap, psize_t *sizep);
 int	_bus_dmamap_create(bus_dma_tag_t, bus_size_t, int, bus_size_t,
 	    bus_size_t, int, bus_dmamap_t *);
 void	_bus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t);
 int	_bus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *,
 	    bus_size_t, struct proc *, int);
 int	_bus_dmamap_load_mbuf(bus_dma_tag_t, bus_dmamap_t,
 	    struct mbuf *, int);
 int	_bus_dmamap_load_uio(bus_dma_tag_t, bus_dmamap_t,
 	    struct uio *, int);
 int	_bus_dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t,
 	    bus_dma_segment_t *, int, bus_size_t, int);
 void	_bus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t);
 void	_bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
 	    bus_size_t, int);
 #ifdef _ARM32_NEED_BUS_DMA_BOUNCE
 #define	_BUS_DMAMAP_SYNC_FUNCS \
 	._dmamap_sync_pre = _bus_dmamap_sync,	\
 	._dmamap_sync_post = _bus_dmamap_sync
 #else
 #define	_BUS_DMAMAP_SYNC_FUNCS \
 	._dmamap_sync_pre = _bus_dmamap_sync
 #endif
 #define	_BUS_DMAMAP_FUNCS \
 	._dmamap_create = _bus_dmamap_create,		\
 	._dmamap_destroy = _bus_dmamap_destroy,		\
 	._dmamap_load = _bus_dmamap_load,		\
 	._dmamap_load_mbuf = _bus_dmamap_load_mbuf,	\
 	._dmamap_load_raw = _bus_dmamap_load_raw,	\
 	._dmamap_load_uio = _bus_dmamap_load_uio,	\
 	._dmamap_unload = _bus_dmamap_unload,		\
 	_BUS_DMAMAP_SYNC_FUNCS
 int	_bus_dmamem_alloc(bus_dma_tag_t tag, bus_size_t size,
 	    bus_size_t alignment, bus_size_t boundary,
 	    bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags);
 void	_bus_dmamem_free(bus_dma_tag_t tag, bus_dma_segment_t *segs,
 	    int nsegs);
 int	_bus_dmamem_map(bus_dma_tag_t tag, bus_dma_segment_t *segs,
 	    int nsegs, size_t size, void **kvap, int flags);
 void	_bus_dmamem_unmap(bus_dma_tag_t tag, void *kva,
 	    size_t size);
 paddr_t	_bus_dmamem_mmap(bus_dma_tag_t tag, bus_dma_segment_t *segs,
 	    int nsegs, off_t off, int prot, int flags);
 #define	_BUS_DMAMEM_FUNCS \
 	._dmamem_alloc = _bus_dmamem_alloc,	\
 	._dmamem_free = _bus_dmamem_free,	\
 	._dmamem_map = _bus_dmamem_map,		\
 	._dmamem_unmap = _bus_dmamem_unmap,	\
 	._dmamem_mmap = _bus_dmamem_mmap
 int	_bus_dmamem_alloc_range(bus_dma_tag_t tag, bus_size_t size,
 	    bus_size_t alignment, bus_size_t boundary,
 	    bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags,
 	    vaddr_t low, vaddr_t high);
 int	_bus_dmatag_subregion(bus_dma_tag_t, bus_addr_t, bus_addr_t,
 	    bus_dma_tag_t *, int);
 void 	_bus_dmatag_destroy(bus_dma_tag_t);
 #define	_BUS_DMATAG_FUNCS \
 	._dmatag_subregion = _bus_dmatag_subregion,	\
 	._dmatag_destroy = _bus_dmatag_destroy
 #endif /* _ARM32_BUS_DMA_PRIVATE */
 #endif /* _ARM32_BUS_FUNCS_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ixp12x0_pci_dma.c,v 1.8 2011/07/01 20:27:50 dyoung Exp $ */
+/*	$NetBSD: ixp12x0_pci_dma.c,v 1.9 2012/09/18 05:47:27 matt Exp $ */
 /*
  * Copyright (c) 2002, 2003
  *	Ichiro FUKUHARA <ichiro@ichiro.org>.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL ICHIRO FUKUHARA OR THE VOICES IN HIS HEAD BE LIABLE FOR
  * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0_pci_dma.c,v 1.8 2011/07/01 20:27:50 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_pci_dma.c,v 1.9 2012/09/18 05:47:27 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <uvm/uvm_extern.h>
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/bus.h>
 #include <arm/ixp12x0/ixp12x0_pcireg.h>
 @@ -64,14 +64,17 @@ ixp12x0_pci_dma_init(struct ixp12x0_soft
 	dmat->_dmamap_load = _bus_dmamap_load;
 	dmat->_dmamap_load_mbuf = _bus_dmamap_load_mbuf;
 	dmat->_dmamap_load_uio = _bus_dmamap_load_uio;
 	dmat->_dmamap_load_raw = _bus_dmamap_load_raw;
 	dmat->_dmamap_unload = _bus_dmamap_unload;
 	dmat->_dmamap_sync_pre = _bus_dmamap_sync;
 	dmat->_dmamap_sync_post = NULL;
 	dmat->_dmamem_alloc = _bus_dmamem_alloc;
 	dmat->_dmamem_free = _bus_dmamem_free;
 	dmat->_dmamem_map = _bus_dmamem_map;
 	dmat->_dmamem_unmap = _bus_dmamem_unmap;
 	dmat->_dmamem_mmap = _bus_dmamem_mmap;
 	dmat->_dmatag_subregion = _bus_dmatag_subregion;
 	dmat->_dmatag_destroy = _bus_dmatag_destroy;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mvsoc_dma.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $ */
+/*	$NetBSD: mvsoc_dma.c,v 1.3 2012/09/18 05:47:27 matt Exp $ */
 /*
  * Copyright (c) 2004 Jesse Off
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -26,49 +26,32 @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * bus_dma tag for MV88Fxx81 Orion
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsoc_dma.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsoc_dma.c,v 1.3 2012/09/18 05:47:27 matt Exp $");
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/extent.h>
 #include <sys/bus.h>
 #include <arm/marvell/mvsocvar.h>
 struct arm32_bus_dma_tag mvsoc_bus_dma_tag = {
-	NULL,			/* _ranges: set by platform specific routine */
+	_BUS_DMAMAP_FUNCS,
-,			/* _nranges */
+	_BUS_DMAMEM_FUNCS,
 	_BUS_DMATAG_FUNCS,
 	NULL,			/* _cookie */
 	_bus_dmamap_create,
 	_bus_dmamap_destroy,
 	_bus_dmamap_load,
 	_bus_dmamap_load_mbuf,
 	_bus_dmamap_load_uio,
 	_bus_dmamap_load_raw,
 	_bus_dmamap_unload,
 	_bus_dmamap_sync,
 	NULL,			/* sync_post */
 	_bus_dmamem_alloc,
 	_bus_dmamem_free,
 	_bus_dmamem_map,
 	_bus_dmamem_unmap,
 	_bus_dmamem_mmap,
 };

 @@ -1,14 +1,14 @@
-/*	$NetBSD: omap_dma.c,v 1.3 2011/07/01 20:30:21 dyoung Exp $	*/
+/*	$NetBSD: omap_dma.c,v 1.4 2012/09/18 05:47:28 matt Exp $	*/
 /*
  * Copyright (c) 2010 Michael Lorenz
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -16,46 +16,31 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_dma.c,v 1.3 2011/07/01 20:30:21 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_dma.c,v 1.4 2012/09/18 05:47:28 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <uvm/uvm_extern.h>
 #define	_ARM32_BUS_DMA_PRIVATE
 #include <sys/bus.h>
 struct arm32_bus_dma_tag omap_bus_dma_tag = {
-,
+	_BUS_DMAMAP_FUNCS,
-,
+	_BUS_DMAMEM_FUNCS,
-	NULL,			/* _cookie */
+	_BUS_DMATAG_FUNCS,
 	_bus_dmamap_create,
 	_bus_dmamap_destroy,
 	_bus_dmamap_load,
 	_bus_dmamap_load_mbuf,
 	_bus_dmamap_load_uio,
 	_bus_dmamap_load_raw,
 	_bus_dmamap_unload,
 	_bus_dmamap_sync,
 	NULL,			/* sync_post */
 	_bus_dmamem_alloc,
 	_bus_dmamem_free,
 	_bus_dmamem_map,
 	_bus_dmamem_unmap,
 	_bus_dmamem_mmap
 };

 @@ -1,14 +1,14 @@
-/*	$NetBSD: s3c2xx0_busdma.c,v 1.4 2011/07/01 20:31:39 dyoung Exp $ */
+/*	$NetBSD: s3c2xx0_busdma.c,v 1.5 2012/09/18 05:47:28 matt Exp $ */
 /*
  * Copyright (c) 2002, 2003 Fujitsu Component Limited
  * Copyright (c) 2002, 2003 Genetec Corporation
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -27,48 +27,31 @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * bus_dma tag for s3c2xx0 CPUs
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2xx0_busdma.c,v 1.4 2011/07/01 20:31:39 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2xx0_busdma.c,v 1.5 2012/09/18 05:47:28 matt Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/extent.h>
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/bus.h>
 #include <arm/s3c2xx0/s3c2xx0var.h>
 struct arm32_bus_dma_tag s3c2xx0_bus_dma = {
-	NULL,			/* _ranges: set by platform specific routine */
+	_BUS_DMAMAP_FUNCS,
-,			/* _nranges */
+	_BUS_DMAMEM_FUNCS,
 	_BUS_DMATAG_FUNCS,
 	NULL,			/* _cookie */
 	_bus_dmamap_create,
 	_bus_dmamap_destroy,
 	_bus_dmamap_load,
 	_bus_dmamap_load_mbuf,
 	_bus_dmamap_load_uio,
 	_bus_dmamap_load_raw,
 	_bus_dmamap_unload,
 	_bus_dmamap_sync,
 	NULL,			/* sync_post */
 	_bus_dmamem_alloc,
 	_bus_dmamem_free,
 	_bus_dmamem_map,
 	_bus_dmamem_unmap,
 	_bus_dmamem_mmap,
 };

 @@ -1,14 +1,14 @@
-/*	$NetBSD: becc.c,v 1.14 2011/07/01 20:32:51 dyoung Exp $	*/
+/*	$NetBSD: becc.c,v 1.15 2012/09/18 05:47:28 matt Exp $	*/
 /*
  * Copyright (c) 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -31,27 +31,27 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Autoconfiguration support for the ADI Engineering Big Endian
  * Companion Chip.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: becc.c,v 1.14 2011/07/01 20:32:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: becc.c,v 1.15 2012/09/18 05:47:28 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #define	_ARM32_BUS_DMA_PRIVATE
 #include <sys/bus.h>
 #include <arm/xscale/i80200reg.h>
 #include <arm/xscale/beccreg.h>
 #include <arm/xscale/beccvar.h>
 /*
 @@ -287,26 +287,29 @@ becc_pci_dma_init(struct becc_softc *sc)
 	dmat->_dmamap_load = _bus_dmamap_load;
 	dmat->_dmamap_load_mbuf = _bus_dmamap_load_mbuf;
 	dmat->_dmamap_load_uio = _bus_dmamap_load_uio;
 	dmat->_dmamap_load_raw = _bus_dmamap_load_raw;
 	dmat->_dmamap_unload = _bus_dmamap_unload;
 	dmat->_dmamap_sync_pre = _bus_dmamap_sync;
 	dmat->_dmamap_sync_post = NULL;
 	dmat->_dmamem_alloc = _bus_dmamem_alloc;
 	dmat->_dmamem_free = _bus_dmamem_free;
 	dmat->_dmamem_map = _bus_dmamem_map;
 	dmat->_dmamem_unmap = _bus_dmamem_unmap;
 	dmat->_dmamem_mmap = _bus_dmamem_mmap;
 	dmat->_dmatag_subregion = _bus_dmatag_subregion;
 	dmat->_dmatag_destroy = _bus_dmatag_destroy;
+}
 /*
  * becc_local_dma_init:
+ *
  *	Initialize the local DMA tag.
  */
 static void
 becc_local_dma_init(struct becc_softc *sc)
+{
 	bus_dma_tag_t dmat = &sc->sc_local_dmat;
 	dmat->_ranges = NULL;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: i80312.c,v 1.21 2011/07/01 20:32:51 dyoung Exp $	*/
+/*	$NetBSD: i80312.c,v 1.22 2012/09/18 05:47:28 matt Exp $	*/
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -30,27 +30,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Autoconfiguration support for the Intel i80312 Companion I/O chip.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i80312.c,v 1.21 2011/07/01 20:32:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i80312.c,v 1.22 2012/09/18 05:47:28 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #define	_ARM32_BUS_DMA_PRIVATE
 #include <sys/bus.h>
 #include <arm/xscale/i80312reg.h>
 #include <arm/xscale/i80312var.h>
 #include <dev/pci/ppbreg.h>
 @@ -358,26 +358,29 @@ i80312_pci_dma_init(struct i80312_softc
 	dmat->_dmamap_load = _bus_dmamap_load;
 	dmat->_dmamap_load_mbuf = _bus_dmamap_load_mbuf;
 	dmat->_dmamap_load_uio = _bus_dmamap_load_uio;
 	dmat->_dmamap_load_raw = _bus_dmamap_load_raw;
 	dmat->_dmamap_unload = _bus_dmamap_unload;
 	dmat->_dmamap_sync_pre = _bus_dmamap_sync;
 	dmat->_dmamap_sync_post = NULL;
 	dmat->_dmamem_alloc = _bus_dmamem_alloc;
 	dmat->_dmamem_free = _bus_dmamem_free;
 	dmat->_dmamem_map = _bus_dmamem_map;
 	dmat->_dmamem_unmap = _bus_dmamem_unmap;
 	dmat->_dmamem_mmap = _bus_dmamem_mmap;
 	dmat->_dmatag_subregion = _bus_dmatag_subregion;
 	dmat->_dmatag_destroy = _bus_dmatag_destroy;
+}
 /*
  * i80312_local_dma_init:
+ *
  *	Initialize the local DMA tag.
  */
 static void
 i80312_local_dma_init(struct i80312_softc *sc)
+{
 	bus_dma_tag_t dmat = &sc->sc_local_dmat;
 	dmat->_ranges = NULL;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: i80321.c,v 1.23 2012/02/12 16:31:01 matt Exp $	*/
+/*	$NetBSD: i80321.c,v 1.24 2012/09/18 05:47:28 matt Exp $	*/
 /*
  * Copyright (c) 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -30,27 +30,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Autoconfiguration support for the Intel i80321 I/O Processor.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i80321.c,v 1.23 2012/02/12 16:31:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i80321.c,v 1.24 2012/09/18 05:47:28 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #define	_ARM32_BUS_DMA_PRIVATE
 #include <sys/bus.h>
 #include <arm/xscale/i80321reg.h>
 #include <arm/xscale/i80321var.h>
 #include "opt_i80321.h"
 @@ -327,26 +327,29 @@ i80321_pci_dma_init(struct i80321_softc
 	dmat->_dmamap_load = _bus_dmamap_load;
 	dmat->_dmamap_load_mbuf = _bus_dmamap_load_mbuf;
 	dmat->_dmamap_load_uio = _bus_dmamap_load_uio;
 	dmat->_dmamap_load_raw = _bus_dmamap_load_raw;
 	dmat->_dmamap_unload = _bus_dmamap_unload;
 	dmat->_dmamap_sync_pre = _bus_dmamap_sync;
 	dmat->_dmamap_sync_post = NULL;
 	dmat->_dmamem_alloc = _bus_dmamem_alloc;
 	dmat->_dmamem_free = _bus_dmamem_free;
 	dmat->_dmamem_map = _bus_dmamem_map;
 	dmat->_dmamem_unmap = _bus_dmamem_unmap;
 	dmat->_dmamem_mmap = _bus_dmamem_mmap;
 	dmat->_dmatag_subregion = _bus_dmatag_subregion;
 	dmat->_dmatag_destroy = _bus_dmatag_destroy;
+}
 /*
  * i80321_local_dma_init:
+ *
  *	Initialize the local DMA tag.
  */
 void
 i80321_local_dma_init(struct i80321_softc *sc)
+{
 	bus_dma_tag_t dmat = &sc->sc_local_dmat;
 	dmat->_ranges = NULL;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ixp425_ixme.c,v 1.3 2011/07/01 20:32:51 dyoung Exp $	*/
+/*	$NetBSD: ixp425_ixme.c,v 1.4 2012/09/18 05:47:28 matt Exp $	*/
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Steve C. Woodford.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp425_ixme.c,v 1.3 2011/07/01 20:32:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp425_ixme.c,v 1.4 2012/09/18 05:47:28 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/bus.h>
 #include <arm/xscale/ixp425var.h>
 #include <arm/xscale/ixp425_qmgr.h>
 #include <arm/xscale/ixp425_ixmevar.h>
 @@ -89,32 +89,36 @@ ixme_attach(struct device *parent, struc
 	sc->sc_dr.dr_len = physical_end - physical_start;
 	sc->sc_dt._ranges = &sc->sc_dr;
 	sc->sc_dt._nranges = 1;
 	sc->sc_dt._dmamap_create = _bus_dmamap_create;
 	sc->sc_dt._dmamap_destroy = _bus_dmamap_destroy;
 	sc->sc_dt._dmamap_load = _bus_dmamap_load;
 	sc->sc_dt._dmamap_load_mbuf = _bus_dmamap_load_mbuf;
 	sc->sc_dt._dmamap_load_uio = _bus_dmamap_load_uio;
 	sc->sc_dt._dmamap_load_raw = _bus_dmamap_load_raw;
 	sc->sc_dt._dmamap_unload = _bus_dmamap_unload;
 	sc->sc_dt._dmamap_sync_pre = _bus_dmamap_sync;
 	sc->sc_dt._dmamap_sync_post = NULL;
 	sc->sc_dt._dmamem_alloc = _bus_dmamem_alloc;
 	sc->sc_dt._dmamem_free = _bus_dmamem_free;
 	sc->sc_dt._dmamem_map = _bus_dmamem_map;
 	sc->sc_dt._dmamem_unmap = _bus_dmamem_unmap;
 	sc->sc_dt._dmamem_mmap = _bus_dmamem_mmap;
 	sc->sc_dt._dmatag_subregion = _bus_dmatag_subregion;
 	sc->sc_dt._dmatag_destroy = _bus_dmatag_destroy;
 	config_search_ia(ixme_search, self, "ixme", NULL);
+}
 static int
 ixme_search(struct device *parent, struct cfdata *cf, const int *ldesc,
     void *arg)
+{
 	struct ixme_softc *sc = (void *)parent;
 	struct ixme_attach_args ixa;
 	if (cf->cf_loc[IXMECF_NPE] < 0 || cf->cf_loc[IXMECF_NPE] > 2)
 		return (0);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ixp425_pci_dma.c,v 1.5 2011/07/01 20:32:51 dyoung Exp $ */
+/*	$NetBSD: ixp425_pci_dma.c,v 1.6 2012/09/18 05:47:28 matt Exp $ */
 /*
  * Copyright (c) 2003
  *	Ichiro FUKUHARA <ichiro@ichiro.org>.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -18,27 +18,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL ICHIRO FUKUHARA OR THE VOICES IN HIS HEAD BE LIABLE FOR
  * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp425_pci_dma.c,v 1.5 2011/07/01 20:32:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp425_pci_dma.c,v 1.6 2012/09/18 05:47:28 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <uvm/uvm_extern.h>
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/bus.h>
 #include <arm/xscale/ixp425reg.h>
 @@ -64,14 +64,17 @@ ixp425_pci_dma_init(struct ixp425_softc
 	dmat->_dmamap_load = _bus_dmamap_load;
 	dmat->_dmamap_load_mbuf = _bus_dmamap_load_mbuf;
 	dmat->_dmamap_load_uio = _bus_dmamap_load_uio;
 	dmat->_dmamap_load_raw = _bus_dmamap_load_raw;
 	dmat->_dmamap_unload = _bus_dmamap_unload;
 	dmat->_dmamap_sync_pre = _bus_dmamap_sync;
 	dmat->_dmamap_sync_post = NULL;
 	dmat->_dmamem_alloc = _bus_dmamem_alloc;
 	dmat->_dmamem_free = _bus_dmamem_free;
 	dmat->_dmamem_map = _bus_dmamem_map;
 	dmat->_dmamem_unmap = _bus_dmamem_unmap;
 	dmat->_dmamem_mmap = _bus_dmamem_mmap;
 	dmat->_dmatag_subregion = _bus_dmatag_subregion;
 	dmat->_dmatag_destroy = _bus_dmatag_destroy;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pxa2x0_dma.c,v 1.5 2011/07/01 20:32:51 dyoung Exp $ */
+/*	$NetBSD: pxa2x0_dma.c,v 1.6 2012/09/18 05:47:28 matt Exp $ */
 /*
  * Copyright (c) 2002  Genetec Corporation.  All rights reserved.
  * Written by Hiroyuki Bessho for Genetec Corporation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -29,46 +29,31 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * bus dma tag for PXA2[15]0 processor.
  * (Currently used only for LCD frame buffer)
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_dma.c,v 1.5 2011/07/01 20:32:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_dma.c,v 1.6 2012/09/18 05:47:28 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <uvm/uvm_extern.h>
 #define	_ARM32_BUS_DMA_PRIVATE
 #include <sys/bus.h>
 struct arm32_bus_dma_tag pxa2x0_bus_dma_tag = {
-,
+	_BUS_DMAMAP_FUNCS,
-,
+	_BUS_DMAMEM_FUNCS,
-	NULL,			/* _cookie */
+	_BUS_DMATAG_FUNCS,
 	_bus_dmamap_create,
 	_bus_dmamap_destroy,
 	_bus_dmamap_load,
 	_bus_dmamap_load_mbuf,
 	_bus_dmamap_load_uio,
 	_bus_dmamap_load_raw,
 	_bus_dmamap_unload,
 	_bus_dmamap_sync,
 	NULL,			/* sync_post */
 	_bus_dmamem_alloc,
 	_bus_dmamem_free,
 	_bus_dmamem_map,
 	_bus_dmamem_unmap,
 	_bus_dmamem_mmap
 };