 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus_dma.c,v 1.100 2017/12/29 08:56:49 skrll Exp $	*/
+/*	$NetBSD: bus_dma.c,v 1.101 2017/12/29 08:58:57 skrll 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
 @@ -25,27 +25,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.
  */
 #define _ARM32_BUS_DMA_PRIVATE
 #include "opt_arm_bus_space.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.100 2017/12/29 08:56:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.101 2017/12/29 08:58:57 skrll Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/reboot.h>
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/kmem.h>
 #include <sys/mbuf.h>
 @@ -176,27 +176,27 @@ _bus_dma_busaddr_to_paddr(bus_dma_tag_t
 static int
 _bus_dmamap_load_paddr(bus_dma_tag_t t, bus_dmamap_t map,
     bus_addr_t paddr, bus_size_t size, bool coherent)
+{
 	bus_dma_segment_t * const segs = map->dm_segs;
 	int nseg = map->dm_nsegs;
 	bus_addr_t lastaddr;
 	bus_addr_t bmask = ~(map->_dm_boundary - 1);
 	bus_addr_t curaddr;
 	bus_size_t sgsize;
 	uint32_t _ds_flags = coherent ? _BUS_DMAMAP_COHERENT : 0;
 	if (nseg > 0)
-		lastaddr = segs[nseg-1].ds_addr + segs[nseg-1].ds_len;
+		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_paddr_inrange(t->_ranges, t->_nranges, paddr);
 		if (dr == NULL)
 			return EINVAL;
 @@ -225,32 +225,32 @@ _bus_dmamap_load_paddr(bus_dma_tag_t t,
 	if (map->_dm_boundary > 0) {
 		bus_addr_t baddr;	/* next boundary address */
 		baddr = (curaddr + map->_dm_boundary) & bmask;
 		if (sgsize > (baddr - curaddr))
 			sgsize = (baddr - curaddr);
+	}
 	/*
 	 * Insert chunk into a segment, coalescing with the
 	 * previous segment if possible.
 	 */
 	if (nseg > 0 && curaddr == lastaddr &&
-	    segs[nseg-1].ds_len + sgsize <= map->dm_maxsegsz &&
+	    segs[nseg - 1].ds_len + sgsize <= map->dm_maxsegsz &&
-	    ((segs[nseg-1]._ds_flags ^ _ds_flags) & _BUS_DMAMAP_COHERENT) == 0 &&
+	    ((segs[nseg - 1]._ds_flags ^ _ds_flags) & _BUS_DMAMAP_COHERENT) == 0 &&
 	    (map->_dm_boundary == 0 ||
-	     (segs[nseg-1].ds_addr & bmask) == (curaddr & bmask))) {
+	     (segs[nseg - 1].ds_addr & bmask) == (curaddr & bmask))) {
 	     	/* coalesce */
-		segs[nseg-1].ds_len += sgsize;
+		segs[nseg - 1].ds_len += sgsize;
 	} else if (nseg >= map->_dm_segcnt) {
 		return EFBIG;
 	} else {
 		/* new segment */
 		segs[nseg].ds_addr = curaddr;
 		segs[nseg].ds_len = sgsize;
 		segs[nseg]._ds_flags = _ds_flags;
 		nseg++;
+	}
 	lastaddr = curaddr + sgsize;
 	paddr += sgsize;
 @@ -1607,27 +1607,27 @@ _bus_dmamap_load_buffer(bus_dma_tag_t t,
  * Allocate physical memory from the given physical address range.
  * Called by DMA-safe memory allocation methods.
  */
 int
 _bus_dmamem_alloc_range(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,
     int flags, paddr_t low, paddr_t high)
+{
 	paddr_t curaddr, lastaddr;
 	struct vm_page *m;
 	struct pglist mlist;
 	int curseg, error;
-	KASSERTMSG(boundary == 0 || (boundary & (boundary-1)) == 0,
+	KASSERTMSG(boundary == 0 || (boundary & (boundary - 1)) == 0,
 	    "invalid boundary %#lx", boundary);
 #ifdef DEBUG_DMA
 	printf("alloc_range: t=%p size=%lx align=%lx boundary=%lx segs=%p nsegs=%x rsegs=%p flags=%x lo=%lx hi=%lx\n",
 	    t, size, alignment, boundary, segs, nsegs, rsegs, flags, low, high);
 #endif	/* DEBUG_DMA */
 	/* Always round the size. */
 	size = round_page(size);
 	/*
 	 * We accept boundaries < size, splitting in multiple segments
 	 * if needed. uvm_pglistalloc does not, so compute an appropriate