 @@ -1,14 +1,14 @@
-/* $NetBSD: bus_space.c,v 1.3 2018/04/09 22:26:15 jmcneill Exp $ */
+/* $NetBSD: bus_space.c,v 1.4 2018/06/08 18:09:43 jmcneill Exp $ */
 /*
  * Copyright (c) 2017 Ryo Shimizu <ryo@nerv.org>
  * 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.
 @@ -17,27 +17,27 @@
  * 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 AUTHOR 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: bus_space.c,v 1.3 2018/04/09 22:26:15 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bus_space.c,v 1.4 2018/06/08 18:09:43 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <uvm/uvm_extern.h>
 #include <aarch64/bus_funcs.h>
 #include <aarch64/machdep.h>
 /* Prototypes for all the bus_space structure functions */
 bs_protos(generic)
 @@ -606,31 +606,31 @@ generic_bs_barrier(void *t, bus_space_ha
 void *
 generic_bs_vaddr(void *t, bus_space_handle_t bsh)
+{
 	return (void *)bsh;
+}
 paddr_t
 generic_bs_mmap(void *t, bus_addr_t bpa, off_t offset, int prot, int flags)
+{
 	paddr_t bus_flags = 0;
 	if ((flags & BUS_SPACE_MAP_CACHEABLE) != 0)
-		bus_flags |= (AARCH64_MMAP_WRITEBACK << AARCH64_MMAP_FLAG_SHIFT);
+		bus_flags |= ARM_MMAP_WRITEBACK;
 	else if ((flags & BUS_SPACE_MAP_PREFETCHABLE) != 0)
-		bus_flags |= (AARCH64_MMAP_WRITECOMBINE << AARCH64_MMAP_FLAG_SHIFT);
+		bus_flags |= ARM_MMAP_WRITECOMBINE;
 	else
-		bus_flags |= (AARCH64_MMAP_DEVICE << AARCH64_MMAP_FLAG_SHIFT);
+		bus_flags |= ARM_MMAP_DEVICE;
 	return (atop(bpa + (offset << ((struct bus_space *)t)->bs_stride)) |
 	    bus_flags);
+}
 int
 generic_bs_alloc(void *t, bus_addr_t rstart, bus_addr_t rend,
     bus_size_t size, bus_size_t alignment, bus_size_t boundary, int flags,
     bus_addr_t *bpap, bus_space_handle_t *bshp)
+{
 	panic("%s(): not implemented\n", __func__);
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: pmap.h,v 1.4 2018/04/27 08:07:08 ryo Exp $ */
+/* $NetBSD: pmap.h,v 1.5 2018/06/08 18:09:43 jmcneill Exp $ */
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas of 3am Software Foundry.
+ *
  * 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.
 @@ -140,30 +140,31 @@ paddr_t pmap_devmap_vtophys(paddr_t);
 		.pd_prot = VM_PROT_READ|VM_PROT_WRITE,	\
 		.pd_flags = PMAP_NOCACHE		\
+	}
 #define	DEVMAP_ENTRY_END	{ 0 }
 /* mmap cookie and flags */
 #define AARCH64_MMAP_FLAG_SHIFT		(64 - PGSHIFT)
 #define AARCH64_MMAP_FLAG_MASK		0xf
 #define AARCH64_MMAP_WRITEBACK		0UL
 #define AARCH64_MMAP_NOCACHE		1UL
 #define AARCH64_MMAP_WRITECOMBINE	2UL
 #define AARCH64_MMAP_DEVICE		3UL
-#define ARM_MMAP_WRITECOMBINE		AARCH64_MMAP_WRITECOMBINE
+#define ARM_MMAP_MASK			__BITS(63, AARCH64_MMAP_FLAG_SHIFT)
-#define ARM_MMAP_WRITEBACK		AARCH64_MMAP_WRITEBACK
+#define ARM_MMAP_WRITECOMBINE		__SHIFTIN(AARCH64_MMAP_WRITECOMBINE, ARM_MMAP_MASK)
-#define ARM_MMAP_NOCACHE		AARCH64_MMAP_NOCACHE
+#define ARM_MMAP_WRITEBACK		__SHIFTIN(AARCH64_MMAP_WRITEBACK, ARM_MMAP_MASK)
-#define ARM_MMAP_DEVICE			AARCH64_MMAP_DEVICE
+#define ARM_MMAP_NOCACHE		__SHIFTIN(AARCH64_MMAP_NOCACHE, ARM_MMAP_MASK)
 #define ARM_MMAP_DEVICE			__SHIFTIN(AARCH64_MMAP_DEVICE, ARM_MMAP_MASK)
 #define	PMAP_PTE			0x10000000 /* kenter_pa */
 #define	PMAP_DEV			0x20000000 /* kenter_pa */
 static inline u_int
 aarch64_mmap_flags(paddr_t mdpgno)
+{
 	u_int nflag, pflag;
 	/*
 	 * aarch64 arch has 4 memory attribute:
+	 *
 	 *  WriteBack      - write back cache

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bcm283x_platform.c,v 1.4 2018/04/01 04:35:03 ryo Exp $	*/
+/*	$NetBSD: bcm283x_platform.c,v 1.5 2018/06/08 18:09:43 jmcneill Exp $	*/
 /*-
  * Copyright (c) 2017 Jared D. McNeill <jmcneill@invisible.ca>
  * 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.
 @@ -17,27 +17,27 @@
  * 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 AUTHOR 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: bcm283x_platform.c,v 1.4 2018/04/01 04:35:03 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.5 2018/06/08 18:09:43 jmcneill Exp $");
 #include "opt_arm_debug.h"
 #include "opt_bcm283x.h"
 #include "opt_cpuoptions.h"
 #include "opt_ddb.h"
 #include "opt_evbarm_boardtype.h"
 #include "opt_kgdb.h"
 #include "opt_fdt.h"
 #include "opt_rpi.h"
 #include "opt_vcprop.h"
 #include "sdhc.h"
 #include "bcmsdhost.h"
 @@ -126,61 +126,92 @@ extern struct bus_space arm_generic_a4x_
 bs_protos(arm_generic);
 bs_protos(arm_generic_a4x);
 bs_protos(bcm2835);
 bs_protos(bcm2835_a4x);
 bs_protos(bcm2836);
 bs_protos(bcm2836_a4x);
 struct bus_space bcm2835_bs_tag;
 struct bus_space bcm2835_a4x_bs_tag;
 struct bus_space bcm2836_bs_tag;
 struct bus_space bcm2836_a4x_bs_tag;
 int bcm283x_bs_map(void *, bus_addr_t, bus_size_t, int, bus_space_handle_t *);
 paddr_t bcm283x_bs_mmap(void *, bus_addr_t, off_t, int, int);
 paddr_t bcm283x_a4x_bs_mmap(void *, bus_addr_t, off_t, int, int);
 int
 bcm283x_bs_map(void *t, bus_addr_t ba, bus_size_t size, int flag,
     bus_space_handle_t *bshp)
+{
 	u_long startpa, endpa, pa;
 	vaddr_t va;
 	/* Convert BA to PA */
 	pa = ba & ~BCM2835_BUSADDR_CACHE_MASK;
 	startpa = trunc_page(pa);
 	endpa = round_page(pa + size);
 	/* XXX use extent manager to check duplicate mapping */
 	va = uvm_km_alloc(kernel_map, endpa - startpa, 0,
 	    UVM_KMF_VAONLY | UVM_KMF_NOWAIT | UVM_KMF_COLORMATCH);
 	if (!va)
 		return ENOMEM;
 	*bshp = (bus_space_handle_t)(va + (pa - startpa));
-	const int pmapflags =
+	int pmapflags;
-	    (flag & (BUS_SPACE_MAP_CACHEABLE|BUS_SPACE_MAP_PREFETCHABLE))
+	if (flag & BUS_SPACE_MAP_PREFETCHABLE)
-		? 0
+		pmapflags = PMAP_WRITE_COMBINE;
-		: PMAP_NOCACHE;
+	else if (flag & BUS_SPACE_MAP_CACHEABLE)
 		pmapflags = 0;
 	else
 		pmapflags = PMAP_NOCACHE;
 	for (pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
 		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, pmapflags);
+	}
 	pmap_update(pmap_kernel());
 	return 0;
+}
 paddr_t
 bcm283x_bs_mmap(void *t, bus_addr_t bpa, off_t offset, int prot, int flags)
