 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile.inc,v 1.3 2019/04/17 07:40:34 mrg Exp $
+#	$NetBSD: Makefile.inc,v 1.4 2019/06/01 12:42:27 maxv Exp $
 .for op in add and cas nand or sub swap xor
 sizes=32
 .if "${MLIBDIR}" != ""
 .if ${COMMON_MACHINE_ARCH} == "riscv64"
 sizes+=64
 .endif
 .elif ${MACHINE_ARCH} == "riscv64"
 sizes+=64
 .endif
 .for sz in ${sizes}
 SRCS.atomic+=	atomic_${op}_${sz}.S
 .endfor
 @@ -17,18 +17,18 @@ SRCS.atomic+=	atomic_${op}_${sz}_cas.c
 .endfor
 .endfor
 SRCS.atomic+=	membar_ops.S
 SRCS.atomic+=	atomic_cas_by_cas32.c
 .if defined(LIB) && (${LIB} != "kern" && ${LIB} != "rump")
 SRCS.atomic+=	atomic_init_cas.c			\
 		atomic_c11_compare_exchange_cas_16.c    \
 		atomic_c11_compare_exchange_cas_8.c
 .endif #LIB
-.if ${LIB} == "c"
+.if defined(LIB) && ${LIB} == "c"
 SRCS.atomic+=	atomic_and_16_nv_cas.c atomic_and_8_nv_cas.c
 .endif
 SRCS+=	${SRCS.atomic}

 @@ -1,38 +1,38 @@
-# $NetBSD: GENERIC,v 1.9 2018/08/01 20:04:13 maxv Exp $
+# $NetBSD: GENERIC,v 1.10 2019/06/01 12:42:27 maxv Exp $
+#
 # GENERIC machine description file
+#
 # This machine description file is used to generate the default NetBSD
 # kernel.  The generic kernel does not include all options, subsystems
 # and device drivers, but should be useful for most applications.
+#
 # The machine description file can be customised for your specific
 # machine to reduce the kernel size and improve its performance.
+#
 # For further information on compiling NetBSD kernels, see the config(8)
 # man page.
+#
 # For further information on hardware support for this architecture, see
 # the intro(4) man page.  For further information about kernel options
 # for this architecture, see the options(4) man page.  For an explanation
 # of each device driver in this file see the section 4 man page for the
 # device.
 include	"arch/riscv/conf/std.riscv64"
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
-#ident 		"GENERIC-$Revision: 1.9 $"
+#ident 		"GENERIC-$Revision: 1.10 $"
 maxusers	64		# estimated number of users
 # Standard system options
 options 	NTP		# NTP phase/frequency locked loop
 options 	KTRACE		# system call tracing via ktrace(1)
 # Note: SysV IPC parameters could be changed dynamically, see sysctl(8).
 options 	SYSVMSG		# System V-like message queues
 options 	SYSVSEM		# System V-like semaphores
 options 	SYSVSHM		# System V-like memory sharing
 @@ -64,29 +64,27 @@ options 	DDB		# in-kernel debugger
 #options	DDB_COMMANDONENTER="bt"	# execute command when ddb is entered
 #options 	DDB_ONPANIC=1	# see also sysctl(7): `ddb.onpanic'
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 #options 	KGDB		# remote debugger
 #options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
 #options 	SYSCALL_STATS	# per syscall counts
 #options 	SYSCALL_TIMES	# per syscall times
 #options 	SYSCALL_TIMES_HASCOUNTER	# use 'broken' rdtsc (soekris)
 # Compatibility options
 include 	"conf/compat_netbsd70.config"
 options 	COMPAT_OSSAUDIO
-options 	COMPAT_NETBSD32
+#options 	COMPAT_NETBSD32
 #options 	COMPAT_LINUX
 #options 	COMPAT_LINUX32	# req. COMPAT_LINUX and COMPAT_NETBSD32
 #options 	EXEC_ELF32
 # Wedge support
 options 	DKWEDGE_AUTODISCOVER	# Automatically add dk(4) instances
 options 	DKWEDGE_METHOD_GPT	# Supports GPT partitions as wedges
 options 	DKWEDGE_METHOD_BSDLABEL	# Support disklabel entries as wedges
 options 	DKWEDGE_METHOD_MBR	# Support MBR partitions as wedges
 options		DKWEDGE_METHOD_APPLE    # Support Apple partitions as wedges
 #options	DKWEDGE_METHOD_RDB	# Support RDB partitions as wedges
 include 	"conf/filesystems.config"
 # File system options

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile.riscv,v 1.3 2018/09/22 12:24:03 rin Exp $
+#	$NetBSD: Makefile.riscv,v 1.4 2019/06/01 12:42:27 maxv Exp $
 # Makefile for NetBSD
+#
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/arch/<machine>/conf/``machineid''
 # after which you should do
 #	config machineid
 # Machine generic makefile changes should be made in
 #	/sys/arch/riscv/conf/Makefile.riscv
 # after which config should be rerun for all machines of that type.
