From: miod <miod@openbsd.org>
Date: Fri, 24 Nov 2023 07:18:49 +0000 (+0000)
Subject: Remove unused direct map defines and macros, originating from FreeBSD.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=b0e205f04ed8e83dc0258f7b715e42fa7a3e4ae9;p=openbsd

Remove unused direct map defines and macros, originating from FreeBSD.
ok mlarkin@ kettenis@
---

diff --git a/sys/arch/riscv64/include/pmap.h b/sys/arch/riscv64/include/pmap.h
index 8a32bba9ea1..d686dfe6859 100644
--- a/sys/arch/riscv64/include/pmap.h
+++ b/sys/arch/riscv64/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.7 2023/02/16 20:32:39 miod Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.8 2023/11/24 07:18:49 miod Exp $	*/
 
 /*
  * Copyright (c) 2019-2020 Brian Bamsch <bbamsch@google.com>
@@ -106,6 +106,8 @@ void pmap_physload_avail(void);
 
 #define PMAP_GROWKERNEL
 
+#define	PHYS_TO_DMAP(pa)	((pa) - dmap_phys_base + DMAP_MIN_ADDRESS)
+
 struct pv_entry;
 
 /* investigate */
diff --git a/sys/arch/riscv64/include/vmparam.h b/sys/arch/riscv64/include/vmparam.h
index fa1fd0b7461..e46d40dc06b 100644
--- a/sys/arch/riscv64/include/vmparam.h
+++ b/sys/arch/riscv64/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.7 2023/03/19 20:32:13 kettenis Exp $	*/
+/*	$OpenBSD: vmparam.h,v 1.8 2023/11/24 07:18:49 miod Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -131,49 +131,10 @@
 #define	DMAP_MIN_PHYSADDR	(dmap_phys_base)
 #define	DMAP_MAX_PHYSADDR	(dmap_phys_max)
 
-/* True if pa is in the dmap range */
-#define	PHYS_IN_DMAP(pa)	((pa) >= DMAP_MIN_PHYSADDR && \
-    (pa) < DMAP_MAX_PHYSADDR)
-/* True if va is in the dmap range */
-#define	VIRT_IN_DMAP(va)	((va) >= DMAP_MIN_ADDRESS && \
-    (va) < (dmap_max_addr))
-
-#define	PMAP_HAS_DMAP	1
-#if 0	// XXX KASSERT missing. Find a better way to enforce boundary.
-#define	PHYS_TO_DMAP(pa)						\
-({									\
-	KASSERT(PHYS_IN_DMAP(pa),					\
-	    ("%s: PA out of range, PA: 0x%lx", __func__,		\
-	    (vm_paddr_t)(pa)));						\
-	((pa) - dmap_phys_base) + DMAP_MIN_ADDRESS;			\
-})
-#else
-#define	PHYS_TO_DMAP(pa)						\
-({									\
-	((pa) - dmap_phys_base) + DMAP_MIN_ADDRESS;			\
-})
-#endif
-
-#if 0	// XXX KASSERT missing. Find a better way to enforce boundary.
-#define	DMAP_TO_PHYS(va)						\
-({									\
-	KASSERT(VIRT_IN_DMAP(va),					\
-	    ("%s: VA out of range, VA: 0x%lx", __func__,		\
-	    (vm_offset_t)(va)));					\
-	((va) - DMAP_MIN_ADDRESS) + dmap_phys_base;			\
-})
-#else
-#define	DMAP_TO_PHYS(va)						\
-({									\
-	((va) - DMAP_MIN_ADDRESS) + dmap_phys_base;			\
-})
-#endif
-
 #define	VM_MIN_USER_ADDRESS	(0x0000000000000000UL)
 #define	VM_MAX_USER_ADDRESS	(0x0000004000000000UL)  // 39 User Space Bits
 
 #define	VM_MINUSER_ADDRESS	(VM_MIN_USER_ADDRESS)
-// XXX OpenBSD/arm64 saves 8 * PAGE_SIZE at top of VM_MAXUSER_ADDRESS. Why?
 #define	VM_MAXUSER_ADDRESS	(VM_MAX_USER_ADDRESS)
 #ifdef _KERNEL
 #define	VM_MIN_STACK_ADDRESS	(VM_MAXUSER_ADDRESS * 3 / 4)