 @@ -1,14 +1,14 @@
-/* $NetBSD: sgmap_common.c,v 1.28 2021/07/04 22:42:35 thorpej Exp $ */
+/* $NetBSD: sgmap_common.c,v 1.29 2021/07/18 05:12:27 thorpej Exp $ */
 /*-
  * Copyright (c) 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
 @@ -22,27 +22,27 @@
  * 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>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: sgmap_common.c,v 1.28 2021/07/04 22:42:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sgmap_common.c,v 1.29 2021/07/18 05:12:27 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <uvm/uvm_extern.h>
 #define	_ALPHA_BUS_DMA_PRIVATE
 #include <sys/bus.h>
 #include <alpha/common/sgmapvar.h>
 @@ -58,26 +58,34 @@ void
 alpha_sgmap_init(bus_dma_tag_t t, struct alpha_sgmap *sgmap, const char *name,
     bus_addr_t wbase, bus_addr_t sgvabase, bus_size_t sgvasize, size_t ptesize,
     void *ptva, bus_size_t minptalign)
+{
 	bus_dma_segment_t seg;
 	size_t ptsize;
 	int rseg;
 	if (sgvasize & PGOFSET) {
 		printf("size botch for sgmap `%s'\n", name);
 		goto die;
+	}
 	/*
 	 * If we don't yet have a minimum SGVA alignment, default
 	 * to the system page size.
 	 */
 	if (t->_sgmap_minalign < PAGE_SIZE) {
 		t->_sgmap_minalign = PAGE_SIZE;
+	}
 	sgmap->aps_wbase = wbase;
 	sgmap->aps_sgvabase = sgvabase;
 	sgmap->aps_sgvasize = sgvasize;
 	if (ptva != NULL) {
 		/*
 		 * We already have a page table; this may be a system
 		 * where the page table resides in bridge-resident SRAM.
 		 */
 		sgmap->aps_pt = ptva;
 		sgmap->aps_ptpa = 0;
 	} else {
 		/*

 @@ -1,14 +1,14 @@
-/* $NetBSD: sgmap_typedep.c,v 1.42 2021/06/24 16:41:16 thorpej Exp $ */
+/* $NetBSD: sgmap_typedep.c,v 1.43 2021/07/18 05:12:27 thorpej Exp $ */
 /*-
  * Copyright (c) 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
 @@ -21,27 +21,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(1, "$NetBSD: sgmap_typedep.c,v 1.42 2021/06/24 16:41:16 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sgmap_typedep.c,v 1.43 2021/07/18 05:12:27 thorpej Exp $");
 #include "opt_ddb.h"
 #include <sys/evcnt.h>
 #include <uvm/uvm_extern.h>
 #define	DMA_COUNT_DECL(cnt)	_DMA_COUNT_DECL(dma_sgmap, cnt)
 #define	DMA_COUNT(cnt)		_DMA_COUNT(dma_sgmap, cnt)
 #ifdef SGMAP_DEBUG
 int			__C(SGMAP_TYPE,_debug) = 0;
 #endif
 @@ -120,27 +120,28 @@ __C(SGMAP_TYPE,_load_buffer)(bus_dma_tag
 	 * Caller's mistake if the requested length is larger than
 	 * their own boundary constraint.
 	 */
 	if (__predict_false(boundary != 0 && buflen > boundary)) {
 		return EINVAL;
+	}
 	endva = round_page(va + buflen);
 	va = trunc_page(va);
 	const vm_flag_t vmflags = VM_INSTANTFIT |
 	    ((flags & BUS_DMA_NOWAIT) ? VM_NOSLEEP : VM_SLEEP);
-	alignment = PAGE_SIZE;
+	KASSERT(t->_sgmap_minalign != 0);
 	alignment = t->_sgmap_minalign;
 	sgvalen = (endva - va);
 	SGMAP_PTE_TYPE spill_pte_v = __C(SGMAP_TYPE,_prefetch_spill_page_pte);
 	/*
 	 * If we have a boundary constraint, it's possible to end up in
 	 * a situation where sgvalen > boundary if the caller's buffer
 	 * is not page aligned.  In this case, we will have to allocate
 	 * an extra SG segment and split the buffer.
 	 */
 	if (__predict_false(boundary != 0 && boundary < sgvalen)) {
 #ifdef SGMAP_DEBUG
 		if (__C(SGMAP_TYPE,_debug)) {
 @@ -183,33 +184,36 @@ __C(SGMAP_TYPE,_load_buffer)(bus_dma_tag
 		extra_sgvalen = 0;
 		extra_sgva = 0;
+	}
 	if (spill) {
 		DMA_COUNT(spill_page);
 		sgvalen += PAGE_SIZE;
 		/*
 		 * ARGH!  If the addition of the spill page bumped us
 		 * over our boundary, we have to 2x the boundary limit.
 		 * To compensate (and enforce the original boundary
-		 * constraint), we force our alignment to be the previous
+		 * constraint), we force our alignment to be at least the
-		 * boundary, thus ensuring that the only boundary violation
+		 * previous boundary, thus ensuring that the only boundary
-		 * is the pre-fetch that the SGMAP controller performs that
+		 * violation is the pre-fetch that the SGMAP controller
-		 * necessitates the spill page in the first place.
+		 * performs that necessitates the spill page in the first
 		 * place.
 		 */
 		if (boundary && boundary < sgvalen) {
-			alignment = boundary;
+			if (alignment < boundary) {
 				alignment = boundary;
+			}
 			do {
 				boundary <<= 1;
 			} while (boundary < sgvalen);
+		}
+	}
 #ifdef SGMAP_DEBUG
 	if (__C(SGMAP_TYPE,_debug)) {
 		printf("sgmap_load: va:endva = 0x%lx:0x%lx\n", va, endva);
 		printf("sgmap_load: sgvalen = 0x%lx, boundary = 0x%lx\n",
 		       sgvalen, boundary);
+	}
 #endif

 @@ -1,14 +1,14 @@
-/* $NetBSD: bus_defs.h,v 1.5 2019/09/23 16:17:54 skrll Exp $ */
+/* $NetBSD: bus_defs.h,v 1.6 2021/07/18 05:12:27 thorpej Exp $ */
 /*-
  * Copyright (c) 1997, 1998, 2000, 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
 @@ -354,26 +354,32 @@ struct alpha_bus_dma_tag {
 	 * be specified.  If the device has a more restrictive constraint,
 	 * the map will use that, otherwise this boundary will be used.
 	 * This value is ignored if 0.
 	 */
 	bus_size_t _boundary;
 	/*
 	 * A chipset may have more than one SGMAP window, so SGMAP
 	 * windows also get a pointer to their SGMAP state.
 	 */
 	struct alpha_sgmap *_sgmap;
 	/*
 	 * Some chipsets may want to enforce a minimum alignment
 	 * constraint for SGMAP DMA addresses.
 	 */
 	bus_size_t _sgmap_minalign;
 	/*
 	 * The SGMAP MMU implements a prefetch FIFO to keep data
 	 * moving down the pipe, when doing host->bus DMA writes.
 	 * The threshold (distance until the next page) used to
 	 * trigger the prefetch is differnet on different chipsets,
 	 * and we need to know what it is in order to know whether
 	 * or not to allocate a spill page.
 	 */
 	bus_size_t _pfthresh;
 	/*
 	 * Internal-use only utility methods.  NOT TO BE USED BY
 	 * MACHINE-INDEPENDENT CODE!
 	 */

 @@ -1,14 +1,14 @@
-/* $NetBSD: tc_dma.c,v 1.14 2020/10/10 21:59:03 thorpej Exp $ */
+/* $NetBSD: tc_dma.c,v 1.15 2021/07/18 05:12:27 thorpej Exp $ */
 /*-
  * Copyright (c) 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
 @@ -22,43 +22,44 @@
  * 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>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tc_dma.c,v 1.14 2020/10/10 21:59:03 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc_dma.c,v 1.15 2021/07/18 05:12:27 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #define _ALPHA_BUS_DMA_PRIVATE
 #include <sys/bus.h>
 #include <dev/tc/tcvar.h>
 struct alpha_bus_dma_tag tc_dmat_direct = {
 	NULL,				/* _cookie */
 ,				/* _wbase */
 ,				/* _wsize */
 	NULL,				/* _next_window */
 ,				/* _boundary */
 	NULL,				/* _sgmap */
 ,				/* _sgmap_minalign */
 ,				/* _pfthresh */
 	NULL,				/* _get_tag */
 	_bus_dmamap_create,
 	_bus_dmamap_destroy,
 	_bus_dmamap_load_direct,
 	_bus_dmamap_load_mbuf_direct,
 	_bus_dmamap_load_uio_direct,
 	_bus_dmamap_load_raw_direct,
 	_bus_dmamap_unload,
 	_bus_dmamap_sync,
 	_bus_dmamem_alloc,
 	_bus_dmamem_free,
 	_bus_dmamem_map,

 @@ -1,14 +1,14 @@
-/* $NetBSD: tc_dma_3000_500.c,v 1.23 2020/11/18 02:04:30 thorpej Exp $ */
+/* $NetBSD: tc_dma_3000_500.c,v 1.24 2021/07/18 05:12:27 thorpej Exp $ */
 /*-
  * Copyright (c) 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
 @@ -22,48 +22,49 @@
  * 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>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tc_dma_3000_500.c,v 1.23 2020/11/18 02:04:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc_dma_3000_500.c,v 1.24 2021/07/18 05:12:27 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #define _ALPHA_BUS_DMA_PRIVATE
 #include <sys/bus.h>
 #include <dev/tc/tcvar.h>
 #include <alpha/tc/tc_sgmap.h>
 #include <alpha/tc/tc_dma_3000_500.h>
 struct alpha_bus_dma_tag tc_dmat_sgmap = {
 	NULL,				/* _cookie */
 ,				/* _wbase */
 ,				/* _wsize */
 	NULL,				/* _next_window */
 ,				/* _boundary */
 	NULL,				/* _sgmap */
 	PAGE_SIZE,			/* _sgmap_minalign */
 ,				/* _pfthresh */
 	NULL,				/* _get_tag */
 	tc_bus_dmamap_create_sgmap,
 	tc_bus_dmamap_destroy_sgmap,
 	tc_bus_dmamap_load_sgmap,
 	tc_bus_dmamap_load_mbuf_sgmap,
 	tc_bus_dmamap_load_uio_sgmap,
 	tc_bus_dmamap_load_raw_sgmap,
 	tc_bus_dmamap_unload_sgmap,
 	_bus_dmamap_sync,
 	_bus_dmamem_alloc,
 	_bus_dmamem_free,
 	_bus_dmamem_map,