+#
 @@ -29,27 +29,26 @@ S=		../../../..
 .endif
 THISRISCV=	$S/arch/${MACHINE}
 RISCV=		$S/arch/riscv
 GENASSYM_CONF=	${RISCV}/riscv/genassym.cf
 .-include "${THISRISCV}/conf/Makefile.${MACHINE}.inc"
 ##
 ## (2) compile settings
 ##
 ## Note: -ffixed-?? must be kept in sync with cpu.h.
 ##
 CPPFLAGS+=	-D${MACHINE}
 CFLAGS+=	-mcmodel=medany
 CFLAGS+=	-msoft-float
 .if !defined(LP64) || ${LP64} == "no"
 CFLAGS+=	-m32
 AFLAGS+=	-m32
 LDFLAGS+=	-m elf32lriscv
 LINKFORMAT+=	-m elf32lriscv
 SYSTEM_LD_TAIL_EXTRA+= \
 		;echo ${OBJCOPY} -O elf32-littleriscv $@ $@.elf32; \
 		${OBJCOPY} -O elf32-littleriscv $@ $@.elf32
 .endif # LP64=no
 AFLAGS+=	-x assembler-with-cpp ${AOPTS}
 ##
 ## (3) libkern and compat
 @@ -60,27 +59,27 @@ OPT_MODULAR=	%MODULAR%
 ## (4) local objects, compile rules, and dependencies
 ##
 MD_OBJS=	locore.o
 MD_CFILES=
 MD_SFILES=	${RISCV}/riscv/locore.S
 locore.o: ${RISCV}/riscv/locore.S assym.h
 	${NORMAL_S}
 ##
 ## (5) link settings
 ##
 .if ${MACHINE_ARCH} == "riscv64" && ${LP64:Uyes} == "yes"
-TEXTADDR?=              0xFFFFFFFF80002000
+TEXTADDR?=              0xFFFFFFC000000000
 .else
 TEXTADDR?=		0xC0001000
 .endif
 KERNLDSCRIPT?=		${RISCV}/conf/kern.ldscript
 LINKFORMAT+=		-T ${KERNLDSCRIPT}
 EXTRA_LINKFLAGS=	${LDOPTS} --relax
 LINKFLAGS_NORMAL=	-X
 STRIPFLAGS=		-g -X
 ##
 ## (6) port specific target dependencies
 ##

 @@ -1,14 +1,14 @@
-#	$NetBSD: files.riscv,v 1.1 2015/03/28 16:13:56 matt Exp $
+#	$NetBSD: files.riscv,v 1.2 2019/06/01 12:42:27 maxv Exp $
+#
 maxpartitions	16
 maxusers	8 32 64
 defflag	opt_ddb.h		DDB_TRACE
 #file	arch/riscv/riscv/locore.S
 file	arch/riscv/riscv/spl.S
 file	arch/riscv/riscv/autoconf.c
 file	arch/riscv/riscv/cpu_subr.c
 file	arch/riscv/riscv/db_disasm.c		ddb
 @@ -31,43 +31,36 @@ file	arch/riscv/riscv/process_machdep.c
 file	arch/riscv/riscv/procfs_machdep.c	procfs
 file	arch/riscv/riscv/riscv_machdep.c
 file	arch/riscv/riscv/sig_machdep.c		# signal delivery
 file	arch/riscv/riscv/softint_machdep.c
 file	arch/riscv/riscv/sys_machdep.c
 file	arch/riscv/riscv/vm_machdep.c
 file	dev/cons.c
 file	dev/md_root.c				memory_disk_hooks
 file	kern/subr_disk_mbr.c			disk
 file	uvm/pmap/pmap.c
-file	uvm/pmap/pmap_pv.c
+file	uvm/pmap/pmap_pvt.c
 file	uvm/pmap/pmap_segtab.c
 file	uvm/pmap/pmap_tlb.c
 # Binary compatibility with 32bit NetBSD (COMPAT_NETBSD32)
 file	arch/riscv/riscv/core32_machdep.c	compat_netbsd32 & coredump
 file	arch/riscv/riscv/netbsd32_machdep.c	compat_netbsd32
 file	arch/riscv/riscv/sig32_machdep.c	compat_netbsd32
 include "compat/netbsd32/files.netbsd32"
 # Linux compatibility (COMPAT_LINUX)	XXX Highly experimental
 #include "compat/ossaudio/files.ossaudio"
 #include "compat/linux/files.linux"
 #include "compat/linux/arch/riscv/files.linux_riscv"
 #file	arch/riscv/riscv/linux_trap.c		compat_linux
 #file	arch/riscv/riscv/linux_syscall.c	compat_linux
 device	mainbus { [instance=-1] }
 attach	mainbus at root
 file	arch/riscv/riscv/mainbus.c		mainbus
 device	cpu
 attach	cpu at mainbus with cpu_mainbus
 file	arch/riscv/riscv/cpu_mainbus.c		cpu_mainbus
 device	htif { }
 attach	htif at mainbus with htif_mainbus
 file	arch/riscv/htif/htif.c			htif_mainbus
 device	htifcons { } : tty

 @@ -1,14 +1,14 @@