+{
 	/* Convert BA to PA */
 	const paddr_t pa = bpa & ~BCM2835_BUSADDR_CACHE_MASK;
 	paddr_t bus_flags = 0;
 	if (flags & BUS_SPACE_MAP_PREFETCHABLE)
 		bus_flags |= ARM_MMAP_WRITECOMBINE;
 	return arm_btop(pa + offset) | bus_flags;
+}
 paddr_t
 bcm283x_a4x_bs_mmap(void *t, bus_addr_t bpa, off_t offset, int prot, int flags)
+{
 	/* Convert BA to PA */
 	const paddr_t pa = bpa & ~BCM2835_BUSADDR_CACHE_MASK;
 	paddr_t bus_flags = 0;
 	if (flags & BUS_SPACE_MAP_PREFETCHABLE)
 		bus_flags |= ARM_MMAP_WRITECOMBINE;
 	return arm_btop(pa + 4 * offset) | bus_flags;
+}
 int
 bcm2835_bs_map(void *t, bus_addr_t ba, bus_size_t size, int flag,
     bus_space_handle_t *bshp)
+{
 	const struct pmap_devmap *pd;
 	bool match = false;
 	u_long pa;
 	/* Attempt to find the PA device mapping */
 	if (ba >= BCM2835_PERIPHERALS_BASE_BUS &&
 	    ba < BCM2835_PERIPHERALS_BASE_BUS + BCM2835_PERIPHERALS_SIZE) {
 		match = true;
 		pa = BCM2835_PERIPHERALS_BUS_TO_PHYS(ba);
 @@ -1153,46 +1184,50 @@ SYSCTL_SETUP(sysctl_machdep_rpi, "sysctl
 	    CTLTYPE_QUAD, "serial", NULL, NULL, 0,
 	    &vb.vbt_serial.sn, 0, CTL_MACHDEP, CTL_CREATE, CTL_EOL);
+}
 #if defined(SOC_BCM2835)
 static void
 bcm2835_platform_bootstrap(void)
+{
 	bcm2835_bs_tag = arm_generic_bs_tag;
 	bcm2835_a4x_bs_tag = arm_generic_a4x_bs_tag;
 	bcm2835_bs_tag.bs_map = bcm2835_bs_map;
 	bcm2835_bs_tag.bs_mmap = bcm283x_bs_mmap;
 	bcm2835_a4x_bs_tag.bs_map = bcm2835_bs_map;
 	bcm2835_a4x_bs_tag.bs_mmap = bcm283x_a4x_bs_mmap;
 	fdtbus_set_decoderegprop(false);
 	bcm2835_uartinit();
 	bcm2835_bootparams();
+}
 #endif
 #if defined(SOC_BCM2836)
 static void
 bcm2836_platform_bootstrap(void)
+{
 	bcm2836_bs_tag = arm_generic_bs_tag;
 	bcm2836_a4x_bs_tag = arm_generic_a4x_bs_tag;
 	bcm2836_bs_tag.bs_map = bcm2836_bs_map;
 	bcm2836_bs_tag.bs_mmap = bcm283x_bs_mmap;
 	bcm2836_a4x_bs_tag.bs_map = bcm2836_bs_map;
 	bcm2836_a4x_bs_tag.bs_mmap = bcm283x_a4x_bs_mmap;
 	fdtbus_set_decoderegprop(false);
 	bcm2836_uartinit();
 	bcm2836_bootparams();
 	bcm2836_bootstrap();
+}
 #endif
 #if defined(SOC_BCM2835)
 static void