diff options
author | ian <ian@FreeBSD.org> | 2014-05-14 19:18:58 +0000 |
---|---|---|
committer | ian <ian@FreeBSD.org> | 2014-05-14 19:18:58 +0000 |
commit | 057c7452877929463827f58db062e6c8a7e70e1e (patch) | |
tree | 4d7e5652ad495e1d8b2080c968e1eaf2b8f0ffba /sys/arm/include | |
parent | 21fbbde45943109155a62d78963119afc7f3f290 (diff) | |
download | FreeBSD-src-057c7452877929463827f58db062e6c8a7e70e1e.zip FreeBSD-src-057c7452877929463827f58db062e6c8a7e70e1e.tar.gz |
MFC r257738, r259202, r258410, r260288, r260292, r260294, r260320, r260323,
r260326, r260327, r260331, r260333, r260340, r260371, r260372, r260373,
r260374, r260375
Add common bus_space tag definition shared for most supported ARMv6/v7 SoCs.
Correct license statements to reflect the fact that these files were all
derived from sys/arm/mv/bus_space.c.
In pmap_unmapdev(), remember the size, and use that as an argument to
kva_free(), or we'd end up always passing it a size of 0
In pmap_mapdev(), first check whether a static mapping exists,
Convert TI static device mapping to use the new arm_devmap_add_entry(),
Use the common armv6 fdt_bus_tag defintion for tegra instead of a local copy.
Eliminate use of fdt_immr_addr(), it's not needed for tegra
Convert lpc from using fdt_immr style to arm_devmap_add_entry() to make
static device mappings.
Retire machine/fdt.h as a header used by MI code, as its function is now
obsolete. This involves the following pieces:
- Remove it entirely on PowerPC, where it is not used by MD code either
- Remove all references to machine/fdt.h in non-architecture-specific code
(aside from uart_cpu_fdt.c, shared by ARM and MIPS, and so is somewhat
non-arch-specific).
- Fix code relying on header pollution from machine/fdt.h includes
- Legacy fdtbus.c (still used on x86 FDT systems) now passes resource
requests to its parent (nexus). This allows x86 FDT devices to allocate
both memory and IO requests and removes the last notionally MI use of
fdtbus_bs_tag.
- On those architectures that retain a machine/fdt.h, unused bits like
FDT_MAP_IRQ and FDT_INTR_MAX have been removed.
Add #include <machine/fdt.h> to a few files that used to get it via pollution
Enable the mv cesa security/crypto device by providing the required property
in the dts source, and adding the right devices to the kernel config.
Remove dev/fdt/fdt_pci.c, which was code specific to Marvell ARM SoCs,
related to setting up static device mappings. Since it was only used by
arm/mv/mv_pci.c, it's now just static functions within that file, plus
one public function that gets called only from arm/mv/mv_machdep.c.
Switch RPi to using arm_devmap_add_entry() to set up static device mapping.
Allow 'no static device mappings' to potentially work.
Don't try to find a static mapping before calling pmap_mapdev(), that logic
is now part of pmap_mapdev() and doesn't need to be duplicated here.
Switch a10 to using arm_devmap_add_entry() to set up static device mapping.
Diffstat (limited to 'sys/arm/include')
-rw-r--r-- | sys/arm/include/fdt.h | 7 | ||||
-rw-r--r-- | sys/arm/include/intr.h | 2 | ||||
-rw-r--r-- | sys/arm/include/ofw_machdep.h | 7 | ||||
-rw-r--r-- | sys/arm/include/psl.h | 1 |
4 files changed, 7 insertions, 10 deletions
diff --git a/sys/arm/include/fdt.h b/sys/arm/include/fdt.h index 0be9927..9bd9332 100644 --- a/sys/arm/include/fdt.h +++ b/sys/arm/include/fdt.h @@ -51,15 +51,8 @@ */ extern bus_space_tag_t fdtbus_bs_tag; -struct mem_region { - vm_offset_t mr_start; - vm_size_t mr_size; -}; - struct arm_devmap_entry; int fdt_localbus_devmap(phandle_t, struct arm_devmap_entry *, int, int *); -int fdt_pci_devmap(phandle_t, struct arm_devmap_entry *devmap, vm_offset_t, - vm_offset_t); #endif /* _MACHINE_FDT_H_ */ diff --git a/sys/arm/include/intr.h b/sys/arm/include/intr.h index dedf5b2..49d6c05 100644 --- a/sys/arm/include/intr.h +++ b/sys/arm/include/intr.h @@ -67,8 +67,6 @@ #define NIRQ 32 #endif -#include <machine/psl.h> -#include <sys/bus.h> int arm_get_next_irq(int); void arm_mask_irq(uintptr_t); diff --git a/sys/arm/include/ofw_machdep.h b/sys/arm/include/ofw_machdep.h index 11797da..d6bd576 100644 --- a/sys/arm/include/ofw_machdep.h +++ b/sys/arm/include/ofw_machdep.h @@ -32,6 +32,13 @@ #ifndef _MACHINE_OFW_MACHDEP_H_ #define _MACHINE_OFW_MACHDEP_H_ +#include <vm/vm.h> + typedef uint32_t cell_t; +struct mem_region { + vm_offset_t mr_start; + vm_size_t mr_size; +}; + #endif /* _MACHINE_OFW_MACHDEP_H_ */ diff --git a/sys/arm/include/psl.h b/sys/arm/include/psl.h index c86ddb8..b300ff4 100644 --- a/sys/arm/include/psl.h +++ b/sys/arm/include/psl.h @@ -46,7 +46,6 @@ #ifndef _MACHINE_PSL_H_ #define _MACHINE_PSL_H_ -#include <machine/intr.h> /* * These are the different SPL states |