-/* $NetBSD: cpu.h,v 1.4 2015/04/01 21:55:03 matt Exp $ */
+/* $NetBSD: cpu.h,v 1.5 2019/06/01 12:42:28 maxv 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.
 @@ -58,31 +58,30 @@ struct cpu_info {
 	struct trapframe *ci_ddb_regs;
 	uint64_t ci_lastintr;
 	int ci_mtx_oldspl;
 	int ci_mtx_count;
 	int ci_want_resched;
 	int ci_cpl;
 	u_int ci_softints;
 	volatile u_int ci_intr_depth;
 	tlb_asid_t ci_pmap_asid_cur;
 #if 0
-	union pmap_pdetab *ci_pmap_user_pdetab;
+	union pmap_segtab *ci_pmap_user_segtab;
 #ifdef _LP64
-	union pmap_pdetab *ci_pmap_user_pde0tab;
+	union pmap_segtab *ci_pmap_user_seg0tab;
 #endif
 #endif
 	struct evcnt ci_ev_fpu_saves;
 	struct evcnt ci_ev_fpu_loads;
 	struct evcnt ci_ev_fpu_reenables;
 };
 #endif /* _KERNEL || _KMEMUSER */
 #ifdef _KERNEL
 extern struct cpu_info cpu_info_store;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vmparam.h,v 1.4 2018/05/31 22:26:36 mrg Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.5 2019/06/01 12:42:28 maxv 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.
 @@ -32,30 +32,26 @@
 #ifndef _RISCV_VMPARAM_H_
 #define	_RISCV_VMPARAM_H_
 #include <riscv/param.h>
 #ifdef _KERNEL_OPT
 #include "opt_multiprocessor.h"
 #endif
 /*
  * Machine dependent VM constants for RISCV.
  */
 /*
  * We use a 8K page on RV64 and 4K on RV32 systems.
  * Override PAGE_* definitions to compile-time constants.
  */
 #define	PAGE_SHIFT	PGSHIFT
 #define	PAGE_SIZE	(1 << PAGE_SHIFT)
 #define	PAGE_MASK	(PAGE_SIZE - 1)
 /*
  * USRSTACK is the top (end) of the user stack.
+ *
  * USRSTACK needs to start a page below the maxuser address so that a memory
  * access with a maximum displacement (0x7ff) won't cross into the kernel's
  * address space.  We use PAGE_SIZE instead of 0x800 since these need to be
  * page-aligned.
  */
 #define	USRSTACK	(VM_MAXUSER_ADDRESS-PAGE_SIZE) /* Start of user stack */
 @@ -97,44 +93,36 @@
 #endif
 #ifndef	MAXSSIZ32
 #define	MAXSSIZ32	MAXSSIZ			/* max stack size */
 #endif
 /*
  * PTEs for mapping user space into the kernel for phyio operations.
  * The default PTE number is enough to cover 8 disks * MAXBSIZE.
  */
 #ifndef USRIOSIZE
 #define USRIOSIZE	(MAXBSIZE/PAGE_SIZE * 8)
 #endif
-// user/kernel map constants
+/*
-// These use negative addresses since RISCV addresses are signed.
+ * User/kernel map constants.
  */
 #define VM_MIN_ADDRESS		((vaddr_t)0x00000000)
-#ifdef _LP64
+#ifdef _LP64	/* Sv39 */
-#define VM_MAXUSER_ADDRESS	((vaddr_t) 1L << 42)	/* 0x0000040000000000 */
+#define VM_MAXUSER_ADDRESS	((vaddr_t)0x0000004000000000 - 16 * PAGE_SIZE)
-// For 64-bit kernels, we could, in theory, have 8TB (42 (13+29) bits worth)
+#define VM_MIN_KERNEL_ADDRESS	((vaddr_t)0xFFFFFFC000000000)
-// of KVA space.  We need to divide that between KVA for direct-mapped memory,
+#define VM_MAX_KERNEL_ADDRESS	((vaddr_t)0xFFFFFFD000000000) /* MIN + 64GB */
-// space for I/O devices (someday), the kernel's mapped space.  For now, we are
+#else		/* Sv32 */
 // going to restrict ourselves to use highest 8GB of KVA. The highest 2GB of
 // that KVA will be used to direct map memory.
 #define VM_MAX_KERNEL_ADDRESS	((vaddr_t) -PAGE_SIZE << 18)
 							/* 0xFFFFFFFF80000000 */
 #define VM_MIN_KERNEL_ADDRESS	((vaddr_t) -PAGE_SIZE << 20)
 							/* 0xFFFFFFFE00000000 */
 #else
 #define VM_MAXUSER_ADDRESS	((vaddr_t)-0x7fffffff-1)/* 0xFFFFFFFF80000000 */
 // We reserve the bottom (nonnegative) address for user, then split the upper
 // 2GB into two 1GB, the lower for mapped KVA and the upper for direct-mapped.
 #define VM_MIN_KERNEL_ADDRESS	((vaddr_t)-0x7fffffff-1)/* 0xFFFFFFFF80000000 */
 #define VM_MAX_KERNEL_ADDRESS	((vaddr_t)-0x40000000)	/* 0xFFFFFFFFC0000000 */
 #endif
 #define VM_MAX_ADDRESS		VM_MAXUSER_ADDRESS
 #define VM_MAXUSER_ADDRESS32	((vaddr_t)(1UL << 31))/* 0x0000000080000000 */
 /*
  * The address to which unspecified mapping requests default
  */
 #define __USE_TOPDOWN_VM
 #define VM_DEFAULT_ADDRESS_TOPDOWN(da, sz) \
     trunc_page(USRSTACK - MAXSSIZ - (sz) - user_stack_guard_size)

 @@ -1,14 +1,14 @@
