 @@ -1,14 +1,14 @@
-/* $NetBSD: bus_space.c,v 1.2 2018/04/01 04:35:03 ryo Exp $ */
+/* $NetBSD: bus_space.c,v 1.3 2018/04/09 22:26:15 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.2 2018/04/01 04:35:03 ryo Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bus_space.c,v 1.3 2018/04/09 22:26:15 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)
 @@ -605,28 +605,32 @@ 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|BUS_SPACE_MAP_PREFETCHABLE)) != 0)
+	if ((flags & BUS_SPACE_MAP_CACHEABLE) != 0)
-		bus_flags |= AARCH64_MMAP_WRITEBACK;
+		bus_flags |= (AARCH64_MMAP_WRITEBACK << AARCH64_MMAP_FLAG_SHIFT);
 	else if ((flags & BUS_SPACE_MAP_PREFETCHABLE) != 0)
 		bus_flags |= (AARCH64_MMAP_WRITECOMBINE << AARCH64_MMAP_FLAG_SHIFT);
 	else
 		bus_flags |= (AARCH64_MMAP_DEVICE << AARCH64_MMAP_FLAG_SHIFT);
 	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.2 2018/04/01 04:35:03 ryo Exp $ */
+/* $NetBSD: pmap.h,v 1.3 2018/04/09 22:26:16 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,30 @@ paddr_t pmap_devmap_vtophys(paddr_t);
 #define	DEVMAP_ENTRY(va, pa, sz)			\
 	{						\
 		.pd_va = DEVMAP_TRUNC_ADDR(va),		\
 		.pd_pa = DEVMAP_TRUNC_ADDR(pa),		\
 		.pd_size = DEVMAP_ROUND_SIZE(sz),	\
 		.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		0
+#define AARCH64_MMAP_WRITEBACK		0UL
-#define AARCH64_MMAP_NOCACHE		1
+#define AARCH64_MMAP_NOCACHE		1UL
-#define AARCH64_MMAP_WRITECOMBINE	2
+#define AARCH64_MMAP_WRITECOMBINE	2UL
-#define AARCH64_MMAP_DEVICE		3
+#define AARCH64_MMAP_DEVICE		3UL
 #define ARM_MMAP_WRITECOMBINE		AARCH64_MMAP_WRITECOMBINE
 #define ARM_MMAP_WRITEBACK		AARCH64_MMAP_WRITEBACK
 #define ARM_MMAP_NOCACHE		AARCH64_MMAP_NOCACHE
 #define ARM_MMAP_DEVICE			AARCH64_MMAP_DEVICE
 #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;