 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus_dma.c,v 1.52 2020/07/06 10:31:24 rin Exp $	*/
+/*	$NetBSD: bus_dma.c,v 1.53 2022/02/16 23:30:52 riastradh 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,27 +23,27 @@
  * 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 _POWERPC_BUS_DMA_PRIVATE
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.52 2020/07/06 10:31:24 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.53 2022/02/16 23:30:52 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_ppcarch.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/proc.h>
 #include <sys/mbuf.h>
 #include <sys/bus.h>
 @@ -391,32 +391,118 @@ _bus_dmamap_load_uio(bus_dma_tag_t t, bu
 		resid -= minlen;
+	}
 	if (error == 0) {
 		map->dm_mapsize = uio->uio_resid;
 		map->dm_nsegs = seg + 1;
+	}
 	return (error);
+}
 /*
  * Like _bus_dmamap_load(), but for raw memory allocated with
  * bus_dmamem_alloc().
+ *
  * XXX This is too much copypasta of _bus_dmamap_load_buffer.
  */
 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)
+_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)
+{
 	bus_size_t sgsize, isgsize;
 	bus_size_t busaddr, curaddr, lastaddr, baddr, bmask;
 	int seg, iseg, first;
 	if (size == 0)
 		return 0;
 	lastaddr = 0;
 	bmask = ~(map->_dm_boundary - 1);
 	first = 0;
 	iseg = 0;
 	busaddr = segs[iseg].ds_addr;
 	isgsize = segs[iseg].ds_len;
 	for (seg = 0; size > 0;) {
 		/*
 		 * Get the physical address for this segment.
 		 */
 		curaddr = BUS_MEM_TO_PHYS(t, busaddr);
 		/*
 		 * If we're beyond the bounce threshold, notify
 		 * the caller.
 		 */
 		if (map->_dm_bounce_thresh != 0 &&
 		    curaddr >= map->_dm_bounce_thresh)
 			return EINVAL;
 		/*
 		 * Compute the segment size, and adjust counts.
 		 */
 		sgsize = PAGE_SIZE - ((u_long)curaddr & PGOFSET);
 		sgsize = MIN(sgsize, isgsize);
 		sgsize = MIN(sgsize, size);
 		sgsize = MIN(sgsize, map->dm_maxsegsz);
 		/*
 		 * Make sure we don't cross any boundaries.
 		 */
 		if (map->_dm_boundary > 0) {
 			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 (first) {
 			map->dm_segs[seg].ds_addr =
 			    PHYS_TO_BUS_MEM(t, curaddr);
 			map->dm_segs[seg].ds_len = sgsize;
 			first = 0;
 		} else {
 			if (curaddr == lastaddr &&
 			    (map->dm_segs[seg].ds_len + sgsize) <=
 			     map->dm_maxsegsz &&
 			    (map->_dm_boundary == 0 ||
 			     (map->dm_segs[seg].ds_addr & bmask) ==
 			     (PHYS_TO_BUS_MEM(t, curaddr) & bmask)))
 				map->dm_segs[seg].ds_len += sgsize;
 			else {
 				if (++seg >= map->_dm_segcnt)
 					break;
 				map->dm_segs[seg].ds_addr =
 					PHYS_TO_BUS_MEM(t, curaddr);
 				map->dm_segs[seg].ds_len = sgsize;
+			}
+		}
 		lastaddr = curaddr + sgsize;
 		size -= sgsize;
 		if ((isgsize -= sgsize) == 0) {
 			iseg++;
 			KASSERT(iseg < nsegs);
 			busaddr = segs[iseg].ds_addr;
 			isgsize = segs[iseg].ds_len;
+		}
+	}
 	if (size > 0)
 		return EFBIG;
-	panic("_bus_dmamap_load_raw: not implemented");
+	return 0;
+}
 /*
  * Common function for unloading a DMA map.  May be called by
  * chipset-specific DMA map unload functions.
  */
 void
 _bus_dmamap_unload(bus_dma_tag_t t, bus_dmamap_t map)
+{
 	/*
 	 * No resources to free; just mark the mappings as
 	 * invalid.