-/* $NetBSD: elf_machdep.h,v 1.6 2017/11/06 03:47:48 christos Exp $ */
+/* $NetBSD: elf_machdep.h,v 1.7 2019/06/01 12:42:28 maxv 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.
 @@ -36,30 +36,31 @@
 #define	ELF64_MACHDEP_ID		EM_RISCV
 #define ELF32_MACHDEP_ENDIANNESS	ELFDATA2LSB
 #define ELF64_MACHDEP_ENDIANNESS	ELFDATA2LSB
 #define ELF32_MACHDEP_ID_CASES		\
 		case EM_RISCV:		\
 			break;
 #define	ELF64_MACHDEP_ID_CASES		\
 		case EM_RISCV:		\
 			break;
 #define	KERN_ELFSIZE		32
 #ifdef _LP64
 #define	KERN_ELFSIZE		64
 #define ARCH_ELFSIZE		64	/* MD native binary size */
 #else
 #define	KERN_ELFSIZE		32
 #define ARCH_ELFSIZE		32	/* MD native binary size */
 #endif
 /* Processor specific flags for the ELF header e_flags field.  */
 /* Processor specific relocation types */
 #define R_RISCV_NONE		0
 #define R_RISCV_32		1	// A
 #define R_RISCV_64		2
 #define R_RISCV_RELATIVE	3
 #define R_RISCV_COPY		4
 #define R_RISCV_JMP_SLOT	5

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: mutex.h,v 1.1 2014/09/19 17:36:26 matt Exp $ */	1	/* $NetBSD: mutex.h,v 1.2 2019/06/01 12:42:28 maxv Exp $ */
2		2
3	/*-	3	/*-
4	* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.	4	* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
5	* All rights reserved.	5	* All rights reserved.
6	*	6	*
7	* This code is derived from software contributed to The NetBSD Foundation	7	* This code is derived from software contributed to The NetBSD Foundation
8	* by Jason R. Thorpe and Andrew Doran.	8	* by Jason R. Thorpe and Andrew Doran.
9	*	9	*
10	* Redistribution and use in source and binary forms, with or without	10	* Redistribution and use in source and binary forms, with or without
11	* modification, are permitted provided that the following conditions	11	* modification, are permitted provided that the following conditions
12	* are met:	12	* are met:
13	* 1. Redistributions of source code must retain the above copyright	13	* 1. Redistributions of source code must retain the above copyright
14	* notice, this list of conditions and the following disclaimer.	14	* notice, this list of conditions and the following disclaimer.
	@@ -73,27 +73,27 @@ static inline void		@@ -73,27 +73,27 @@ static inline void
73	riscv_mutex_initialize_spin_ipl(kmutex_t *__mtx, int ipl)	73	riscv_mutex_initialize_spin_ipl(kmutex_t *__mtx, int ipl)
74	{	74	{
75	__mtx->mtx_owner = (__mtx->mtx_owner & ~MTX_IPL)	75	__mtx->mtx_owner = (__mtx->mtx_owner & ~MTX_IPL)
76	\| __SHIFTIN(ipl, MTX_IPL);	76	\| __SHIFTIN(ipl, MTX_IPL);
77	}	77	}
78		78
79	static inline void	79	static inline void
80	riscv_mutex_spinbit_lock_init(kmutex_t *__mtx)	80	riscv_mutex_spinbit_lock_init(kmutex_t *__mtx)
81	{	81	{
82	__mtx->mtx_owner &= ~MTX_LOCK;	82	__mtx->mtx_owner &= ~MTX_LOCK;
83	}	83	}
84		84
85	static inline bool	85	static inline bool
86	riscv_mutex_spinbit_locked_p(kmutex_t *__mtx)	86	riscv_mutex_spinbit_locked_p(const kmutex_t *__mtx)
87	{	87	{
88	return (__mtx->mtx_owner & MTX_LOCK) != 0;	88	return (__mtx->mtx_owner & MTX_LOCK) != 0;
89	}	89	}
90		90
91	static inline bool	91	static inline bool
92	riscv_mutex_spinbit_lock_try(kmutex_t *__mtx)	92	riscv_mutex_spinbit_lock_try(kmutex_t *__mtx)
93	{	93	{
94	uintptr_t __old;	94	uintptr_t __old;
95	__asm __volatile(	95	__asm __volatile(
96	"amoor" MTX_ASMOP_SFX ".aq\t%0, %1, (%2)"	96	"amoor" MTX_ASMOP_SFX ".aq\t%0, %1, (%2)"
97	: "=r"(__old)	97	: "=r"(__old)
98	: "r"(MTX_LOCK), "r"(__mtx));	98	: "r"(MTX_LOCK), "r"(__mtx));
99	return (__old & MTX_LOCK) == 0;	99	return (__old & MTX_LOCK) == 0;

 @@ -1,14 +1,14 @@
-/* $NetBSD: pmap.h,v 1.1 2014/09/19 17:36:26 matt Exp $ */
+/* $NetBSD: pmap.h,v 1.2 2019/06/01 12:42:28 maxv 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.
 @@ -32,32 +32,32 @@
 #ifndef _RISCV_PMAP_H_
 #define _RISCV_PMAP_H_
 #ifdef _KERNEL_OPT
 #include "opt_modular.h"
 #endif
 #if !defined(_MODULE)
 #include <sys/types.h>
 #include <sys/pool.h>
 #include <sys/evcnt.h>
 #include <uvm/uvm_physseg.h>
 #include <uvm/pmap/vmpagemd.h>
 #include <riscv/pte.h>
-#define	PMAP_SEGTABSIZE		(__SHIFTOUT(PTE_PPN0, PTE_PPN0) + 1)
+#define	PMAP_SEGTABSIZE		NPTEPG
 #define	PMAP_PDETABSIZE		(__SHIFTOUT(PTE_PPN0, PTE_PPN0) + 1)
 #define NBSEG		(NBPG*NPTEPG)
 #ifdef _LP64
 #define NBXSEG		(NBSEG*NSEGPG)
 #define XSEGSHIFT	(SEGSHIFT + PGSHIFT - 3)
 #define XSEGOFSET	(PTE_PPN1|SEGOFSET)
 #define SEGSHIFT	(PGSHIFT + PGSHIFT - 3)
 #else
 #define SEGSHIFT	(PGSHIFT + PGSHIFT - 2)
 #endif
 #define SEGOFSET	(PTE_PPN0|PAGE_MASK)
 #define KERNEL_PID	0
 @@ -66,62 +66,73 @@
 #define PMAP_TLB_NUM_PIDS		256
 #define PMAP_TLB_MAX			1
 #ifdef _LP64
 #define PMAP_INVALID_PDETAB_ADDRESS	((pmap_pdetab_t *)(VM_MIN_KERNEL_ADDRESS - PAGE_SIZE))
 #define PMAP_INVALID_SEGTAB_ADDRESS	((pmap_segtab_t *)(VM_MIN_KERNEL_ADDRESS - PAGE_SIZE))
 #else
 #define PMAP_INVALID_PDETAB_ADDRESS	((pmap_pdetab_t *)0xdeadbeef)
 #define PMAP_INVALID_SEGTAB_ADDRESS	((pmap_segtab_t *)0xdeadbeef)
 #endif
 #define PMAP_TLB_FLUSH_ASID_ON_RESET	false
 #define pmap_phys_address(x)		(x)
 #ifndef __BSD_PTENTRY_T__
 #define __BSD_PTENTRY_T__
 #ifdef _LP64
 #define PRIxPTE         PRIx64
 #else
 #define PRIxPTE         PRIx32
 #endif
 #endif /* __BSD_PTENTRY_T__ */
 #define PMAP_NEED_PROCWR
 static inline void
 pmap_procwr(struct proc *p, vaddr_t va, vsize_t len)
