Move arm's devmap to some generic place, so it can be used

by other architectures.

Reviewed by:	imp
Differential Revision:	https://reviews.freebsd.org/D6091
Sponsored by:	DARPA, AFRL
Sponsored by:	HEIF5

3 files changed, 4 insertions, 93 deletions

diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c
index 2bf108f..9d4cfb1 100644
--- a/sys/arm64/arm64/machdep.c
+++ b/sys/arm64/arm64/machdep.c
@@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/cons.h>
 #include <sys/cpu.h>
+#include <sys/devmap.h>
 #include <sys/efi.h>
 #include <sys/exec.h>
 #include <sys/imgact.h>
@@ -70,7 +71,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/debug_monitor.h>
 #include <machine/kdb.h>
-#include <machine/devmap.h>
 #include <machine/machdep.h>
 #include <machine/metadata.h>
 #include <machine/md_var.h>
@@ -912,7 +912,7 @@ initarm(struct arm64_bootparams *abp)
 	pmap_bootstrap(abp->kern_l0pt, abp->kern_l1pt,
 	    KERNBASE - abp->kern_delta, lastaddr - KERNBASE);
 
-	arm_devmap_bootstrap(0, NULL);
+	devmap_bootstrap(0, NULL);
 
 	cninit();
 
diff --git a/sys/arm64/include/devmap.h b/sys/arm64/include/devmap.h
deleted file mode 100644
index 4184f8b..0000000
--- a/sys/arm64/include/devmap.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*-
- * Copyright (c) 2013 Ian Lepore <ian@freebsd.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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 AUTHOR 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.
- *
- * $FreeBSD$
- */
-
-#ifndef	_MACHINE_DEVMAP_H_
-#define	_MACHINE_DEVMAP_H_
-
-/*
- * This structure is used by MD code to describe static mappings of devices
- * which are established as part of bringing up the MMU early in the boot.
- */
-struct arm_devmap_entry {
-	vm_offset_t	pd_va;		/* virtual address */
-	vm_paddr_t	pd_pa;		/* physical address */
-	vm_size_t	pd_size;	/* size of region */
-};
-
-/*
- * Return the lowest KVA address used in any entry in the registered devmap
- * table.  This works with whatever table is registered, including the internal
- * table used by arm_devmap_add_entry() if that routine was used. Platforms can
- * implement initarm_lastaddr() by calling this if static device mappings are
- * their only use of high KVA space.
- */
-vm_offset_t arm_devmap_lastaddr(void);
-
-/*
- * Automatically allocate KVA (from the top of the address space downwards) and
- * make static device mapping entries in an internal table.  The internal table
- * is automatically registered on the first call to this.
- */
-void arm_devmap_add_entry(vm_paddr_t pa, vm_size_t sz);
-
-/*
- * Register a platform-local table to be bootstrapped by the generic
- * initarm() in arm/machdep.c.  This is used by newer code that allocates and
- * fills in its own local table but does not have its own initarm() routine.
- */
-void arm_devmap_register_table(const struct arm_devmap_entry * _table);
-
-/*
- * Establish mappings for all the entries in the table.  This is called
- * automatically from the common initarm() in arm/machdep.c, and also from the
- * custom initarm() routines in older code.  If the table pointer is NULL, this
- * will use the table installed previously by arm_devmap_register_table().
- */
-void arm_devmap_bootstrap(vm_offset_t _l1pt,
-    const struct arm_devmap_entry *_table);
-
-/*
- * Translate between virtual and physical addresses within a region that is
- * static-mapped by the devmap code.  If the given address range isn't
- * static-mapped, then ptov returns NULL and vtop returns DEVMAP_PADDR_NOTFOUND.
- * The latter implies that you can't vtop just the last byte of physical address
- * space.  This is not as limiting as it might sound, because even if a device
- * occupies the end of the physical address space, you're only prevented from
- * doing vtop for that single byte.  If you vtop a size bigger than 1 it works.
- */
-#define	DEVMAP_PADDR_NOTFOUND	((vm_paddr_t)(-1))
-
-void *     arm_devmap_ptov(vm_paddr_t _pa, vm_size_t _sz);
-vm_paddr_t arm_devmap_vtop(void * _va, vm_size_t _sz);
-
-/* Print the static mapping table; used for bootverbose output. */
-void arm_devmap_print_table(void);
-
-#endif
diff --git a/sys/arm64/include/vmparam.h b/sys/arm64/include/vmparam.h
index 3d46ece..6dccf51 100644
--- a/sys/arm64/include/vmparam.h
+++ b/sys/arm64/include/vmparam.h
@@ -247,4 +247,6 @@ extern vm_offset_t init_pt_va;
 
 #define	ZERO_REGION_SIZE	(64 * 1024)	/* 64KB */
 
+#define	DEVMAP_MAX_VADDR	VM_MAX_KERNEL_ADDRESS
+
 #endif /* !_MACHINE_VMPARAM_H_ */