 @@ -1,14 +1,14 @@
-/* $NetBSD: tsc.c,v 1.25 2021/04/24 23:36:23 thorpej Exp $ */
+/* $NetBSD: tsc.c,v 1.26 2021/05/27 22:11:31 thorpej Exp $ */
 /*-
  * Copyright (c) 1999 by Ross Harvey.  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.
  * 3. All advertising materials mentioning features or use of this software
 @@ -25,27 +25,27 @@
  * 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 "opt_dec_6600.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tsc.c,v 1.25 2021/04/24 23:36:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsc.c,v 1.26 2021/05/27 22:11:31 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <machine/autoconf.h>
 #include <machine/rpb.h>
 #include <machine/sysarch.h>
 #include <dev/isa/isareg.h>
 #include <dev/isa/isavar.h>
 #include <dev/pci/pcireg.h>
 @@ -221,27 +221,27 @@ tspattach(device_t parent, device_t self
 	/*
 	 * Do PCI memory initialization that needs to be deferred until
 	 * malloc is safe.  On the Tsunami, we need to do this after
 	 * DMA is initialized, as well.
 	 */
 	tsp_bus_mem_init2(&pcp->pc_memt, pcp);
 	pci_6600_pickintr(pcp);
 	pba.pba_iot = &pcp->pc_iot;
 	pba.pba_memt = &pcp->pc_memt;
 	pba.pba_dmat =
 	    alphabus_dma_get_tag(&pcp->pc_dmat_direct, ALPHA_BUS_PCI);
-	pba.pba_dmat64 = NULL;
+	pba.pba_dmat64 = &pcp->pc_dmat64_direct;
 	pba.pba_pc = &pcp->pc_pc;
 	pba.pba_bus = 0;
 	pba.pba_bridgetag = NULL;
 	pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY |
 	    PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
 	config_found(self, &pba, pcibusprint, CFARG_EOL);
+}
 struct tsp_config *
 tsp_init(int mallocsafe, int n)
 	/* n:	 Pchip number */