+{
 	__asm __volatile("fence\trw,rw; fence.i");
+}
 #include <uvm/pmap/tlb.h>
 #include <uvm/pmap/pmap_tlb.h>
 #define PMAP_GROWKERNEL
 #define PMAP_STEAL_MEMORY
 #ifdef _KERNEL
 #define __HAVE_PMAP_MD
 struct pmap_md {
 	paddr_t md_ptbr;
 	pd_entry_t *md_pdetab;
 };
 struct vm_page *
         pmap_md_alloc_poolpage(int flags);
 vaddr_t pmap_md_map_poolpage(paddr_t, vsize_t);
 void    pmap_md_unmap_poolpage(vaddr_t, vsize_t);
 bool    pmap_md_direct_mapped_vaddr_p(vaddr_t);
 bool    pmap_md_io_vaddr_p(vaddr_t);
 paddr_t pmap_md_direct_mapped_vaddr_to_paddr(vaddr_t);
 vaddr_t pmap_md_direct_map_paddr(paddr_t);
 void    pmap_md_init(void);
 bool    pmap_md_tlb_check_entry(void *, vaddr_t, tlb_asid_t, pt_entry_t);
 //void    pmap_md_page_syncicache(struct vm_page *, const kcpuset_t *);
 void	pmap_md_pdetab_activate(struct pmap *);
 void	pmap_md_pdetab_init(struct pmap *);
 bool	pmap_md_ok_to_steal_p(const uvm_physseg_t, size_t);
 #ifdef __PMAP_PRIVATE
 static inline void
 pmap_md_page_syncicache(struct vm_page *pg, const kcpuset_t *kc)
+{
 	__asm __volatile("fence\trw,rw; fence.i");
+}
 /*
  * Virtual Cache Alias helper routines.  Not a problem for RISCV CPUs.
  */
 static inline bool
 pmap_md_vca_add(struct vm_page *pg, vaddr_t va, pt_entry_t *nptep)
 @@ -156,20 +167,20 @@ pmap_md_tlb_asid_max(void)
 #endif /* !_MODULE */
 #if defined(MODULAR) || defined(_MODULE)
 /*
  * Define a compatible vm_page_md so that struct vm_page is the same size
  * whether we are using modules or not.
  */
 #ifndef __HAVE_VM_PAGE_MD
 #define __HAVE_VM_PAGE_MD
 struct vm_page_md {
 	uintptr_t mdpg_dummy[3];
 };
 #endif /* !__HVE_VM_PAGE_MD */
 __CTASSERT(sizeof(struct vm_page_md) == sizeof(uintptr_t)*3);
 #endif /* !__HAVE_VM_PAGE_MD */
 #endif /* MODULAR || _MODULE */
 #endif /* !_RISCV_PMAP_H_ */

 @@ -1,14 +1,14 @@
-/* $NetBSD: pte.h,v 1.1 2014/09/19 17:36:26 matt Exp $ */
+/* $NetBSD: pte.h,v 1.2 2019/06/01 12:42:28 maxv 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.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -229,58 +229,41 @@ pte_make_kenter_pa(paddr_t pa, struct vm
 	pte |= PTE_WIRED | PTE_V;
 	pte |= pte_flag_bits(NULL, flags, true);
 	pte |= pte_prot_bits(NULL, prot, true); /* pretend unmanaged */
 	return pte;
+}
 static inline void
 pte_set(pt_entry_t *ptep, pt_entry_t pte)
+{
 	*ptep = pte;
+}
 static inline pd_entry_t
 pte_invalid_pde(void)
 	return 0;
 static inline pd_entry_t
 pte_pde_pdetab(paddr_t pa)
 	return PTE_V | PTE_G | PTE_T | pa;
 static inline pd_entry_t
 pte_pde_ptpage(paddr_t pa)
 	return PTE_V | PTE_G | PTE_T | pa;
 static inline bool
 pte_pde_valid_p(pd_entry_t pde)
 	return (pde & (PTE_V|PTE_T)) == (PTE_V|PTE_T);
 static inline paddr_t
 pte_pde_to_paddr(pd_entry_t pde)
+{
 	return pde & ~PAGE_MASK;
+}
 static inline pd_entry_t
 pte_pde_cas(pd_entry_t *pdep, pd_entry_t opde, pt_entry_t npde)
+{
 #ifdef MULTIPROCESSOR
 #ifdef _LP64
 	return atomic_cas_64(pdep, opde, npde);
 #else
 	return atomic_cas_32(pdep, opde, npde);
 #endif
 #else
 	*pdep = npde;
 	return 0;
 #endif
+}
 static inline pt_entry_t
 pte_value(pt_entry_t pte)
