 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus_space_sparse.c,v 1.18 2011/07/01 19:28:00 dyoung Exp $	*/
+/*	$NetBSD: bus_space_sparse.c,v 1.19 2016/07/11 16:18:55 matt Exp $	*/
 /*	NetBSD: bus_machdep.c,v 1.1 2000/01/26 18:48:00 drochner 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 Charles M. Hannum and 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:
 @@ -29,114 +29,93 @@
  * 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.
  */
 /*
  * For sparse bus space
+ *
  * This bus_space uses KSEG2 mapping, if the physical address is not
  * accessible via KSEG0/KSEG1.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space_sparse.c,v 1.18 2011/07/01 19:28:00 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space_sparse.c,v 1.19 2016/07/11 16:18:55 matt Exp $");
 #include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/bus.h>
 #include <sys/malloc.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #include <uvm/uvm_extern.h>
-#include <mips/cpuregs.h>
+#include <mips/locore.h>
 #include <mips/pte.h>
 #include <sys/bus.h>
 extern paddr_t kvtophys(vaddr_t);	/* XXX */
 static void arc_kseg2_make_cacheable(vaddr_t vaddr, vsize_t size);
 static void
 arc_kseg2_make_cacheable(vaddr_t vaddr, vsize_t size)
 	vaddr_t start, end;
 	pt_entry_t *pte;
 	uint32_t entry, mask;
 	start = mips_trunc_page(vaddr);
 	end = mips_round_page(vaddr + size);
 	mask = ~(CPUISMIPS3 ? MIPS3_PG_UNCACHED : MIPS1_PG_N);
 	for (; start < end; start += PAGE_SIZE) {
 		pte = kvtopte(start);
 		entry = pte->pt_entry & mask;
 		pte->pt_entry &= entry;
 		tlb_update(start, entry);
 void
 arc_sparse_bus_space_init(bus_space_tag_t bst, const char *name, paddr_t paddr,
     bus_addr_t start, bus_size_t size)
+{
 	arc_bus_space_init(bst, name, paddr, ARC_BUS_SPACE_UNMAPPED,
 	    start, size);
 	bst->bs_compose_handle = arc_sparse_bus_space_compose_handle;
 	bst->bs_dispose_handle = arc_sparse_bus_space_dispose_handle;
 	bst->bs_paddr = arc_sparse_bus_space_paddr;
+}
 int
 arc_sparse_bus_space_compose_handle(bus_space_tag_t bst, bus_addr_t addr,
     bus_size_t size, int flags, bus_space_handle_t *bshp)
+{
 	bus_size_t offset = addr - bst->bs_start;
 	/*
 	 * Since all buses can be linearly mappable, we don't have to check
 	 * BUS_SPACE_MAP_LINEAR and BUS_SPACE_MAP_PREFETCHABLE.
 	 */
-	int cacheable = (flags & BUS_SPACE_MAP_CACHEABLE);
+	const u_int pmap_flags = (flags & BUS_SPACE_MAP_CACHEABLE)
 	    ? PMAP_WRITE_BACK
 	    : 0;
 	/*
 	 * XXX - `bst->bs_pbase' must be page aligned,
 	 * mips_trunc/round_page() cannot treat paddr_t due to overflow.
 	 */
 	paddr_t start = bst->bs_pbase + mips_trunc_page(offset);
 	paddr_t end = bst->bs_pbase + mips_round_page(offset + size);
 	if (end <= MIPS_KSEG1_START - MIPS_KSEG0_START) {
 		/* mappable on KSEG0 or KSEG1 */
 		*bshp = (cacheable ?
 		    MIPS_PHYS_TO_KSEG0(start) :
 		    MIPS_PHYS_TO_KSEG1(start));
 	} else {
-		vaddr_t va,
+		vaddr_t vaddr = uvm_km_alloc(kernel_map, (vsize_t)(end - start),
-		    vaddr = uvm_km_alloc(kernel_map, (vsize_t)(end - start), 0,
+, UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
 		    UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
 		if (vaddr == 0)
 			panic("arc_sparse_bus_space_compose_handle: "
 			      "cannot allocate KVA 0x%llx..0x%llx",
 			      start, end);
-		for (va = vaddr; start < end;
+		for (vaddr_t va = vaddr; start < end;
-		     start += PAGE_SIZE, va += PAGE_SIZE)
+		     start += PAGE_SIZE, va += PAGE_SIZE) {
-			pmap_kenter_pa(va, start,
+			pmap_kenter_pa(va, start, VM_PROT_READ|VM_PROT_WRITE,
-			    VM_PROT_READ|VM_PROT_WRITE, 0);
+			    pmap_flags);
+		}
 		pmap_update(pmap_kernel());
 		vaddr += (offset & PGOFSET);
 		if (cacheable)
 			arc_kseg2_make_cacheable(vaddr, size);
 		*bshp = vaddr;
+	}
 	return 0;
+}
 int
 arc_sparse_bus_space_dispose_handle(bus_space_tag_t bst, bus_space_handle_t bsh,
     bus_size_t size)
+{
 	vaddr_t start = mips_trunc_page(bsh);
 	vaddr_t end = mips_round_page(bsh + size);
 	if (start < MIPS_KSEG2_START) /* KSEG0/KSEG1 */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: c_nec_eisa.c,v 1.16 2011/02/20 07:52:42 matt Exp $	*/
+/*	$NetBSD: c_nec_eisa.c,v 1.17 2016/07/11 16:18:55 matt Exp $	*/
 /*-
  * Copyright (c) 2003 Izumi Tsutsui.  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.
+ *
 @@ -45,37 +45,39 @@
  * 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.
  */
 /*
  * for NEC EISA generation machines.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: c_nec_eisa.c,v 1.16 2011/02/20 07:52:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: c_nec_eisa.c,v 1.17 2016/07/11 16:18:55 matt Exp $");
 #define __INTR_PRIVATE
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kcore.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <uvm/uvm_extern.h>
 #include <mips/locore.h>
 #include <machine/autoconf.h>
 #include <machine/pio.h>
 #include <machine/platform.h>
 #include <machine/wired_map.h>
 #include <mips/pte.h>
 #include <dev/isa/isavar.h>
 #include <arc/arc/arcbios.h>
 #include <arc/jazz/pica.h>
 #include <arc/jazz/rd94.h>
 #include <arc/jazz/jazziovar.h>
 #include <arc/isa/isabrvar.h>

 @@ -1,14 +1,14 @@
-/*	$NetBSD: interrupt.c,v 1.5 2012/10/27 17:17:46 chs Exp $	*/
+/*	$NetBSD: interrupt.c,v 1.6 2016/07/11 16:18:56 matt Exp $	*/
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code was written by Alessandro Forin and Neil Pittman
  * at Microsoft Research and contributed to The NetBSD Foundation
  * by Microsoft 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
 @@ -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(0, "$NetBSD: interrupt.c,v 1.5 2012/10/27 17:17:46 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.6 2016/07/11 16:18:56 matt Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <uvm/uvm_extern.h>
 #include <mips/psl.h>
 #include <machine/locore.h>
 #include <machine/autoconf.h>
 #include <machine/sysconf.h>
 #include <machine/intr.h>
 @@ -74,31 +74,31 @@ intr_init(void)
 	for (i = 0; i < MAX_DEV_NCOOKIES; i++) {
 		evcnt_attach_dynamic(&intrtab[i].ih_count,
 		    EVCNT_TYPE_INTR, NULL, "emips", intrnames[i]);
+	}
 	/* I am trying to make this standard so its here. Bah. */
 	struct tlbmask tlb;
 	/* This is ugly but efficient. Sigh. */
 #define TheAic ((struct _Aic *)INTERRUPT_CONTROLLER_DEFAULT_ADDRESS)
 	tlb.tlb_hi = INTERRUPT_CONTROLLER_DEFAULT_ADDRESS;
 	tlb.tlb_lo0 = INTERRUPT_CONTROLLER_DEFAULT_ADDRESS | 0xf02;
-	tlb_write_indexed(4, &tlb);
+	tlb_write_entry(4, &tlb);
 	tlb.tlb_hi = TIMER_DEFAULT_ADDRESS;
 	tlb.tlb_lo0 = TIMER_DEFAULT_ADDRESS | 0xf02;
-	tlb_write_indexed(5, &tlb);
+	tlb_write_entry(5, &tlb);
+}
 /*
  * emips uses one line for all I/O interrupts (0x8000).
  */
 void
 cpu_intr(int ppl, uint32_t status, vaddr_t pc)
+{
 	uint32_t ipending;
 	int ipl;
 	curcpu()->ci_data.cpu_nintr++;

 @@ -1,14 +1,14 @@
-/* $NetBSD: xilinx_ml40x.c,v 1.3 2014/03/24 20:06:31 christos Exp $ */
+/* $NetBSD: xilinx_ml40x.c,v 1.4 2016/07/11 16:18:56 matt Exp $ */
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code was written by Alessandro Forin and Neil Pittman
  * at Microsoft Research and contributed to The NetBSD Foundation
  * by Microsoft 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
 @@ -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(0, "$NetBSD: xilinx_ml40x.c,v 1.3 2014/03/24 20:06:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xilinx_ml40x.c,v 1.4 2016/07/11 16:18:56 matt Exp $");
 #define __INTR_PRIVATE
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/cpu.h>
 #include <uvm/uvm_extern.h>
 #include <machine/cpu.h>
 #include <machine/intr.h>
 #include <machine/sysconf.h>
 @@ -112,18 +112,18 @@ xilinx_ml40x_cons_init(void)
+{
 	/*
 	 * Map the USART 1:1, we just turned on the TLB.
 	 * NB: This must be a wired TLB entry lest we lose it before autoconf().
 	 */
 #if 0
 	pmap_kenter_pa(USART_DEFAULT_ADDRESS,
 	    USART_DEFAULT_ADDRESS,VM_PROT_WRITE|VM_PROT_READ);
 #else
 	struct tlbmask tlb;
 	tlb.tlb_hi = USART_DEFAULT_ADDRESS;
 	tlb.tlb_lo0 = USART_DEFAULT_ADDRESS | 0xf02;
-	tlb_write_indexed(3, &tlb);
+	tlb_write_entry(3, &tlb);
 #endif
 	dz_ebus_cnsetup(USART_DEFAULT_ADDRESS);
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: xs_bee3.c,v 1.4 2014/03/24 20:06:31 christos Exp $ */
+/* $NetBSD: xs_bee3.c,v 1.5 2016/07/11 16:18:56 matt Exp $ */
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code was written by Alessandro Forin and Neil Pittman
  * at Microsoft Research and contributed to The NetBSD Foundation
  * by Microsoft 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
 @@ -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(0, "$NetBSD: xs_bee3.c,v 1.4 2014/03/24 20:06:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xs_bee3.c,v 1.5 2016/07/11 16:18:56 matt Exp $");
 #define __INTR_PRIVATE
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/cpu.h>
 #include <sys/intr.h>
 #include <uvm/uvm_extern.h>
 #include <machine/sysconf.h>
 #include <machine/locore.h>
 @@ -109,18 +109,18 @@ xs_bee3_cons_init(void)
 	/*
 	 * Map the USART 1:1, we just turned on the TLB.
 	 * NB: This must be a wired TLB entry lest we lose it before autoconf().
 	 */
 #if 0
 	pmap_kenter_pa(USART_DEFAULT_ADDRESS,
 	    USART_DEFAULT_ADDRESS,VM_PROT_WRITE|VM_PROT_READ);
 #else
 	struct tlbmask tlb;
 	tlb.tlb_hi = USART_DEFAULT_ADDRESS;
 	tlb.tlb_lo0 = USART_DEFAULT_ADDRESS | 0xf02;
-	tlb_write_indexed(3, &tlb);
+	tlb_write_entry(3, &tlb);
 #endif
 	dz_ebus_cnsetup(USART_DEFAULT_ADDRESS);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.5 2015/06/10 22:31:00 matt Exp $	*/
+/*	$NetBSD: machdep.c,v 1.6 2016/07/11 16:18:56 matt Exp $	*/
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe and Simon Burge 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
 @@ -104,27 +104,27 @@
  * 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.
+ *
  *	@(#)machdep.c   8.3 (Berkeley) 1/12/94
  *	from: Utah Hdr: machdep.c 1.63 91/04/24
  */
 #include "opt_multiprocessor.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.5 2015/06/10 22:31:00 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.6 2016/07/11 16:18:56 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/buf.h>
 #include <sys/cpu.h>
 #include <sys/reboot.h>
 #include <sys/mount.h>
 #include <sys/kcore.h>
 #include <sys/boot_flag.h>
 #include <sys/termios.h>
 #include <sys/ksyms.h>
 @@ -169,40 +169,42 @@ int	comcnrate = 115200;	/* XXX should be
 /* Maps for VM objects. */
 struct vm_map *phys_map = NULL;
 int	netboot;
 phys_ram_seg_t mem_clusters[VM_PHYSSEG_MAX];
 int mem_cluster_cnt;
 void	mach_init(uint64_t, uint64_t, uint64_t, uint64_t);
 struct octeon_config octeon_configuration;
 struct octeon_btinfo octeon_btinfo;
 char octeon_nmi_stack[PAGE_SIZE] __section(".data1") __aligned(PAGE_SIZE);
 /*
  * Do all the stuff that locore normally does before calling main().
  */
 void
 mach_init(uint64_t arg0, uint64_t arg1, uint64_t arg2, uint64_t arg3)
+{
 	uint64_t btinfo_paddr;
 	u_quad_t memsize;
 	int corefreq;
 	mach_init_bss();
 	KASSERT(MIPS_XKPHYS_P(arg3));
-	btinfo_paddr = mips64_ld_a64(arg3 + OCTEON_BTINFO_PADDR_OFFSET);
+	btinfo_paddr = mips3_ld(arg3 + OCTEON_BTINFO_PADDR_OFFSET);
 	/* Should be in first 256MB segment */
 	KASSERT(btinfo_paddr < 256 * 1024 * 1024);
 	memcpy(&octeon_btinfo,
 	    (struct octeon_btinfo *)MIPS_PHYS_TO_KSEG0(btinfo_paddr),
 	    sizeof(octeon_btinfo));
 	corefreq = octeon_btinfo.obt_eclock_hz;
 	memsize = octeon_btinfo.obt_dram_size * 1024 * 1024;
 	octeon_cal_timer(corefreq);
 	switch (MIPS_PRID_IMPL(mips_options.mips_cpu_id)) {
 @@ -225,26 +227,38 @@ mach_init(uint64_t arg0, uint64_t arg1,
 	mach_init_console();
 	mach_init_memory(memsize);
 	/*
 	 * Allocate uarea page for lwp0 and set it.
 	 */
 	mips_init_lwp0_uarea();
 	boothowto = RB_AUTOBOOT;
 	boothowto |= AB_VERBOSE;
 #if 0
 	curcpu()->ci_nmi_stack = octeon_nmi_stack + sizeof(octeon_nmi_stack) - sizeof(struct kernframe);
 	*(uint64_t *)MIPS_PHYS_TO_KSEG0(0x800) = (intptr_t)octeon_reset_vector;
 	const uint64_t wdog_reg = MIPS_PHYS_TO_XKPHYS_UNCACHED(CIU_WDOG0);
 	uint64_t wdog = mips3_ld(wdog_reg);
 	wdog &= ~(CIU_WDOGX_MODE|CIU_WDOGX_LEN);
 	wdog |= __SHIFTIN(3, CIU_WDOGX_MODE);
 	wdog |= CIU_WDOGX_LEN;		// max period
 	mips64_sd_a64(wdog_reg, wdog);
 	printf("Watchdog enabled!\n");
 #endif
 #if defined(DDB)
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
+}
 void
 consinit(void)
+{
 	/*
 	 * Everything related to console initialization is done
 	 * in mach_init().

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.18 2016/02/01 17:37:39 christos Exp $	*/
+/*	$NetBSD: machdep.c,v 1.19 2016/07/11 16:18:56 matt Exp $	*/
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe and Simon Burge 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
 @@ -64,27 +64,27 @@
  * 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.
+ *
  *	@(#)machdep.c   8.3 (Berkeley) 1/12/94
  *	from: Utah Hdr: machdep.c 1.63 91/04/24
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.18 2016/02/01 17:37:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.19 2016/07/11 16:18:56 matt Exp $");
 #include "opt_ddb.h"
 #include "opt_execfmt.h"
 #include "opt_modular.h"
 #include <sys/param.h>
 #include <sys/boot_flag.h>
 #include <sys/buf.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/kcore.h>
 #include <sys/kernel.h>
 #include <sys/ksyms.h>
 @@ -245,27 +245,27 @@ mach_init(int argc, char **argv, char **
 	/*
 	 * Override the null bonito_pci_attach_hook with our own to we can
 	 * fix the ralink (device 13).
 	 */
 	gc->gc_pc.pc_attach_hook = gdium_pci_attach_hook;
 	gdium_bus_io_init(&gc->gc_iot, gc);
 	gdium_bus_mem_init(&gc->gc_memt, gc);
 	gdium_dma_init(gc);
 	gdium_cnattach(gc);
 	/*
 	 * Disable the 2nd PCI window since we don't need it.
 	 */
-	mips3_sd((uint64_t *)MIPS_PHYS_TO_KSEG1(BONITO_REGBASE + 0x158), 0xe);
+	mips3_sd(MIPS_PHYS_TO_KSEG1(BONITO_REGBASE + 0x158), 0xe);
 	pci_conf_write(&gc->gc_pc, pci_make_tag(&gc->gc_pc, 0, 0, 0), 18, 0);
 	/*
 	 * Get the timer from PMON.
 	 */
 	for (i = 0; envp[i] != NULL; i++) {
 		if (!strncmp(envp[i], "cpuclock=", 9)) {
 			curcpu()->ci_cpu_freq =
 			    strtoul(&envp[i][9], NULL, 10);
 			break;
+		}
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.44 2015/06/01 22:55:12 matt Exp $	*/
+/*	$NetBSD: machdep.c,v 1.45 2016/07/11 16:18:56 matt Exp $	*/
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe and Simon Burge 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
 @@ -64,27 +64,27 @@
  * 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.
+ *
  *	@(#)machdep.c   8.3 (Berkeley) 1/12/94
  *	from: Utah Hdr: machdep.c 1.63 91/04/24
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.44 2015/06/01 22:55:12 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.45 2016/07/11 16:18:56 matt Exp $");
 #include "opt_ddb.h"
 #include "opt_execfmt.h"
 #include "opt_modular.h"
 #include <sys/param.h>
 #include <sys/boot_flag.h>
 #include <sys/buf.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/kcore.h>
 #include <sys/kernel.h>
 #include <sys/ksyms.h>
 @@ -268,27 +268,27 @@ mach_init(int argc, char **argv, yamon_e
 	/*
 	 * Allocate uarea page for lwp0 and set it.
 	 */
 	mips_init_lwp0_uarea();
 	/*
 	 * Initialize debuggers, and break into them, if appropriate.
 	 */
 #if defined(DDB)
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
-#ifdef MULTIPROCESSOR
+#if defined(MULTIPROCESSOR) && 0
 	/*
 	 * We can never be running on more than one processor but we can dream.
 	 */
 	mips_fixup_exceptions(mips_fixup_zero_relative, NULL);
 #endif
+}
 void
 consinit(void)
+{
 	/*
 	 * Everything related to console initialization is done

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus_space.c,v 1.31 2012/01/27 18:52:56 para Exp $	*/
+/*	$NetBSD: bus_space.c,v 1.32 2016/07/11 16:18:56 matt Exp $	*/
 /*-
  * Copyright (c) 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
 @@ -21,39 +21,40 @@
  * ``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: bus_space.c,v 1.31 2012/01/27 18:52:56 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.32 2016/07/11 16:18:56 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/extent.h>
 #include <sys/bus.h>
 #include <uvm/uvm_extern.h>
 #include <mips/cache.h>
 #include <mips/locore.h>
 #include <mips/pte.h>
 #include <machine/bus.h>
 #include <machine/bus_space_hpcmips.h>
 #ifdef BUS_SPACE_DEBUG
 #define	DPRINTF(arg) printf arg
 #else
 #define	DPRINTF(arg)
 #endif
 #define MAX_BUSSPACE_TAG 10
 /* proto types */
 bus_space_handle_t __hpcmips_cacheable(struct bus_space_tag_hpcmips*,
     bus_addr_t, bus_size_t, int);
 @@ -214,59 +215,57 @@ hpcmips_init_bus_space(struct bus_space_
+		}
 		pmap_update(pmap_kernel());
+	}
 	t->extent = (void*)extent_create(t->name, t->base,
 	    t->base + t->size,
 , 0, EX_NOWAIT);
 	if (!t->extent) {
 		panic("hpcmips_init_bus_space_extent:"
 		    "unable to allocate %s map", t->name);
+	}
+}
 static bool
 mips_pte_cachechange(struct pmap *pmap, vaddr_t sva, vaddr_t eva,
     pt_entry_t *ptep, uintptr_t flags)
+{
 	mips_dcache_wbinv_range(sva, eva - sva);
 	for (; sva < eva; sva += PAGE_SIZE) {
 		pt_entry_t pte = pte_cached_change(*ptep, flags);
 		/*
 		 * Update the same virtual address entry.
 		 */
 		*ptep = pte;
 		tlb_update_addr(sva, KERNEL_PID, pte, 0);
+	}
 	return false;
+}
 bus_space_handle_t
 __hpcmips_cacheable(struct bus_space_tag_hpcmips *t, bus_addr_t bpa,
     bus_size_t size, int cacheable)
+{
 	vaddr_t va, endva;
 	pt_entry_t *pte;
 	u_int32_t opte, npte;
 	if (t->base >= MIPS_KSEG2_START) {
-		va = mips_trunc_page(bpa);
+		const vaddr_t sva = mips_trunc_page(bpa);
-		endva = mips_round_page(bpa + size);
+		const vaddr_t eva = mips_round_page(bpa + size);
-		npte = CPUISMIPS3 ? MIPS3_PG_UNCACHED : MIPS1_PG_N;
+		pmap_pte_process(pmap_kernel(), sva, eva,
 		    mips_pte_cachechange, cacheable);
-		mips_dcache_wbinv_range(va, endva - va);
+		return bpa;
 		for (; va < endva; va += PAGE_SIZE) {
 			pte = kvtopte(va);
 			opte = pte->pt_entry;
 			if (cacheable) {
 				opte &= ~npte;
 			} else {
 				opte |= npte;
 			pte->pt_entry = opte;
 			/*
 			 * Update the same virtual address entry.
 			 */
 			tlb_update(va, opte);
 		return (bpa);
+	}
-	return (cacheable ? MIPS_PHYS_TO_KSEG0(bpa) : MIPS_PHYS_TO_KSEG1(bpa));
+	return cacheable ? MIPS_PHYS_TO_KSEG0(bpa) : MIPS_PHYS_TO_KSEG1(bpa);
+}
 /* ARGSUSED */
 int
 __bs_map(bus_space_tag_t tx, bus_addr_t bpa, bus_size_t size, int flags,
     bus_space_handle_t *bshp)
+{
 	struct bus_space_tag_hpcmips *t = (struct bus_space_tag_hpcmips *)tx;
 	int err;
 	int cacheable = flags & BUS_SPACE_MAP_CACHEABLE;
 	DPRINTF(("\tbus_space_map:%#lx(%#lx)+%#lx\n",
 	    bpa, bpa + t->base, size));

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tx3912video.c,v 1.44 2016/07/09 06:49:03 skrll Exp $ */
+/*	$NetBSD: tx3912video.c,v 1.45 2016/07/11 16:18:56 matt Exp $ */
 /*-
  * Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by UCHIYAMA Yasushi.
+ *
  * 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,48 +20,50 @@
  * ``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: tx3912video.c,v 1.44 2016/07/09 06:49:03 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tx3912video.c,v 1.45 2016/07/11 16:18:56 matt Exp $");
 #define TX3912VIDEO_DEBUG
 #include "hpcfb.h"
 #include "bivideo.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/ioctl.h>
 #include <uvm/uvm_extern.h>
 #include <dev/cons.h> /* consdev */
 #include <machine/bus.h>
 #include <machine/bootinfo.h>
 #include <machine/config_hook.h>
 #include <mips/locore.h>
 #include <hpcmips/tx/tx39var.h>
 #include <hpcmips/tx/tx3912videovar.h>
 #include <hpcmips/tx/tx3912videoreg.h>
 /* CLUT */
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/rasops/rasops.h>
 #include <dev/hpc/video_subr.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/hpc/hpcfbvar.h>
 #include <dev/hpc/hpcfbio.h>
 #if NBIVIDEO > 0