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/lpc/lpc_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/lpc/lpc_machdep.c')
-rw-r--r-- | sys/arm/lpc/lpc_machdep.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/arm/lpc/lpc_machdep.c b/sys/arm/lpc/lpc_machdep.c index cb3ab84..576eda4 100644 --- a/sys/arm/lpc/lpc_machdep.c +++ b/sys/arm/lpc/lpc_machdep.c @@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$"); #include <vm/pmap.h> #include <machine/bus.h> +#include <machine/devmap.h> #include <machine/machdep.h> #include <arm/lpc/lpcreg.h> @@ -85,7 +86,7 @@ initarm_late_init(void) } #define FDT_DEVMAP_MAX (1 + 2 + 1 + 1) -static struct pmap_devmap fdt_devmap[FDT_DEVMAP_MAX] = { +static struct arm_devmap_entry fdt_devmap[FDT_DEVMAP_MAX] = { { 0, 0, 0, 0, 0, } }; @@ -105,7 +106,7 @@ platform_devmap_init(void) fdt_devmap[0].pd_prot = VM_PROT_READ | VM_PROT_WRITE; fdt_devmap[0].pd_cache = PTE_NOCACHE; - pmap_devmap_bootstrap_table = &fdt_devmap[0]; + arm_devmap_register_table(&fdt_devmap[0]); return (0); } |