+{
 	return pte;
+}
 #endif /* _RISCV_PTE_H_ */

 @@ -1,14 +1,14 @@
-/* $NetBSD: param.h,v 1.2 2019/01/07 22:00:32 jdolecek Exp $ */
+/* $NetBSD: param.h,v 1.3 2019/06/01 12:42:28 maxv 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.
 @@ -56,31 +56,27 @@
 #endif
 #define	_MACHINE	riscv
 #define	MACHINE		"riscv"
 #define	MID_MACHINE	MID_RISCV
 /* RISCV-specific macro to align a stack pointer (downwards). */
 #define STACK_ALIGNBYTES	(__BIGGEST_ALIGNMENT__ - 1)
 #define	ALIGNBYTES32	__BIGGEST_ALIGNMENT__
 #define NKMEMPAGES_MAX_DEFAULT	(2048UL * 1024 * 1024)
 #define NKMEMPAGES_MIN_DEFAULT	(128UL * 1024 * 1024)
 #ifdef _LP64
 #define PGSHIFT		13
 #else
 #define PGSHIFT		12
 #endif
 #define	NBPG		(1 << PGSHIFT)
 #define PGOFSET		(NBPG - 1)
 #define UPAGES		2
 #define	USPACE		(UPAGES << PGSHIFT)
 #define USPACE_ALIGN	NBPG
 /*
  * Constants related to network buffer management.
  * MCLBYTES must be no larger than NBPG (the software page size), and
  * NBPG % MCLBYTES must be zero.
  */
 #define	MSIZE		512		/* size of an mbuf */

 @@ -20,27 +20,27 @@
  * 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>
 #ifndef CORENAME
-__RCSID("$NetBSD: core_machdep.c,v 1.1 2015/03/28 16:13:56 matt Exp $");
+__RCSID("$NetBSD: core_machdep.c,v 1.2 2019/06/01 12:42:28 maxv Exp $");
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/core.h>
 #include <sys/exec.h>
 #include <sys/cpu.h>
 #include <riscv/locore.h>
 #ifndef CORENAME
 #define	CORENAME(n)	n
 @@ -73,27 +73,27 @@ CORENAME(cpu_coredump)(struct lwp *l, st
+	}
 	pcu_save_all(l);
 	// Can't use structure assignment if this is doing COMPAT_NETBSD32
 	const struct trapframe * const tf = l->l_md.md_utf;
 	for (size_t i = _X_RA; i <= _X_GP; i++) {
 		cpustate.tf.tf_reg[i] = tf->tf_reg[i];
+	}
 	cpustate.tf.tf_pc = tf->tf_pc;
 	cpustate.tf.tf_badaddr = tf->tf_badaddr;
 	cpustate.tf.tf_cause = tf->tf_cause;
 	cpustate.tf.tf_sr = tf->tf_sr;
