diff options
| author | ian <ian@FreeBSD.org> | 2013-12-13 23:56:53 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2013-12-13 23:56:53 +0000 |
| commit | eae48ec05ef90176b68b7b5c7ebf3e4c792448aa (patch) | |
| tree | 95426e39c61df08e259d54ab1d73d5aefa98c198 /sys/arm/xscale/i80321/ep80219_machdep.c | |
| parent | 689fd5c39017daa19a00a6cce247ad10ba00c1e7 (diff) | |
| download | FreeBSD-src-eae48ec05ef90176b68b7b5c7ebf3e4c792448aa.zip FreeBSD-src-eae48ec05ef90176b68b7b5c7ebf3e4c792448aa.tar.gz | |
MFC r257648, r257649, r257660:
Begin reducing code duplication in arm pmap.c and pmap-v6.c by factoring
out common code related to mapping device memory into a new devmap.c file.
Remove the growing duplication of code that used pmap_devmap_find_pa() and
then did some math with the returned results to generate a virtual address,
and likewise in reverse to get a physical address. Now there are a pair
of functions, arm_devmap_vtop() and arm_devmap_ptov(), to do that. The
bus_space_map() implementations are rewritten in terms of these.
Move remaining code and data related to static device mapping into the
new devmap.[ch] files. Emphasize the MD nature of these things by using
the prefix arm_devmap_ on the function and type names (already a few of
these things found their way into MI code, hopefully it will be harder to
do by accident in the future).
Diffstat (limited to 'sys/arm/xscale/i80321/ep80219_machdep.c')
| -rw-r--r-- | sys/arm/xscale/i80321/ep80219_machdep.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/arm/xscale/i80321/ep80219_machdep.c b/sys/arm/xscale/i80321/ep80219_machdep.c index ff2f1c3..94b94da 100644 --- a/sys/arm/xscale/i80321/ep80219_machdep.c +++ b/sys/arm/xscale/i80321/ep80219_machdep.c @@ -78,6 +78,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_map.h> +#include <machine/devmap.h> #include <machine/vmparam.h> #include <machine/pcb.h> #include <machine/undefined.h> @@ -125,7 +126,7 @@ struct pv_addr minidataclean; /* #define IQ80321_OBIO_SIZE 0x00100000UL */ /* Static device mappings. */ -static const struct pmap_devmap ep80219_devmap[] = { +static const struct arm_devmap_entry ep80219_devmap[] = { /* * Map the on-board devices VA == PA so that we can access them * with the MMU on or off. @@ -300,7 +301,7 @@ initarm(struct arm_boot_params *abp) /* Map the vector page. */ pmap_map_entry(l1pagetable, ARM_VECTORS_HIGH, systempage.pv_pa, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); - pmap_devmap_bootstrap(l1pagetable, ep80219_devmap); + arm_devmap_bootstrap(l1pagetable, ep80219_devmap); /* * Give the XScale global cache clean code an appropriately * sized chunk of unmapped VA space starting at 0xff000000 |
