Date: Tue, 26 Apr 2016 11:53:37 +0000 (UTC) From: Ruslan Bukin <br@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298627 - in head/sys: arm/allwinner arm/altera/socfpga arm/amlogic/aml8726 arm/annapurna/alpine arm/arm arm/at91 arm/broadcom/bcm2835 arm/cavium/cns11xx arm/freescale arm/freescale/imx... Message-ID: <201604261153.u3QBrbKK077561@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: br Date: Tue Apr 26 11:53:37 2016 New Revision: 298627 URL: https://svnweb.freebsd.org/changeset/base/298627 Log: 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 Added: head/sys/kern/subr_devmap.c - copied, changed from r298626, head/sys/arm/arm/devmap.c head/sys/sys/devmap.h - copied, changed from r298581, head/sys/arm/include/devmap.h Deleted: head/sys/arm/arm/devmap.c head/sys/arm/include/devmap.h head/sys/arm64/include/devmap.h head/sys/riscv/riscv/devmap.c Modified: head/sys/arm/allwinner/allwinner_machdep.c head/sys/arm/altera/socfpga/socfpga_machdep.c head/sys/arm/amlogic/aml8726/aml8726_machdep.c head/sys/arm/annapurna/alpine/alpine_machdep.c head/sys/arm/arm/bus_space_generic.c head/sys/arm/arm/machdep.c head/sys/arm/at91/at91.c head/sys/arm/at91/at91_common.c head/sys/arm/at91/at91_machdep.c head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c head/sys/arm/cavium/cns11xx/econa_machdep.c head/sys/arm/freescale/fsl_ocotp.c head/sys/arm/freescale/imx/imx51_machdep.c head/sys/arm/freescale/imx/imx53_machdep.c head/sys/arm/freescale/imx/imx6_machdep.c head/sys/arm/freescale/imx/imx_machdep.c head/sys/arm/freescale/vybrid/vf_machdep.c head/sys/arm/include/vmparam.h head/sys/arm/lpc/lpc_machdep.c head/sys/arm/mv/mv_common.c head/sys/arm/mv/mv_localbus.c head/sys/arm/mv/mv_machdep.c head/sys/arm/mv/mv_pci.c head/sys/arm/mv/mvvar.h head/sys/arm/mv/orion/db88f5xxx.c head/sys/arm/nvidia/tegra124/tegra124_machdep.c head/sys/arm/nvidia/tegra_pcie.c head/sys/arm/qemu/virt_machdep.c head/sys/arm/rockchip/rk30xx_machdep.c head/sys/arm/samsung/exynos/exynos5_machdep.c head/sys/arm/ti/ti_machdep.c head/sys/arm/versatile/versatile_machdep.c head/sys/arm/xilinx/zy7_machdep.c head/sys/arm/xscale/i8134x/crb_machdep.c head/sys/arm/xscale/ixp425/avila_machdep.c head/sys/arm/xscale/pxa/pxa_machdep.c head/sys/arm64/arm64/machdep.c head/sys/arm64/include/vmparam.h head/sys/conf/files.arm head/sys/conf/files.arm64 head/sys/conf/files.riscv head/sys/riscv/include/vmparam.h Modified: head/sys/arm/allwinner/allwinner_machdep.c ============================================================================== --- head/sys/arm/allwinner/allwinner_machdep.c Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/allwinner/allwinner_machdep.c Tue Apr 26 11:53:37 2016 (r298627) @@ -39,12 +39,12 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> +#include <sys/devmap.h> #include <vm/vm.h> #include <vm/pmap.h> #include <machine/bus.h> -#include <machine/devmap.h> #include <machine/machdep.h> #include <machine/platformvar.h> @@ -98,7 +98,7 @@ static vm_offset_t allwinner_lastaddr(platform_t plat) { - return (arm_devmap_lastaddr()); + return (devmap_lastaddr()); } /* @@ -115,7 +115,7 @@ static int allwinner_devmap_init(platform_t plat) { - arm_devmap_add_entry(0x01C00000, 0x00400000); /* 4MB */ + devmap_add_entry(0x01C00000, 0x00400000); /* 4MB */ return (0); } Modified: head/sys/arm/altera/socfpga/socfpga_machdep.c ============================================================================== --- head/sys/arm/altera/socfpga/socfpga_machdep.c Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/altera/socfpga/socfpga_machdep.c Tue Apr 26 11:53:37 2016 (r298627) @@ -38,12 +38,12 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> +#include <sys/devmap.h> #include <vm/vm.h> #include <machine/armreg.h> #include <machine/bus.h> -#include <machine/devmap.h> #include <machine/machdep.h> #include <machine/platform.h> @@ -51,7 +51,7 @@ vm_offset_t platform_lastaddr(void) { - return (arm_devmap_lastaddr()); + return (devmap_lastaddr()); } void @@ -77,7 +77,7 @@ platform_devmap_init(void) { /* UART */ - arm_devmap_add_entry(0xffc00000, 0x100000); + devmap_add_entry(0xffc00000, 0x100000); /* * USB OTG @@ -87,16 +87,16 @@ platform_devmap_init(void) * It might be caused due to some power save options being turned * on or something else. */ - arm_devmap_add_entry(0xffb00000, 0x100000); + devmap_add_entry(0xffb00000, 0x100000); /* dwmmc */ - arm_devmap_add_entry(0xff700000, 0x100000); + devmap_add_entry(0xff700000, 0x100000); /* scu */ - arm_devmap_add_entry(0xfff00000, 0x100000); + devmap_add_entry(0xfff00000, 0x100000); /* FPGA memory window, 256MB */ - arm_devmap_add_entry(0xd0000000, 0x10000000); + devmap_add_entry(0xd0000000, 0x10000000); return (0); } Modified: head/sys/arm/amlogic/aml8726/aml8726_machdep.c ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_machdep.c Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/amlogic/aml8726/aml8726_machdep.c Tue Apr 26 11:53:37 2016 (r298627) @@ -35,13 +35,13 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> +#include <sys/devmap.h> #include <vm/vm.h> #include <vm/pmap.h> #include <machine/bus.h> #include <machine/cpufunc.h> -#include <machine/devmap.h> #include <machine/intr.h> #include <machine/machdep.h> #include <machine/platform.h> @@ -85,7 +85,7 @@ vm_offset_t platform_lastaddr(void) { - return (arm_devmap_lastaddr()); + return (devmap_lastaddr()); } void @@ -108,7 +108,7 @@ platform_gpio_init(void) * and platform_gpio_init during which printf can't be used. */ aml8726_aobus_kva_base = - (vm_offset_t)arm_devmap_ptov(0xc8100000, 0x100000); + (vm_offset_t)devmap_ptov(0xc8100000, 0x100000); /* * The hardware mux used by clkmsr is unique to the SoC (though @@ -154,14 +154,14 @@ int platform_devmap_init(void) { - arm_devmap_add_entry(0xc1100000, 0x200000); /* cbus */ - arm_devmap_add_entry(0xc4200000, 0x100000); /* pl310 */ - arm_devmap_add_entry(0xc4300000, 0x100000); /* periph */ - arm_devmap_add_entry(0xc8000000, 0x100000); /* apbbus */ - arm_devmap_add_entry(0xc8100000, 0x100000); /* aobus */ - arm_devmap_add_entry(0xc9000000, 0x800000); /* ahbbus */ - arm_devmap_add_entry(0xd9000000, 0x100000); /* ahb */ - arm_devmap_add_entry(0xda000000, 0x100000); /* secbus */ + devmap_add_entry(0xc1100000, 0x200000); /* cbus */ + devmap_add_entry(0xc4200000, 0x100000); /* pl310 */ + devmap_add_entry(0xc4300000, 0x100000); /* periph */ + devmap_add_entry(0xc8000000, 0x100000); /* apbbus */ + devmap_add_entry(0xc8100000, 0x100000); /* aobus */ + devmap_add_entry(0xc9000000, 0x800000); /* ahbbus */ + devmap_add_entry(0xd9000000, 0x100000); /* ahb */ + devmap_add_entry(0xda000000, 0x100000); /* secbus */ return (0); } Modified: head/sys/arm/annapurna/alpine/alpine_machdep.c ============================================================================== --- head/sys/arm/annapurna/alpine/alpine_machdep.c Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/annapurna/alpine/alpine_machdep.c Tue Apr 26 11:53:37 2016 (r298627) @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <sys/lock.h> #include <sys/mutex.h> +#include <sys/devmap.h> #include <vm/vm.h> #include <vm/pmap.h> @@ -42,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */ #include <machine/machdep.h> -#include <machine/devmap.h> #include <machine/platform.h> #include <machine/fdt.h> @@ -128,7 +128,7 @@ int platform_devmap_init(void) { alpine_get_devmap_base(&al_devmap_pa, &al_devmap_size); - arm_devmap_add_entry(al_devmap_pa, al_devmap_size); + devmap_add_entry(al_devmap_pa, al_devmap_size); return (0); } Modified: head/sys/arm/arm/bus_space_generic.c ============================================================================== --- head/sys/arm/arm/bus_space_generic.c Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/arm/bus_space_generic.c Tue Apr 26 11:53:37 2016 (r298627) @@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <sys/kernel.h> #include <sys/malloc.h> +#include <sys/devmap.h> #include <vm/vm.h> #include <vm/pmap.h> @@ -51,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/cpufunc.h> -#include <machine/devmap.h> void generic_bs_unimplemented(void) Modified: head/sys/arm/arm/machdep.c ============================================================================== --- head/sys/arm/arm/machdep.c Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/arm/machdep.c Tue Apr 26 11:53:37 2016 (r298627) @@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$"); #include <sys/cons.h> #include <sys/cpu.h> #include <sys/ctype.h> +#include <sys/devmap.h> #include <sys/efi.h> #include <sys/exec.h> #include <sys/imgact.h> @@ -100,7 +101,6 @@ __FBSDID("$FreeBSD$"); #include <machine/cpuinfo.h> #include <machine/debug_monitor.h> #include <machine/db_machdep.h> -#include <machine/devmap.h> #include <machine/frame.h> #include <machine/intr.h> #include <machine/machdep.h> @@ -455,7 +455,7 @@ cpu_startup(void *dummy) (uintmax_t)arm32_ptob(vm_cnt.v_free_count) / mbyte); if (bootverbose) { arm_physmem_print_tables(); - arm_devmap_print_table(); + devmap_print_table(); } bufinit(); @@ -1692,7 +1692,7 @@ initarm(struct arm_boot_params *abp) /* Establish static device mappings. */ err_devmap = platform_devmap_init(); - arm_devmap_bootstrap(l1pagetable, NULL); + devmap_bootstrap(l1pagetable, NULL); vm_max_kernel_address = platform_lastaddr(); cpu_domains((DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL * 2)) | DOMAIN_CLIENT); @@ -1913,7 +1913,7 @@ initarm(struct arm_boot_params *abp) /* Establish static device mappings. */ err_devmap = platform_devmap_init(); - arm_devmap_bootstrap(0, NULL); + devmap_bootstrap(0, NULL); vm_max_kernel_address = platform_lastaddr(); /* Modified: head/sys/arm/at91/at91.c ============================================================================== --- head/sys/arm/at91/at91.c Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/at91/at91.c Tue Apr 26 11:53:37 2016 (r298627) @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/module.h> +#include <sys/devmap.h> #include <vm/vm.h> #include <vm/vm_kern.h> @@ -45,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include <machine/armreg.h> #define _ARM32_BUS_DMA_PRIVATE #include <machine/bus.h> -#include <machine/devmap.h> #include <machine/intr.h> #include <arm/at91/at91var.h> Modified: head/sys/arm/at91/at91_common.c ============================================================================== --- head/sys/arm/at91/at91_common.c Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/at91/at91_common.c Tue Apr 26 11:53:37 2016 (r298627) @@ -30,10 +30,10 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> +#include <sys/devmap.h> #include <vm/vm.h> -#include <machine/devmap.h> #include <machine/intr.h> #include <machine/machdep.h> #include <machine/platform.h> @@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$"); #include <machine/fdt.h> -extern const struct arm_devmap_entry at91_devmap[]; +extern const struct devmap_entry at91_devmap[]; struct fdt_fixup_entry fdt_fixup_table[] = { { NULL, NULL } @@ -91,7 +91,7 @@ vm_offset_t platform_lastaddr(void) { - return (arm_devmap_lastaddr()); + return (devmap_lastaddr()); } void @@ -106,9 +106,9 @@ int platform_devmap_init(void) { -// arm_devmap_add_entry(0xfff00000, 0x00100000); /* 1MB - uart, aic and timers*/ +// devmap_add_entry(0xfff00000, 0x00100000); /* 1MB - uart, aic and timers*/ - arm_devmap_register_table(at91_devmap); + devmap_register_table(at91_devmap); return (0); } Modified: head/sys/arm/at91/at91_machdep.c ============================================================================== --- head/sys/arm/at91/at91_machdep.c Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/at91/at91_machdep.c Tue Apr 26 11:53:37 2016 (r298627) @@ -71,6 +71,7 @@ __FBSDID("$FreeBSD$"); #include <sys/exec.h> #include <sys/kdb.h> #include <sys/msgbuf.h> +#include <sys/devmap.h> #include <machine/physmem.h> #include <machine/reg.h> #include <machine/cpu.h> @@ -81,7 +82,6 @@ __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> @@ -117,7 +117,7 @@ __FBSDID("$FreeBSD$"); struct pv_addr kernel_pt_table[NUM_KERNEL_PTS]; /* Static device mappings. */ -const struct arm_devmap_entry at91_devmap[] = { +const struct devmap_entry at91_devmap[] = { /* * Map the critical on-board devices. The interrupt vector at * 0xffff0000 makes it impossible to map them PA == VA, so we map all @@ -552,7 +552,7 @@ initarm(struct arm_boot_params *abp) VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE); } - arm_devmap_bootstrap(l1pagetable, at91_devmap); + devmap_bootstrap(l1pagetable, at91_devmap); cpu_domains((DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL * 2)) | DOMAIN_CLIENT); cpu_setttb(kernel_l1pt.pv_pa); cpu_tlb_flushID(); Modified: head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c ============================================================================== --- head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c Tue Apr 26 11:53:37 2016 (r298627) @@ -46,12 +46,12 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> +#include <sys/devmap.h> #include <vm/vm.h> #include <vm/pmap.h> #include <machine/bus.h> -#include <machine/devmap.h> #include <machine/machdep.h> #include <machine/platform.h> #include <machine/platformvar.h> @@ -66,7 +66,7 @@ static vm_offset_t bcm2835_lastaddr(platform_t plat) { - return (arm_devmap_lastaddr()); + return (devmap_lastaddr()); } static void @@ -98,7 +98,7 @@ static int bcm2835_devmap_init(platform_t plat) { - arm_devmap_add_entry(0x20000000, 0x01000000); + devmap_add_entry(0x20000000, 0x01000000); return (0); } #endif @@ -108,7 +108,7 @@ static int bcm2836_devmap_init(platform_t plat) { - arm_devmap_add_entry(0x3f000000, 0x01000000); + devmap_add_entry(0x3f000000, 0x01000000); return (0); } #endif Modified: head/sys/arm/cavium/cns11xx/econa_machdep.c ============================================================================== --- head/sys/arm/cavium/cns11xx/econa_machdep.c Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/cavium/cns11xx/econa_machdep.c Tue Apr 26 11:53:37 2016 (r298627) @@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$"); #include <sys/exec.h> #include <sys/kdb.h> #include <sys/msgbuf.h> +#include <sys/devmap.h> #include <machine/physmem.h> #include <machine/reg.h> #include <machine/cpu.h> @@ -71,7 +72,6 @@ __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> @@ -105,7 +105,7 @@ struct pv_addr abtstack; struct pv_addr kernelstack; /* Static device mappings. */ -static const struct arm_devmap_entry econa_devmap[] = { +static const struct devmap_entry econa_devmap[] = { { /* * This maps DDR SDRAM @@ -263,7 +263,7 @@ initarm(struct arm_boot_params *abp) VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE); } - arm_devmap_bootstrap(l1pagetable, econa_devmap); + devmap_bootstrap(l1pagetable, econa_devmap); cpu_domains((DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL*2)) | DOMAIN_CLIENT); cpu_setttb(kernel_l1pt.pv_pa); cpu_tlb_flushID(); Modified: head/sys/arm/freescale/fsl_ocotp.c ============================================================================== --- head/sys/arm/freescale/fsl_ocotp.c Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/freescale/fsl_ocotp.c Tue Apr 26 11:53:37 2016 (r298627) @@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> #include <vm/pmap.h> #include <dev/fdt/fdt_common.h> -#include <machine/devmap.h> +#include <sys/devmap.h> static uint32_t *ocotp_regs; static vm_size_t ocotp_size; Modified: head/sys/arm/freescale/imx/imx51_machdep.c ============================================================================== --- head/sys/arm/freescale/imx/imx51_machdep.c Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/freescale/imx/imx51_machdep.c Tue Apr 26 11:53:37 2016 (r298627) @@ -33,11 +33,11 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/bus.h> #include <sys/reboot.h> +#include <sys/devmap.h> #include <vm/vm.h> #include <machine/bus.h> -#include <machine/devmap.h> #include <machine/machdep.h> #include <machine/platformvar.h> @@ -49,7 +49,7 @@ static vm_offset_t imx51_lastaddr(platform_t plat) { - return (arm_devmap_lastaddr()); + return (devmap_lastaddr()); } static int @@ -74,9 +74,9 @@ static int imx51_devmap_init(platform_t plat) { - arm_devmap_add_entry(0x70000000, 0x00100000); - arm_devmap_add_entry(0x73f00000, 0x00100000); - arm_devmap_add_entry(0x83f00000, 0x00100000); + devmap_add_entry(0x70000000, 0x00100000); + devmap_add_entry(0x73f00000, 0x00100000); + devmap_add_entry(0x83f00000, 0x00100000); return (0); } Modified: head/sys/arm/freescale/imx/imx53_machdep.c ============================================================================== --- head/sys/arm/freescale/imx/imx53_machdep.c Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/freescale/imx/imx53_machdep.c Tue Apr 26 11:53:37 2016 (r298627) @@ -33,11 +33,11 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/bus.h> #include <sys/reboot.h> +#include <sys/devmap.h> #include <vm/vm.h> #include <machine/bus.h> -#include <machine/devmap.h> #include <machine/machdep.h> #include <machine/platformvar.h> @@ -49,7 +49,7 @@ static vm_offset_t imx53_lastaddr(platform_t plat) { - return (arm_devmap_lastaddr()); + return (devmap_lastaddr()); } static int @@ -74,9 +74,9 @@ static int imx53_devmap_init(platform_t plat) { - arm_devmap_add_entry(0x50000000, 0x00100000); - arm_devmap_add_entry(0x53f00000, 0x00100000); - arm_devmap_add_entry(0x63f00000, 0x00100000); + devmap_add_entry(0x50000000, 0x00100000); + devmap_add_entry(0x53f00000, 0x00100000); + devmap_add_entry(0x63f00000, 0x00100000); return (0); } Modified: head/sys/arm/freescale/imx/imx6_machdep.c ============================================================================== --- head/sys/arm/freescale/imx/imx6_machdep.c Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/freescale/imx/imx6_machdep.c Tue Apr 26 11:53:37 2016 (r298627) @@ -33,11 +33,11 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/bus.h> #include <sys/reboot.h> +#include <sys/devmap.h> #include <vm/vm.h> #include <machine/bus.h> -#include <machine/devmap.h> #include <machine/intr.h> #include <machine/machdep.h> #include <machine/platformvar.h> @@ -166,7 +166,7 @@ static vm_offset_t imx6_lastaddr(platform_t plat) { - return (arm_devmap_lastaddr()); + return (devmap_lastaddr()); } static int @@ -220,9 +220,9 @@ imx6_devmap_init(platform_t plat) const uint32_t IMX6_AIPS2_PHYS = 0x02100000; const uint32_t IMX6_AIPS2_SIZE = 0x00100000; - arm_devmap_add_entry(IMX6_ARMMP_PHYS, IMX6_ARMMP_SIZE); - arm_devmap_add_entry(IMX6_AIPS1_PHYS, IMX6_AIPS1_SIZE); - arm_devmap_add_entry(IMX6_AIPS2_PHYS, IMX6_AIPS2_SIZE); + devmap_add_entry(IMX6_ARMMP_PHYS, IMX6_ARMMP_SIZE); + devmap_add_entry(IMX6_AIPS1_PHYS, IMX6_AIPS1_SIZE); + devmap_add_entry(IMX6_AIPS2_PHYS, IMX6_AIPS2_SIZE); return (0); } @@ -287,7 +287,7 @@ u_int imx_soc_type() IMX6_ANALOG_DIGPROG_SOCTYPE_SHIFT; /*printf("digprog = 0x%08x\n", digprog);*/ if (hwsoc == HWSOC_MX6DL) { - pcr = arm_devmap_ptov(SCU_CONFIG_PHYSADDR, 4); + pcr = devmap_ptov(SCU_CONFIG_PHYSADDR, 4); if (pcr != NULL) { /*printf("scu config = 0x%08x\n", *pcr);*/ if ((*pcr & 0x03) == 0) { Modified: head/sys/arm/freescale/imx/imx_machdep.c ============================================================================== --- head/sys/arm/freescale/imx/imx_machdep.c Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/freescale/imx/imx_machdep.c Tue Apr 26 11:53:37 2016 (r298627) @@ -33,13 +33,13 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/reboot.h> +#include <sys/devmap.h> #include <vm/vm.h> #include <vm/pmap.h> #include <machine/armreg.h> #include <machine/bus.h> -#include <machine/devmap.h> #include <machine/machdep.h> #include <arm/freescale/imx/imx_machdep.h> @@ -85,7 +85,7 @@ imx_wdog_cpu_reset(vm_offset_t wdcr_phys * control register. The reset happens on the next cycle of the wdog * 32KHz clock, so hang out in a spin loop until the reset takes effect. */ - if ((pcr = arm_devmap_ptov(wdcr_physaddr, sizeof(*pcr))) == NULL) { + if ((pcr = devmap_ptov(wdcr_physaddr, sizeof(*pcr))) == NULL) { printf("cpu_reset() can't find its control register... locking up now."); } else { *pcr &= ~WDOG_CR_SRS; @@ -99,7 +99,7 @@ imx_wdog_init_last_reset(vm_offset_t wds { volatile uint16_t * psr; - if ((psr = arm_devmap_ptov(wdsr_phys, sizeof(*psr))) == NULL) + if ((psr = devmap_ptov(wdsr_phys, sizeof(*psr))) == NULL) return; last_reset_status = *psr; if (last_reset_status & WDOG_RSR_SFTW) { Modified: head/sys/arm/freescale/vybrid/vf_machdep.c ============================================================================== --- head/sys/arm/freescale/vybrid/vf_machdep.c Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/freescale/vybrid/vf_machdep.c Tue Apr 26 11:53:37 2016 (r298627) @@ -34,12 +34,12 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> +#include <sys/devmap.h> #include <vm/vm.h> #include <machine/armreg.h> #include <machine/bus.h> -#include <machine/devmap.h> #include <machine/machdep.h> #include <machine/platform.h> @@ -49,7 +49,7 @@ vm_offset_t platform_lastaddr(void) { - return (arm_devmap_lastaddr()); + return (devmap_lastaddr()); } void @@ -74,7 +74,7 @@ int platform_devmap_init(void) { - arm_devmap_add_entry(0x40000000, 0x100000); + devmap_add_entry(0x40000000, 0x100000); return (0); } Modified: head/sys/arm/include/vmparam.h ============================================================================== --- head/sys/arm/include/vmparam.h Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/include/vmparam.h Tue Apr 26 11:53:37 2016 (r298627) @@ -172,4 +172,6 @@ extern vm_offset_t vm_max_kernel_address #define SFBUF #define SFBUF_MAP +#define DEVMAP_MAX_VADDR ARM_VECTORS_HIGH + #endif /* _MACHINE_VMPARAM_H_ */ Modified: head/sys/arm/lpc/lpc_machdep.c ============================================================================== --- head/sys/arm/lpc/lpc_machdep.c Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/lpc/lpc_machdep.c Tue Apr 26 11:53:37 2016 (r298627) @@ -45,13 +45,13 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> +#include <sys/devmap.h> #include <vm/vm.h> #include <vm/pmap.h> #include <machine/bus.h> #include <machine/fdt.h> -#include <machine/devmap.h> #include <machine/machdep.h> #include <machine/platform.h> @@ -64,7 +64,7 @@ vm_offset_t platform_lastaddr(void) { - return (arm_devmap_lastaddr()); + return (devmap_lastaddr()); } void @@ -90,13 +90,13 @@ platform_late_init(void) /* * Add a single static device mapping. * The values used were taken from the ranges property of the SoC node in the - * dts file when this code was converted to arm_devmap_add_entry(). + * dts file when this code was converted to devmap_add_entry(). */ int platform_devmap_init(void) { - arm_devmap_add_entry(LPC_DEV_PHYS_BASE, LPC_DEV_SIZE); + devmap_add_entry(LPC_DEV_PHYS_BASE, LPC_DEV_SIZE); return (0); } Modified: head/sys/arm/mv/mv_common.c ============================================================================== --- head/sys/arm/mv/mv_common.c Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/mv/mv_common.c Tue Apr 26 11:53:37 2016 (r298627) @@ -381,7 +381,7 @@ soc_id(uint32_t *dev, uint32_t *rev) * Notice: system identifiers are available in the registers range of * PCIE controller, so using this function is only allowed (and * possible) after the internal registers range has been mapped in via - * arm_devmap_bootstrap(). + * devmap_bootstrap(). */ *dev = bus_space_read_4(fdtbus_bs_tag, MV_PCIE_BASE, 0) >> 16; *rev = bus_space_read_4(fdtbus_bs_tag, MV_PCIE_BASE, 8) & 0xff; Modified: head/sys/arm/mv/mv_localbus.c ============================================================================== --- head/sys/arm/mv/mv_localbus.c Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/mv/mv_localbus.c Tue Apr 26 11:53:37 2016 (r298627) @@ -36,10 +36,10 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <sys/rman.h> #include <sys/malloc.h> +#include <sys/devmap.h> #include <vm/vm.h> -#include <machine/devmap.h> #include <machine/fdt.h> #include <dev/ofw/ofw_bus.h> @@ -384,7 +384,7 @@ localbus_get_devinfo(device_t bus, devic } int -fdt_localbus_devmap(phandle_t dt_node, struct arm_devmap_entry *fdt_devmap, +fdt_localbus_devmap(phandle_t dt_node, struct devmap_entry *fdt_devmap, int banks_max_num, int *banks_added) { pcell_t ranges[MV_LOCALBUS_MAX_BANKS * MV_LOCALBUS_MAX_BANK_CELLS]; Modified: head/sys/arm/mv/mv_machdep.c ============================================================================== --- head/sys/arm/mv/mv_machdep.c Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/mv/mv_machdep.c Tue Apr 26 11:53:37 2016 (r298627) @@ -45,12 +45,12 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> +#include <sys/devmap.h> #include <vm/vm.h> #include <vm/pmap.h> #include <machine/bus.h> -#include <machine/devmap.h> #include <machine/fdt.h> #include <machine/machdep.h> #include <machine/platform.h> @@ -270,12 +270,12 @@ platform_late_init(void) } #define FDT_DEVMAP_MAX (MV_WIN_CPU_MAX + 2) -static struct arm_devmap_entry fdt_devmap[FDT_DEVMAP_MAX] = { +static struct devmap_entry fdt_devmap[FDT_DEVMAP_MAX] = { { 0, 0, 0, } }; static int -platform_sram_devmap(struct arm_devmap_entry *map) +platform_sram_devmap(struct devmap_entry *map) { #if !defined(SOC_MV_ARMADAXP) phandle_t child, root; @@ -318,10 +318,10 @@ out: * real implementation of this function in arm/mv/mv_pci.c overrides the weak * alias defined here. */ -int mv_default_fdt_pci_devmap(phandle_t node, struct arm_devmap_entry *devmap, +int mv_default_fdt_pci_devmap(phandle_t node, struct devmap_entry *devmap, vm_offset_t io_va, vm_offset_t mem_va); int -mv_default_fdt_pci_devmap(phandle_t node, struct arm_devmap_entry *devmap, +mv_default_fdt_pci_devmap(phandle_t node, struct devmap_entry *devmap, vm_offset_t io_va, vm_offset_t mem_va) { @@ -345,7 +345,7 @@ platform_devmap_init(void) int i, num_mapped; i = 0; - arm_devmap_register_table(&fdt_devmap[0]); + devmap_register_table(&fdt_devmap[0]); #ifdef SOC_MV_ARMADAXP vm_paddr_t cur_immr_pa; Modified: head/sys/arm/mv/mv_pci.c ============================================================================== --- head/sys/arm/mv/mv_pci.c Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/mv/mv_pci.c Tue Apr 26 11:53:37 2016 (r298627) @@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <sys/rman.h> #include <sys/endian.h> +#include <sys/devmap.h> #include <machine/fdt.h> #include <machine/intr.h> @@ -70,7 +71,6 @@ __FBSDID("$FreeBSD$"); #include "ofw_bus_if.h" #include "pcib_if.h" -#include <machine/devmap.h> #include <machine/resource.h> #include <machine/bus.h> @@ -221,7 +221,7 @@ mv_pci_ranges(phandle_t node, struct mv_ } int -mv_pci_devmap(phandle_t node, struct arm_devmap_entry *devmap, vm_offset_t io_va, +mv_pci_devmap(phandle_t node, struct devmap_entry *devmap, vm_offset_t io_va, vm_offset_t mem_va) { struct mv_pci_range io_space, mem_space; Modified: head/sys/arm/mv/mvvar.h ============================================================================== --- head/sys/arm/mv/mvvar.h Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/mv/mvvar.h Tue Apr 26 11:53:37 2016 (r298627) @@ -135,10 +135,10 @@ uint32_t mv_drbl_get_msg(int mnr, int di int mv_msi_data(int irq, uint64_t *addr, uint32_t *data); -struct arm_devmap_entry; +struct devmap_entry; -int mv_pci_devmap(phandle_t, struct arm_devmap_entry *, vm_offset_t, +int mv_pci_devmap(phandle_t, struct devmap_entry *, vm_offset_t, vm_offset_t); -int fdt_localbus_devmap(phandle_t, struct arm_devmap_entry *, int, int *); +int fdt_localbus_devmap(phandle_t, struct devmap_entry *, int, int *); #endif /* _MVVAR_H_ */ Modified: head/sys/arm/mv/orion/db88f5xxx.c ============================================================================== --- head/sys/arm/mv/orion/db88f5xxx.c Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/mv/orion/db88f5xxx.c Tue Apr 26 11:53:37 2016 (r298627) @@ -73,7 +73,7 @@ __FBSDID("$FreeBSD$"); int platform_pci_get_irq(u_int bus, u_int slot, u_int func, u_int pin); /* Static device mappings. */ -const struct arm_devmap_entry db88f5xxx_devmap[] = { +const struct devmap_entry db88f5xxx_devmap[] = { /* * Map the on-board devices VA == PA so that we can access them * with the MMU on or off. Modified: head/sys/arm/nvidia/tegra124/tegra124_machdep.c ============================================================================== --- head/sys/arm/nvidia/tegra124/tegra124_machdep.c Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/nvidia/tegra124/tegra124_machdep.c Tue Apr 26 11:53:37 2016 (r298627) @@ -34,11 +34,11 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/bus.h> #include <sys/reboot.h> +#include <sys/devmap.h> #include <vm/vm.h> #include <machine/bus.h> -#include <machine/devmap.h> #include <machine/fdt.h> #include <machine/intr.h> #include <machine/machdep.h> @@ -84,7 +84,7 @@ static vm_offset_t tegra124_lastaddr(platform_t plat) { - return (arm_devmap_lastaddr()); + return (devmap_lastaddr()); } static int @@ -108,7 +108,7 @@ static int tegra124_devmap_init(platform_t plat) { - arm_devmap_add_entry(0x70000000, 0x01000000); + devmap_add_entry(0x70000000, 0x01000000); return (0); } Modified: head/sys/arm/nvidia/tegra_pcie.c ============================================================================== --- head/sys/arm/nvidia/tegra_pcie.c Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/nvidia/tegra_pcie.c Tue Apr 26 11:53:37 2016 (r298627) @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <sys/rman.h> #include <sys/endian.h> +#include <sys/devmap.h> #include <machine/intr.h> @@ -60,7 +61,6 @@ __FBSDID("$FreeBSD$"); #include <dev/pci/pcireg.h> #include <dev/pci/pcib_private.h> -#include <machine/devmap.h> #include <machine/resource.h> #include <machine/bus.h> @@ -1688,4 +1688,4 @@ static driver_t tegra_pcib_driver = { devclass_t pcib_devclass; -DRIVER_MODULE(pcib, simplebus, tegra_pcib_driver, pcib_devclass, 0, 0); \ No newline at end of file +DRIVER_MODULE(pcib, simplebus, tegra_pcib_driver, pcib_devclass, 0, 0); Modified: head/sys/arm/qemu/virt_machdep.c ============================================================================== --- head/sys/arm/qemu/virt_machdep.c Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/qemu/virt_machdep.c Tue Apr 26 11:53:37 2016 (r298627) @@ -33,11 +33,11 @@ __FBSDID("$FreeBSD$"); #define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> #include <sys/systm.h> +#include <sys/devmap.h> #include <vm/vm.h> #include <machine/bus.h> -#include <machine/devmap.h> #include <machine/platform.h> #include <machine/platformvar.h> @@ -70,7 +70,7 @@ static vm_offset_t virt_lastaddr(platform_t plat) { - return (arm_devmap_lastaddr()); + return (devmap_lastaddr()); } /* @@ -80,7 +80,7 @@ static int virt_devmap_init(platform_t plat) { - arm_devmap_add_entry(0x09000000, 0x100000); /* Uart */ + devmap_add_entry(0x09000000, 0x100000); /* Uart */ return (0); } Modified: head/sys/arm/rockchip/rk30xx_machdep.c ============================================================================== --- head/sys/arm/rockchip/rk30xx_machdep.c Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/rockchip/rk30xx_machdep.c Tue Apr 26 11:53:37 2016 (r298627) @@ -38,13 +38,13 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> +#include <sys/devmap.h> #include <vm/vm.h> #include <vm/pmap.h> #include <machine/armreg.h> #include <machine/bus.h> -#include <machine/devmap.h> #include <machine/machdep.h> #include <machine/platform.h> @@ -56,7 +56,7 @@ vm_offset_t platform_lastaddr(void) { - return (arm_devmap_lastaddr()); + return (devmap_lastaddr()); } void @@ -86,8 +86,8 @@ int platform_devmap_init(void) { - arm_devmap_add_entry(0x10000000, 0x00200000); - arm_devmap_add_entry(0x20000000, 0x00100000); + devmap_add_entry(0x10000000, 0x00200000); + devmap_add_entry(0x20000000, 0x00100000); return (0); } Modified: head/sys/arm/samsung/exynos/exynos5_machdep.c ============================================================================== --- head/sys/arm/samsung/exynos/exynos5_machdep.c Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/samsung/exynos/exynos5_machdep.c Tue Apr 26 11:53:37 2016 (r298627) @@ -34,12 +34,12 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> +#include <sys/devmap.h> #include <vm/vm.h> #include <machine/armreg.h> #include <machine/bus.h> -#include <machine/devmap.h> #include <machine/machdep.h> #include <machine/platform.h> @@ -47,7 +47,7 @@ vm_offset_t platform_lastaddr(void) { - return (arm_devmap_lastaddr()); + return (devmap_lastaddr()); } void @@ -73,13 +73,13 @@ platform_devmap_init(void) { /* CHIP ID */ - arm_devmap_add_entry(0x10000000, 0x100000); + devmap_add_entry(0x10000000, 0x100000); /* UART */ - arm_devmap_add_entry(0x12C00000, 0x100000); + devmap_add_entry(0x12C00000, 0x100000); /* DWMMC */ - arm_devmap_add_entry(0x12200000, 0x100000); + devmap_add_entry(0x12200000, 0x100000); return (0); } Modified: head/sys/arm/ti/ti_machdep.c ============================================================================== --- head/sys/arm/ti/ti_machdep.c Tue Apr 26 11:39:32 2016 (r298626) +++ head/sys/arm/ti/ti_machdep.c Tue Apr 26 11:53:37 2016 (r298627) @@ -44,12 +44,12 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> +#include <sys/devmap.h> #include <vm/vm.h> #include <vm/pmap.h> #include <machine/bus.h> -#include <machine/devmap.h> #include <machine/machdep.h> #include <machine/platformvar.h> @@ -63,7 +63,7 @@ static vm_offset_t ti_lastaddr(platform_t plat) { - return (arm_devmap_lastaddr()); + return (devmap_lastaddr()); } *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604261153.u3QBrbKK077561>