-	if (fpu_valid_p()) {
+	if (fpu_valid_p(l)) {
 		cpustate.fpregs = ((struct pcb *)lwp_getpcb(l))->pcb_fpregs;
 	} else {
 		memset(&cpustate.fpregs, 0, sizeof(cpustate.fpregs));
+	}
 	CORE_SETMAGIC(cseg, CORESEGMAGIC, MID_MACHINE, CORE_CPU);
 	cseg.c_addr = 0;
 	cseg.c_size = chdr->c_cpusize;
 	error = coredump_write(iocookie, UIO_SYSSPACE, &cseg,
 	    chdr->c_seghdrsize);
 	if (error)
 		return error;

 @@ -1,14 +1,14 @@
-#	$NetBSD: genassym.cf,v 1.3 2015/03/31 06:47:47 matt Exp $
+#	$NetBSD: genassym.cf,v 1.4 2019/06/01 12:42:28 maxv 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.
 # 2. Redistributions in binary form must reproduce the above copyright
 @@ -184,15 +184,15 @@ define	XSEGSHIFT	XSEGSHIFT
 endif
 define	SEGSHIFT	SEGSHIFT
 define	PGSHIFT		PGSHIFT
 define	NPDEPG		NPDEPG
 define	NBSEG		NBSEG
 define	PTE_T		PTE_T
 define	PTE_V		PTE_V
 define	PTE_G		PTE_G
 define	PTE_SX		PTE_SX
 define	PTE_SW		PTE_SW
 define	PTE_SR		PTE_SR
-define	PM_PDETAB	offsetof(struct pmap, pm_pdetab)
+define	PM_MD_PDETAB	offsetof(struct pmap, pm_md.md_pdetab)
 define	PM_MD_PTBR	offsetof(struct pmap, pm_md.md_ptbr)

 @@ -1,14 +1,14 @@
-/* $NetBSD: locore.S,v 1.7 2018/02/05 10:41:12 maya Exp $ */
+/* $NetBSD: locore.S,v 1.8 2019/06/01 12:42:28 maxv 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.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -81,27 +81,31 @@ ENTRY_NP(start)
 	INT_L	a7, (zero)		// load memory size
 	slli	a7, a7, (20-PGSHIFT)	// convert MB to pages
 .L01:	PTR_LA	t0, physmem
 	INT_S	a7, (t0)		// store it in physmem
 	li	t4, PTE_V | PTE_SX | PTE_SW | PTE_SR | PTE_G
 #ifdef _LP64
 	REG_S	t4, 0(s2)		// keep a mapping for the first 8GB.
 	or	t0, s3, t4		// point to next page
 	or	t0, t0, PTE_T		// tranverse it.
 	REG_S	t0, -SZREG(s3)		// store in highest first level PDE
 #endif
-#if (VM_MIN_KERNEL_ADDRESS >> XSEGSHIFT) != (VM_MAX_KERNEL_ADDRESS >> XSEGSHIFT)
+	/*
 	 * XXX XXX XXX: This is completely broken and wrong, we should map only
 	 * the kernel sections, and the direct map should be mapped later in C.
 	 */
 #if 0 && (VM_MIN_KERNEL_ADDRESS >> XSEGSHIFT) != (VM_MAX_KERNEL_ADDRESS >> XSEGSHIFT)
 #error VM_MIN_KERNEL_ADDRESS not in same first level PDE as VM_MAX_KERNEL_ADDRESS
 #endif
 	// We allocated the kernel first PTE page so let's insert in the
 	// page table.  For now, we assume it's in the same PDE page as the
 	// direct-mapped memory.
 	or	t0, s4, t4
 	or	t0, t0, PTE_T
 #if ((VM_MIN_KERNEL_ADDRESS >> SEGSHIFT) & (NPDEPG-1)) * SZREG
 	li	t1, ((VM_MIN_KERNEL_ADDRESS >> SEGSHIFT) & (NPDEPG-1)) * SZREG
 	add	t1, t1, s3
 	REG_S	t0, 0(t1)
 #else
 	REG_S	t0, 0(s3)
 @@ -134,27 +138,27 @@ ENTRY_NP(start)
 	csrw	sscratch, zero		// zero in sscratch to mark kernel
 	PTR_LA	tp, _C_LABEL(lwp0)	// put curlwp in tp
 	PTR_LA	a0, _C_LABEL(cpu_exception_handler)
 	csrw	stvec, a0
 	PTR_S	s1, L_PCB(tp)		// set uarea of lwp (already zeroed)
 	addi	sp, s2, -TF_LEN		// switch to new stack
 	PTR_S	sp, L_MD_UTF(tp)	// store pointer to empty trapframe
 	PTR_LA	t1, _C_LABEL(kernel_pmap_store)
 	add	t2, s2, s11 		// PA -> VA
-	PTR_S	t2, PM_PDETAB(t1)	// VA of kernel PDETAB
+	PTR_S	t2, PM_MD_PDETAB(t1)	// VA of kernel PDETAB
 	PTR_S	s2, PM_MD_PTBR(t1)	// PA of kernel PDETAB
 	// Now we should ready to start initializing the kernel.
 	PTR_LA	a0, _C_LABEL(start)	// kernel_start
 	add	a1, s5, s11		// kernel_end
 	call	_C_LABEL(init_riscv)	// do MD startup
 	tail	_C_LABEL(main)		// and transfer to main
 	// not reached
 END(start)
 //
 // struct lwp *cpu_switchto(struct lwp *oldl, struct lwp *newl, bool returning);
 //

	@@ -21,27 +21,27 @@		@@ -21,27 +21,27 @@
21	* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR	21	* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
22	* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF	22	* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
23	* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS	23	* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
24	* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN	24	* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
25	* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)	25	* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE	26	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
27	* POSSIBILITY OF SUCH DAMAGE.	27	* POSSIBILITY OF SUCH DAMAGE.
28	*/	28	*/
29		29
30	#define __PMAP_PRIVATE	30	#define __PMAP_PRIVATE
31		31
32	#include <sys/cdefs.h>	32	#include <sys/cdefs.h>
33		33
34	__RCSID("$NetBSD: pmap_machdep.c,v 1.2 2015/03/31 01:14:57 matt Exp $");	34	__RCSID("$NetBSD: pmap_machdep.c,v 1.3 2019/06/01 12:42:28 maxv Exp $");
35		35
36	#include <sys/param.h>	36	#include <sys/param.h>
37		37
38	#include <uvm/uvm.h>	38	#include <uvm/uvm.h>
39		39
40	#include <riscv/locore.h>	40	#include <riscv/locore.h>
41		41
42	int riscv_poolpage_vmfreelist = VM_FREELIST_DEFAULT;	42	int riscv_poolpage_vmfreelist = VM_FREELIST_DEFAULT;
43		43
44	void	44	void
45	pmap_zero_page(paddr_t pa)	45	pmap_zero_page(paddr_t pa)
46	{	46	{
47	#ifdef POOL_PHYSTOV	47	#ifdef POOL_PHYSTOV
	@@ -90,27 +90,27 @@ pmap_md_direct_mapped_vaddr_p(vaddr_t va		@@ -90,27 +90,27 @@ pmap_md_direct_mapped_vaddr_p(vaddr_t va
90	return VM_MAX_KERNEL_ADDRESS <= va && (intptr_t) va < 0;	90	return VM_MAX_KERNEL_ADDRESS <= va && (intptr_t) va < 0;
91	}	91	}
92		92
93	bool	93	bool
94	pmap_md_io_vaddr_p(vaddr_t va)	94	pmap_md_io_vaddr_p(vaddr_t va)
95	{	95	{
96	return false;	96	return false;
97	}	97	}
98		98
99	paddr_t	99	paddr_t
100	pmap_md_direct_mapped_vaddr_to_paddr(vaddr_t va)	100	pmap_md_direct_mapped_vaddr_to_paddr(vaddr_t va)
101	{	101	{
102	KASSERT(VM_MAX_KERNEL_ADDRESS <= va && (intptr_t) va < 0);	102	KASSERT(VM_MAX_KERNEL_ADDRESS <= va && (intptr_t) va < 0);
103	const pmap_pdetab_t *ptb = pmap_kernel()->pm_pdetab;	103	const pmap_pdetab_t *ptb = pmap_kernel()->pm_md.md_pdetab;
104	pd_entry_t pde;	104	pd_entry_t pde;
105		105
106	#ifdef _LP64	106	#ifdef _LP64
107	pde = ptb->pde_pde[(va >> XSEGSHIFT) & (NPDEPG-1)];	107	pde = ptb->pde_pde[(va >> XSEGSHIFT) & (NPDEPG-1)];
108	if ((pde & PTE_V) == 0) {	108	if ((pde & PTE_V) == 0) {
109	return -(paddr_t)1;	109	return -(paddr_t)1;
110	}	110	}
111	if ((pde & PTE_T) == 0) {	111	if ((pde & PTE_T) == 0) {
112	return pde & ~XSEGOFSET;	112	return pde & ~XSEGOFSET;
113	}	113	}
114	ptb = (const pmap_pdetab_t *)POOL_PHYSTOV(pte_pde_to_paddr(pde));	114	ptb = (const pmap_pdetab_t *)POOL_PHYSTOV(pte_pde_to_paddr(pde));
115	#endif	115	#endif
116	pde = ptb->pde_pde[(va >> SEGSHIFT) & (NPDEPG-1)];	116	pde = ptb->pde_pde[(va >> SEGSHIFT) & (NPDEPG-1)];
	@@ -126,43 +126,49 @@ pmap_md_direct_mapped_vaddr_to_paddr(vad		@@ -126,43 +126,49 @@ pmap_md_direct_mapped_vaddr_to_paddr(vad
126	vaddr_t	126	vaddr_t
127	pmap_md_direct_map_paddr(paddr_t pa)	127	pmap_md_direct_map_paddr(paddr_t pa)
128	{	128	{
129	return POOL_PHYSTOV(pa);	129	return POOL_PHYSTOV(pa);
130	}	130	}
131		131
132	void	132	void
133	pmap_md_init(void)	133	pmap_md_init(void)
134	{	134	{
135	pmap_tlb_info_evcnt_attach(&pmap_tlb0_info);	135	pmap_tlb_info_evcnt_attach(&pmap_tlb0_info);
136	}	136	}
137		137
138	bool	138	bool
		139	pmap_md_ok_to_steal_p(const uvm_physseg_t bank, size_t npgs)
		140	{
		141	return true;
		142	}
		143
		144	bool
139	pmap_md_tlb_check_entry(void *ctx, vaddr_t va, tlb_asid_t asid, pt_entry_t pte)	145	pmap_md_tlb_check_entry(void *ctx, vaddr_t va, tlb_asid_t asid, pt_entry_t pte)
140	{	146	{
141	return false;	147	return false;
142	}	148	}
143		149
144	void	150	void
145	pmap_md_pdetab_activate(struct pmap *pmap)	151	pmap_md_pdetab_activate(struct pmap *pmap)
146	{	152	{
147	__asm("csrw\tsptbr, %0" :: "r"(pmap->pm_md.md_ptbr));	153	__asm("csrw\tsptbr, %0" :: "r"(pmap->pm_md.md_ptbr));
148	}	154	}
149		155
150	void	156	void
151	pmap_md_pdetab_init(struct pmap *pmap)	157	pmap_md_pdetab_init(struct pmap *pmap)
152	{	158	{
153	pmap->pm_pdetab[NPDEPG-1] = pmap_kernel()->pm_pdetab[NPDEPG-1];	159	pmap->pm_md.md_pdetab[NPDEPG-1] = pmap_kernel()->pm_md.md_pdetab[NPDEPG-1];
154	pmap->pm_md.md_ptbr =	160	pmap->pm_md.md_ptbr =
155	pmap_md_direct_mapped_vaddr_to_paddr((vaddr_t)pmap->pm_pdetab);	161	pmap_md_direct_mapped_vaddr_to_paddr((vaddr_t)pmap->pm_md.md_pdetab);
156	}	162	}
157		163
158	// TLB mainenance routines	164	// TLB mainenance routines
159		165
160	tlb_asid_t	166	tlb_asid_t
161	tlb_get_asid(void)	167	tlb_get_asid(void)
162	{	168	{
163	return riscvreg_asid_read();	169	return riscvreg_asid_read();
164	}	170	}
165		171
166	void	172	void
167	tlb_set_asid(tlb_asid_t asid)	173	tlb_set_asid(tlb_asid_t asid)
168	{	174	{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.h,v 1.11 2019/05/20 17:00:57 skrll Exp $	*/
+/*	$NetBSD: pmap.h,v 1.12 2019/06/01 12:42:28 maxv Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Ralph Campbell.
+ *
  * 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.
 @@ -124,26 +124,29 @@ extern kmutex_t pmap_segtab_lock;
 struct pmap {
 #ifdef MULTIPROCESSOR
 	kcpuset_t		*pm_active;	/* pmap was active on ... */
 	kcpuset_t		*pm_onproc;	/* pmap is active on ... */
 	volatile u_int		pm_shootdown_pending;
 #endif
 	pmap_segtab_t *		pm_segtab;	/* pointers to pages of PTEs */
 	u_int			pm_count;	/* pmap reference count */
 	u_int			pm_flags;
 #define	PMAP_DEFERRED_ACTIVATE	__BIT(0)
 	struct pmap_statistics	pm_stats;	/* pmap statistics */
 	vaddr_t			pm_minaddr;
 	vaddr_t			pm_maxaddr;
 #ifdef __HAVE_PMAP_MD
 	struct pmap_md		pm_md;
 #endif
 	struct pmap_asid_info	pm_pai[1];
 };
 #ifdef	_KERNEL
 struct pmap_kernel {
 	struct pmap kernel_pmap;
 #if defined(MULTIPROCESSOR) && PMAP_TLB_MAX > 1
 	struct pmap_asid_info kernel_pai[PMAP_TLB_MAX-1];
 #endif
 };
 struct pmap_limits {
 	paddr_t avail_start;