+{
 	struct tsp_config *pcp;

 @@ -1,14 +1,44 @@
-/* $NetBSD: tsp_dma.c,v 1.16 2021/05/05 02:15:18 thorpej Exp $ */
+/* $NetBSD: tsp_dma.c,v 1.17 2021/05/27 22:11:31 thorpej Exp $ */
 /*-
  * Copyright (c) 1997, 1998, 2021 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
  *    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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``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.
  */
 /*-
  * Copyright (c) 1999 by Ross Harvey.  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.
  * 3. All advertising materials mentioning features or use of this software
 @@ -18,61 +48,30 @@
  *    derived from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY ROSS HARVEY ``AS IS'' AND ANY EXPRESS
  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURP0SE
  * ARE DISCLAIMED.  IN NO EVENT SHALL ROSS HARVEY 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.
  */
 /*-
  * 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
  *    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.
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``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: tsp_dma.c,v 1.16 2021/05/05 02:15:18 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsp_dma.c,v 1.17 2021/05/27 22:11:31 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <machine/autoconf.h>
 #define _ALPHA_BUS_DMA_PRIVATE
 #include <sys/bus.h>
 #include <machine/rpb.h>
 #include <dev/pci/pcireg.h>
 @@ -98,26 +97,51 @@ static int	tsp_bus_dmamap_load_uio_sgmap
 static int	tsp_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t,
 		    bus_dma_segment_t *, int, bus_size_t, int);
 static void	tsp_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t);
 static void	tsp_tlb_invalidate(struct tsp_config *);
 /*
  * XXX Need to figure out what this is, if any.  Initialize it to
  * XXX something that should be safe.
  */
 #define	TSP_SGMAP_PFTHRESH	256
 /*
  * Quoting the 21272 programmer's reference manual:
+ *
  * <quote>
  * 10.1.4.4 Monster Window DMA Address Translation
+ *
  * In case of a PCI dual-address cycle command, the high-order PCI address
  * bits <63:40> are compared to the constant value 0x0000_01 (that is, bit
  * <40> = 1; all other bits = 0). If these bits match, a monster window hit
  * has occurred and the low-order PCI address bits <34:0> are used unchanged
  * as the system address bits <34:0>. PCI address bits <39:35> are ignored.
  * The high-order 32 PCI address bits are available on b_ad<31:0> in the
  * second cycle of a DAC, and also on b_ad<63:32> in the first cycle of a
  * DAC if b_req64_l is asserted.
  * </quote>
+ *
  * This means that we can address up to 32GB of RAM using a direct-mapped
  * 64-bit DMA tag.  This leaves us possibly having to fall back on SGMAP
  * DMA on a Titan system (those support up to 64GB of RAM), and we may have
  * to address that with an additional large SGMAP DAC window at another
  * time.
  */
 #define	TSP_MONSTER_DMA_WINDOW_BASE	0x100##00000000UL
 #define	TSP_MONSTER_DMA_WINDOW_SIZE	0x008##00000000UL
 void
 tsp_dma_init(struct tsp_config *pcp)
+{
 	int i;
 	bus_dma_tag_t t;
 	struct ts_pchip *pccsr = pcp->pc_csr;
 	bus_addr_t dwbase, dwlen, sgwbase, sgwlen, tbase;
 	static struct map_expected {
 		uint32_t base, mask, enables;
 	} premap[4] = {
 		{ 0x00800000, 0x00700000, WSBA_ENA | WSBA_SG },
 		{ 0x80000000, 0x3ff00000, WSBA_ENA           },
 		{ 0, 0, 0 },
 @@ -127,29 +151,58 @@ tsp_dma_init(struct tsp_config *pcp)
 	alpha_mb();
 	for(i = 0; i < 4; ++i) {
 		if (EDIFF(pccsr->tsp_wsba[i].tsg_r, premap[i].base) ||
 		    EDIFF(pccsr->tsp_wsm[i].tsg_r, premap[i].mask))
 			printf("tsp%d: window %d: %lx/base %lx/mask %lx"
 			    " reinitialized\n",
 			    pcp->pc_pslot, i,
 			    pccsr->tsp_wsba[i].tsg_r,
 			    pccsr->tsp_wsm[i].tsg_r,
 			    pccsr->tsp_tba[i].tsg_r);
 		pccsr->tsp_wsba[i].tsg_r = premap[i].base | premap[i].enables;
 		pccsr->tsp_wsm[i].tsg_r = premap[i].mask;
+	}
 	/* Ensure the Monster Window is enabled. */
 	pccsr->tsp_pctl.tsg_r |= PCTL_MWIN;
 	alpha_mb();
 	/*
 	 * Initialize the DMA tag used for direct-mapped 64-bit DMA.
 	 */
 	t = &pcp->pc_dmat64_direct;
 	t->_cookie = pcp;
 	t->_wbase = TSP_MONSTER_DMA_WINDOW_BASE;
 	t->_wsize = TSP_MONSTER_DMA_WINDOW_SIZE;
 	t->_next_window = &pcp->pc_dmat_sgmap;
 	t->_boundary = 0;
 	t->_sgmap = NULL;
 	t->_get_tag = tsp_dma_get_tag;
 	t->_dmamap_create = _bus_dmamap_create;
 	t->_dmamap_destroy = _bus_dmamap_destroy;
 	t->_dmamap_load = _bus_dmamap_load_direct;
 	t->_dmamap_load_mbuf = _bus_dmamap_load_mbuf_direct;
 	t->_dmamap_load_uio = _bus_dmamap_load_uio_direct;
 	t->_dmamap_load_raw = _bus_dmamap_load_raw_direct;
 	t->_dmamap_unload = _bus_dmamap_unload;
 	t->_dmamap_sync = _bus_dmamap_sync;
 	t->_dmamem_alloc = _bus_dmamem_alloc;
 	t->_dmamem_free = _bus_dmamem_free;
 	t->_dmamem_map = _bus_dmamem_map;
 	t->_dmamem_unmap = _bus_dmamem_unmap;
 	t->_dmamem_mmap = _bus_dmamem_mmap;
 	/*
 	 * Initialize the DMA tag used for direct-mapped DMA.
 	 */
 	t = &pcp->pc_dmat_direct;
 	t->_cookie = pcp;
 	t->_wbase = dwbase = WSBA_ADDR(pccsr->tsp_wsba[1].tsg_r);
 	t->_wsize = dwlen = WSM_LEN(pccsr->tsp_wsm[1].tsg_r);
 	t->_next_window = &pcp->pc_dmat_sgmap;
 	t->_boundary = 0;
 	t->_sgmap = NULL;
 	t->_get_tag = tsp_dma_get_tag;
 	t->_dmamap_create = _bus_dmamap_create;
 	t->_dmamap_destroy = _bus_dmamap_destroy;
 	t->_dmamap_load = _bus_dmamap_load_direct;

 @@ -1,14 +1,14 @@
-/* $NetBSD: tsreg.h,v 1.8 2020/09/23 00:46:17 thorpej Exp $ */
+/* $NetBSD: tsreg.h,v 1.9 2021/05/27 22:11:31 thorpej Exp $ */
 /*-
  * Copyright (c) 1999 by Ross Harvey.  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.
  * 3. All advertising materials mentioning features or use of this software
 @@ -157,26 +157,49 @@
 #define P_WSM1		0x0140
 #define P_WSM2		0x0180
 #define P_WSM3		0x01c0
 #	define	WSM_AM(r)    TSFIELDBB((r), 31, 20)
 #	define	WSM_LEN(r)   ((WSM_AM(r) + 1) << 20)
 #define P_TBA0		0x0200
 #define P_TBA1		0x0240
 #define P_TBA2		0x0280
 #define P_TBA3		0x02c0
 #define P_PCTL		0x0300
 #define	PCTL_FDSC	__BIT(0)	/* fast discard enable */
 #define	PCTL_FBTB	__BIT(1)	/* fast back-to-back enable */
 #define	PCTL_THDIS	__BIT(2)	/* disable TLB anti-thrash (debug) */
 #define	PCTL_CHAINDIS	__BIT(3)	/* disable chaining */
 #define	PCTL_TGTLAT	__BIT(4)	/* target latency timers enable */
 #define	PCTL_HOLE	__BIT(5)	/* 512KB->1M hole enable */
 #define	PCTL_MWIN	__BIT(6)	/* monster window enable */
 #define	PCTL_PRIGRP	__BITS(8,14)	/* arbiter priority group */
 #define	PCTL_PPRI	__BIT(15)	/* arbiter priority group for Pchip */
 #define	PCTL_ECCEN	__BIT(18)	/* ECC enable for DMA and SGTE */
 #define	PCTL_PADM	__BIT(19)	/* PADbus mode */
 #define	PCTL_CDQMAX	__BITS(20,23)	/* see manual */
 #define	PCTL_REV	__BITS(24,31)	/* Pchip revision */
 #define	PCTL_CRQMAX	__BITS(32,35)	/* see manual */
 #define	PCTL_PTPMAX	__BITS(36,39)	/* see manual */
 #define	PCTL_PCLKX	__BITS(40,41)	/* PCI clock freq multipler */
 #define	PCTL_FDSDIS	__BIT(42)	/* fast DMA start and SGTE disable */
 #define	PCTL_FDWDIS	__BIT(43)	/* fast DMA read cache block disable */
 #define	PCTL_PTEVRFY	__BIT(44)	/* PTE verify for DMA read */
 #define	PCTL_RPP	__BIT(45)	/* remote Pchip present */
 #define	PCTL_PID	__BITS(46,47)	/* Pchip ID */
 #define P_PLAT		0x0340
 	/* reserved	0x0380 */
 #define P_PERROR	0x03c0
 #	define	PER_ERR(r)	TSFIELD((r),  0, 12)
 #	define	PER_ECC(r)	TSFIELD((r), 10, 2)
 #	define	PER_SADR(r)	TSFIELD((r), 16, 34)
 #	define	PER_PADR(r)	(TSFIELD((r), 18, 32) << 2)
 #	define	PER_TRNS(r)	TSFIELD((r), 16, 2)
 #	define	PER_INV(r)	TSFIELD((r), 51, 1)
 #	define	PER_CMD(r)	TSFIELD((r), 52, 4)
 #	define	PER_SYN(r)	TSFIELD((r), 56, 8)

 @@ -1,14 +1,14 @@
-/* $NetBSD: tsvar.h,v 1.14 2020/06/17 03:50:04 thorpej Exp $ */
+/* $NetBSD: tsvar.h,v 1.15 2021/05/27 22:11:31 thorpej Exp $ */
 /*-
  * Copyright (c) 1999 by Ross Harvey.  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.
  * 3. All advertising materials mentioning features or use of this software
 @@ -41,26 +41,27 @@
 #define	tsvar() { Generate ctags(1) key. }
 struct tsp_config {
 	int	pc_pslot;		/* Pchip 0 or 1 */
 	int	pc_initted;		/* Initialized */
 	uint64_t pc_iobase;		/* All Pchip space starts here */
 	struct	ts_pchip *pc_csr;	/* Pchip CSR space starts here */
 	volatile uint64_t *pc_tlbia;  	/* Pchip TLBIA register address */
 	struct	alpha_bus_space pc_iot, pc_memt;
 	struct	alpha_pci_chipset pc_pc;
 	struct	alpha_bus_dma_tag pc_dmat64_direct;
 	struct	alpha_bus_dma_tag pc_dmat_direct;
 	struct	alpha_bus_dma_tag pc_dmat_sgmap;
 	struct alpha_sgmap pc_sgmap;
 	uint32_t pc_hae_mem;
 	uint32_t pc_hae_io;
 	long	pc_io_exstorage[_FSTORE];
 	long	pc_mem_exstorage[_FSTORE];
 	struct	extent *pc_io_ex, *pc_mem_ex;
 	int	pc_mallocsafe;
 };

 @@ -1,14 +1,14 @@
-/* $NetBSD: pci_machdep.h,v 1.21 2020/09/26 21:07:48 thorpej Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.22 2021/05/27 22:11:31 thorpej Exp $ */
 /*
  * Copyright (c) 1996 Carnegie-Mellon University.
  * All rights reserved.
+ *
  * Author: Chris G. Demetriou
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
 @@ -26,26 +26,27 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 #ifndef _ALPHA_PCI_MACHDEP_H_
 #define	_ALPHA_PCI_MACHDEP_H_
 #include <sys/errno.h>
 /*
  * Machine-specific definitions for PCI autoconfiguration.
  */
 #define	__HAVE_PCIIDE_MACHDEP_COMPAT_INTR_ESTABLISH
 #define	_PCI_HAVE_DMA64
 /*
  * Types provided to machine-independent PCI code
  */
 typedef struct alpha_pci_chipset *pci_chipset_tag_t;
 typedef u_long pcitag_t;
 typedef struct {
 	u_long value;
 } pci_intr_handle_t;
 /*
  * Forward declarations.
  */