diff options
author | mmel <mmel@FreeBSD.org> | 2016-02-05 14:57:41 +0000 |
---|---|---|
committer | mmel <mmel@FreeBSD.org> | 2016-02-05 14:57:41 +0000 |
commit | fd38ead294ac15adc73d80d72d44517a82502ac2 (patch) | |
tree | 6130734e3c63fce61c81af1c7daaa057a0ec3c6c /sys/arm/mv | |
parent | f58eb974cee99ed66fc09089b6d118039edfc098 (diff) | |
download | FreeBSD-src-fd38ead294ac15adc73d80d72d44517a82502ac2.zip FreeBSD-src-fd38ead294ac15adc73d80d72d44517a82502ac2.tar.gz |
ARM: Use new ARMv6 naming conventions for cache and TLB functions
in all but ARMv4 specific files.
Expand ARMv6 compatibility stubs in cpu-v4.h. Use physical address
in L2 cache functions if ARM_L2_PIPT is defined.
Diffstat (limited to 'sys/arm/mv')
-rw-r--r-- | sys/arm/mv/armada38x/pmsu.c | 5 | ||||
-rw-r--r-- | sys/arm/mv/armadaxp/armadaxp_mp.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sys/arm/mv/armada38x/pmsu.c b/sys/arm/mv/armada38x/pmsu.c index a84ede0..110278b 100644 --- a/sys/arm/mv/armada38x/pmsu.c +++ b/sys/arm/mv/armada38x/pmsu.c @@ -36,10 +36,12 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/module.h> #include <sys/resource.h> +#include <sys/systm.h> #include <vm/vm.h> #include <vm/pmap.h> +#include <machine/cpu.h> #include <machine/fdt.h> #include <machine/smp.h> @@ -143,8 +145,7 @@ pmsu_boot_secondary_cpu(void) bus_space_write_4(fdtbus_bs_tag, vaddr, PMSU_BOOT_ADDR_REDIRECT_OFFSET(1), pmap_kextract((vm_offset_t)mpentry)); - cpu_idcache_wbinv_all(); - cpu_l2cache_wbinv_all(); + dcache_wbinv_poc_all(); armv7_sev(); bus_space_unmap(fdtbus_bs_tag, vaddr, MV_PMSU_REGS_LEN); diff --git a/sys/arm/mv/armadaxp/armadaxp_mp.c b/sys/arm/mv/armadaxp/armadaxp_mp.c index 4ccf7e3..52f3508 100644 --- a/sys/arm/mv/armadaxp/armadaxp_mp.c +++ b/sys/arm/mv/armadaxp/armadaxp_mp.c @@ -40,6 +40,7 @@ #include <dev/fdt/fdt_common.h> +#include <machine/cpu.h> #include <machine/smp.h> #include <machine/fdt.h> #include <machine/armreg.h> @@ -174,7 +175,7 @@ platform_mp_start_ap(void) bus_space_write_4(fdtbus_bs_tag, CPU_PMU(cpu_num), CPU_PMU_BOOT, pmap_kextract((vm_offset_t)mpentry)); - cpu_idcache_wbinv_all(); + dcache_wbinv_poc_all(); for (cpu_num = 1; cpu_num < mp_ncpus; cpu_num++ ) bus_space_write_4(fdtbus_bs_tag, MP, MP_SW_RESET(cpu_num), 0); |