svn commit: r306672 - in head/sys: arm/allwinner arm/altera/socfpga arm/amlogic/aml8726 arm/annapurna/alpine arm/arm arm/broadcom/bcm2835 arm/conf arm/freescale/imx arm/freescale/vybrid arm/include...
Andrew Turner
andrew at FreeBSD.org
Tue Oct 4 12:25:48 UTC 2016
Author: andrew
Date: Tue Oct 4 12:25:44 2016
New Revision: 306672
URL: https://svnweb.freebsd.org/changeset/base/306672
Log:
Split CPU_CORTEXA into CPU_CORTEXA8, for the Cortex-A8, and CPU_CORTEXA_MP,
for later Cortex-A CPUs that support the Multiprocessor Extensions. This
will be needed to support both in a single GENERIC kernel while still
being able to only build for a single SoC.
Reviewed by: mmel
Relnotes: yes
Sponsored by: ABT Systems Ltd
Differential Revision: https://reviews.freebsd.org/D8138
Modified:
head/sys/arm/allwinner/std.allwinner
head/sys/arm/allwinner/std.allwinner_up
head/sys/arm/altera/socfpga/std.socfpga
head/sys/arm/amlogic/aml8726/std.aml8726
head/sys/arm/annapurna/alpine/std.alpine
head/sys/arm/arm/cpufunc.c
head/sys/arm/arm/elf_trampoline.c
head/sys/arm/broadcom/bcm2835/std.bcm2836
head/sys/arm/conf/GENERIC
head/sys/arm/freescale/imx/std.imx51
head/sys/arm/freescale/imx/std.imx53
head/sys/arm/freescale/imx/std.imx6
head/sys/arm/freescale/vybrid/std.vybrid
head/sys/arm/include/cpuconf.h
head/sys/arm/include/cpufunc.h
head/sys/arm/include/intr.h
head/sys/arm/mv/armada38x/std.armada38x
head/sys/arm/nvidia/tegra124/std.tegra124
head/sys/arm/qemu/std.virt
head/sys/arm/rockchip/std.rk30xx
head/sys/arm/samsung/exynos/std.exynos5250
head/sys/arm/samsung/exynos/std.exynos5420
head/sys/arm/ti/am335x/std.am335x
head/sys/arm/ti/omap4/std.omap4
head/sys/arm/ti/std.ti
head/sys/arm/xilinx/std.zynq7
head/sys/conf/files.arm
head/sys/conf/options.arm
Modified: head/sys/arm/allwinner/std.allwinner
==============================================================================
--- head/sys/arm/allwinner/std.allwinner Tue Oct 4 12:01:08 2016 (r306671)
+++ head/sys/arm/allwinner/std.allwinner Tue Oct 4 12:25:44 2016 (r306672)
@@ -1,7 +1,7 @@
# Allwinner common options
#$FreeBSD$
-cpu CPU_CORTEXA
+cpu CPU_CORTEXA_MP
machine arm armv6
makeoptions CONF_CFLAGS="-march=armv7a"
Modified: head/sys/arm/allwinner/std.allwinner_up
==============================================================================
--- head/sys/arm/allwinner/std.allwinner_up Tue Oct 4 12:01:08 2016 (r306671)
+++ head/sys/arm/allwinner/std.allwinner_up Tue Oct 4 12:25:44 2016 (r306672)
@@ -1,7 +1,7 @@
# Allwinner Uniprocessor common options
#$FreeBSD$
-cpu CPU_CORTEXA
+cpu CPU_CORTEXA8
machine arm armv6
makeoptions CONF_CFLAGS="-march=armv7a"
Modified: head/sys/arm/altera/socfpga/std.socfpga
==============================================================================
--- head/sys/arm/altera/socfpga/std.socfpga Tue Oct 4 12:01:08 2016 (r306671)
+++ head/sys/arm/altera/socfpga/std.socfpga Tue Oct 4 12:25:44 2016 (r306672)
@@ -1,6 +1,6 @@
# $FreeBSD$
-cpu CPU_CORTEXA
+cpu CPU_CORTEXA_MP
machine arm armv6
makeoptions CONF_CFLAGS="-march=armv7a"
Modified: head/sys/arm/amlogic/aml8726/std.aml8726
==============================================================================
--- head/sys/arm/amlogic/aml8726/std.aml8726 Tue Oct 4 12:01:08 2016 (r306671)
+++ head/sys/arm/amlogic/aml8726/std.aml8726 Tue Oct 4 12:25:44 2016 (r306672)
@@ -1,6 +1,6 @@
# $FreeBSD$
-cpu CPU_CORTEXA
+cpu CPU_CORTEXA_MP
machine arm armv6
makeoptions CONF_CFLAGS="-march=armv7a"
Modified: head/sys/arm/annapurna/alpine/std.alpine
==============================================================================
--- head/sys/arm/annapurna/alpine/std.alpine Tue Oct 4 12:01:08 2016 (r306671)
+++ head/sys/arm/annapurna/alpine/std.alpine Tue Oct 4 12:25:44 2016 (r306672)
@@ -1,6 +1,6 @@
# $FreeBSD$
-cpu CPU_CORTEXA
+cpu CPU_CORTEXA_MP
machine arm armv6
makeoptions CONF_CFLAGS="-march=armv7a -DAL_HAVE_TYPES"
Modified: head/sys/arm/arm/cpufunc.c
==============================================================================
--- head/sys/arm/arm/cpufunc.c Tue Oct 4 12:01:08 2016 (r306671)
+++ head/sys/arm/arm/cpufunc.c Tue Oct 4 12:25:44 2016 (r306672)
@@ -438,7 +438,7 @@ struct cpu_functions arm1176_cpufuncs =
};
#endif /*CPU_ARM1176 */
-#if defined(CPU_CORTEXA) || defined(CPU_KRAIT)
+#if defined(CPU_CORTEXA8) || defined(CPU_CORTEXA_MP) || defined(CPU_KRAIT)
struct cpu_functions cortexa_cpufuncs = {
/* MMU functions */
.cf_control = cpufunc_control,
@@ -463,7 +463,7 @@ struct cpu_functions cortexa_cpufuncs =
/* Soft functions */
.cf_setup = cortexa_setup
};
-#endif /* CPU_CORTEXA */
+#endif /* CPU_CORTEXA8 || CPU_CORTEXA_MP || CPU_KRAIT */
/*
* Global constants also used by locore.s
@@ -481,7 +481,7 @@ u_int cpu_reset_needs_v4_MMU_disable; /*
defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \
defined(CPU_FA526) || defined(CPU_MV_PJ4B) || \
defined(CPU_XSCALE_81342) || \
- defined(CPU_CORTEXA) || defined(CPU_KRAIT)
+ defined(CPU_CORTEXA8) || defined(CPU_CORTEXA_MP) || defined(CPU_KRAIT)
/* Global cache line sizes, use 32 as default */
int arm_dcache_min_line_size = 32;
@@ -672,7 +672,7 @@ set_cpufuncs()
goto out;
}
#endif /* CPU_ARM1176 */
-#if defined(CPU_CORTEXA) || defined(CPU_KRAIT)
+#if defined(CPU_CORTEXA8) || defined(CPU_CORTEXA_MP) || defined(CPU_KRAIT)
switch(cputype & CPU_ID_SCHEME_MASK) {
case CPU_ID_CORTEXA5:
case CPU_ID_CORTEXA7:
@@ -690,7 +690,7 @@ set_cpufuncs()
default:
break;
}
-#endif /* CPU_CORTEXA */
+#endif /* CPU_CORTEXA8 || CPU_CORTEXA_MP || CPU_KRAIT */
#if defined(CPU_MV_PJ4B)
if (cputype == CPU_ID_MV88SV581X_V7 ||
@@ -843,7 +843,7 @@ arm10_setup(void)
#if defined(CPU_ARM1176) \
|| defined(CPU_MV_PJ4B) \
- || defined(CPU_CORTEXA) || defined(CPU_KRAIT)
+ || defined(CPU_CORTEXA8) || defined(CPU_CORTEXA_MP) || defined(CPU_KRAIT)
static __inline void
cpu_scc_setup_ccnt(void)
{
@@ -913,7 +913,7 @@ pj4bv7_setup(void)
}
#endif /* CPU_MV_PJ4B */
-#if defined(CPU_CORTEXA) || defined(CPU_KRAIT)
+#if defined(CPU_CORTEXA8) || defined(CPU_CORTEXA_MP) || defined(CPU_KRAIT)
void
cortexa_setup(void)
@@ -921,7 +921,7 @@ cortexa_setup(void)
cpu_scc_setup_ccnt();
}
-#endif /* CPU_CORTEXA */
+#endif /* CPU_CORTEXA8 || CPU_CORTEXA_MP || CPU_KRAIT */
#if defined(CPU_FA526)
void
Modified: head/sys/arm/arm/elf_trampoline.c
==============================================================================
--- head/sys/arm/arm/elf_trampoline.c Tue Oct 4 12:01:08 2016 (r306671)
+++ head/sys/arm/arm/elf_trampoline.c Tue Oct 4 12:25:44 2016 (r306672)
@@ -88,7 +88,7 @@ extern void xscalec3_l2cache_purge(void)
#elif defined(SOC_MV_KIRKWOOD) || defined(SOC_MV_DISCOVERY)
#define cpu_l2cache_wbinv_all sheeva_l2cache_wbinv_all
extern void sheeva_l2cache_wbinv_all(void);
-#elif defined(CPU_CORTEXA) || defined(CPU_KRAIT)
+#elif defined(CPU_CORTEXA8) || defined(CPU_CORTEXA_MP) || defined(CPU_KRAIT)
#define cpu_idcache_wbinv_all armv7_idcache_wbinv_all
#define cpu_l2cache_wbinv_all()
#else
Modified: head/sys/arm/broadcom/bcm2835/std.bcm2836
==============================================================================
--- head/sys/arm/broadcom/bcm2835/std.bcm2836 Tue Oct 4 12:01:08 2016 (r306671)
+++ head/sys/arm/broadcom/bcm2835/std.bcm2836 Tue Oct 4 12:25:44 2016 (r306672)
@@ -1,7 +1,7 @@
# $FreeBSD$
machine arm armv6
-cpu CPU_CORTEXA
+cpu CPU_CORTEXA_MP
makeoptions CONF_CFLAGS="-march=armv7a"
options SOC_BCM2836
Modified: head/sys/arm/conf/GENERIC
==============================================================================
--- head/sys/arm/conf/GENERIC Tue Oct 4 12:01:08 2016 (r306671)
+++ head/sys/arm/conf/GENERIC Tue Oct 4 12:25:44 2016 (r306672)
@@ -20,7 +20,7 @@
ident GENERIC
-cpu CPU_CORTEXA
+cpu CPU_CORTEXA_MP
machine arm armv6
makeoptions CONF_CFLAGS="-march=armv7a"
Modified: head/sys/arm/freescale/imx/std.imx51
==============================================================================
--- head/sys/arm/freescale/imx/std.imx51 Tue Oct 4 12:01:08 2016 (r306671)
+++ head/sys/arm/freescale/imx/std.imx51 Tue Oct 4 12:25:44 2016 (r306672)
@@ -1,6 +1,6 @@
# $FreeBSD$
machine arm armv6
-cpu CPU_CORTEXA
+cpu CPU_CORTEXA8
makeoptions CONF_CFLAGS="-march=armv7a"
options KERNVIRTADDR=0xc0100000
Modified: head/sys/arm/freescale/imx/std.imx53
==============================================================================
--- head/sys/arm/freescale/imx/std.imx53 Tue Oct 4 12:01:08 2016 (r306671)
+++ head/sys/arm/freescale/imx/std.imx53 Tue Oct 4 12:25:44 2016 (r306672)
@@ -1,6 +1,6 @@
# $FreeBSD$
machine arm armv6
-cpu CPU_CORTEXA
+cpu CPU_CORTEXA8
makeoptions CONF_CFLAGS="-march=armv7a"
options KERNVIRTADDR=0xc0100000
Modified: head/sys/arm/freescale/imx/std.imx6
==============================================================================
--- head/sys/arm/freescale/imx/std.imx6 Tue Oct 4 12:01:08 2016 (r306671)
+++ head/sys/arm/freescale/imx/std.imx6 Tue Oct 4 12:25:44 2016 (r306672)
@@ -1,6 +1,6 @@
# $FreeBSD$
machine arm armv6
-cpu CPU_CORTEXA
+cpu CPU_CORTEXA_MP
makeoptions CONF_CFLAGS="-march=armv7a"
options KERNVIRTADDR = 0xc2000000
Modified: head/sys/arm/freescale/vybrid/std.vybrid
==============================================================================
--- head/sys/arm/freescale/vybrid/std.vybrid Tue Oct 4 12:01:08 2016 (r306671)
+++ head/sys/arm/freescale/vybrid/std.vybrid Tue Oct 4 12:25:44 2016 (r306672)
@@ -1,6 +1,6 @@
# $FreeBSD$
-cpu CPU_CORTEXA
+cpu CPU_CORTEXA_MP
machine arm armv6
makeoptions CONF_CFLAGS="-march=armv7a"
Modified: head/sys/arm/include/cpuconf.h
==============================================================================
--- head/sys/arm/include/cpuconf.h Tue Oct 4 12:01:08 2016 (r306671)
+++ head/sys/arm/include/cpuconf.h Tue Oct 4 12:25:44 2016 (r306672)
@@ -56,7 +56,8 @@
defined(CPU_XSCALE_PXA2X0) + \
defined(CPU_FA526) + \
defined(CPU_XSCALE_IXP425)) + \
- defined(CPU_CORTEXA) + \
+ defined(CPU_CORTEXA8) + \
+ defined(CPU_CORTEXA_MP) + \
defined(CPU_KRAIT) + \
defined(CPU_MV_PJ4B)
@@ -85,7 +86,8 @@
#endif
#endif
-#if defined(CPU_CORTEXA) || defined(CPU_KRAIT) || defined(CPU_MV_PJ4B)
+#if defined(CPU_CORTEXA8) || defined(CPU_CORTEXA_MP) || \
+ defined(CPU_KRAIT) || defined(CPU_MV_PJ4B)
#define ARM_ARCH_7A 1
#else
#define ARM_ARCH_7A 0
@@ -155,7 +157,8 @@
#define ARM_MMU_V6 0
#endif
-#if defined(CPU_CORTEXA) || defined(CPU_KRAIT) || defined(CPU_MV_PJ4B)
+#if defined(CPU_CORTEXA8) || defined(CPU_CORTEXA_MP) || \
+ defined(CPU_KRAIT) || defined(CPU_MV_PJ4B)
#define ARM_MMU_V7 1
#else
#define ARM_MMU_V7 0
Modified: head/sys/arm/include/cpufunc.h
==============================================================================
--- head/sys/arm/include/cpufunc.h Tue Oct 4 12:01:08 2016 (r306671)
+++ head/sys/arm/include/cpufunc.h Tue Oct 4 12:25:44 2016 (r306672)
@@ -278,7 +278,8 @@ void sheeva_l2cache_wbinv_all (void);
#if defined(CPU_MV_PJ4B)
void armv6_idcache_wbinv_all (void);
#endif
-#if defined(CPU_MV_PJ4B) || defined(CPU_CORTEXA) || defined(CPU_KRAIT)
+#if defined(CPU_CORTEXA8) || defined(CPU_CORTEXA_MP) || \
+ defined(CPU_MV_PJ4B) || defined(CPU_KRAIT)
void armv7_setttb (u_int);
void armv7_idcache_wbinv_all (void);
void armv7_cpu_sleep (int);
Modified: head/sys/arm/include/intr.h
==============================================================================
--- head/sys/arm/include/intr.h Tue Oct 4 12:01:08 2016 (r306671)
+++ head/sys/arm/include/intr.h Tue Oct 4 12:25:44 2016 (r306672)
@@ -76,7 +76,7 @@ int intr_pic_ipi_setup(u_int, const char
#elif defined(CPU_ARM9) || defined(SOC_MV_KIRKWOOD) || \
defined(CPU_XSCALE_IXP435)
#define NIRQ 64
-#elif defined(CPU_CORTEXA)
+#elif defined(CPU_CORTEXA8) || defined(CPU_CORTEXA_MP)
#define NIRQ 1020
#elif defined(CPU_KRAIT)
#define NIRQ 288
Modified: head/sys/arm/mv/armada38x/std.armada38x
==============================================================================
--- head/sys/arm/mv/armada38x/std.armada38x Tue Oct 4 12:01:08 2016 (r306671)
+++ head/sys/arm/mv/armada38x/std.armada38x Tue Oct 4 12:25:44 2016 (r306672)
@@ -1,7 +1,7 @@
# $FreeBSD$
files "../mv/armada38x/files.armada38x"
files "../mv/files.mv"
-cpu CPU_CORTEXA
+cpu CPU_CORTEXA_MP
machine arm armv6
makeoptions CONF_CFLAGS="-march=armv7a"
Modified: head/sys/arm/nvidia/tegra124/std.tegra124
==============================================================================
--- head/sys/arm/nvidia/tegra124/std.tegra124 Tue Oct 4 12:01:08 2016 (r306671)
+++ head/sys/arm/nvidia/tegra124/std.tegra124 Tue Oct 4 12:25:44 2016 (r306672)
@@ -1,5 +1,5 @@
# $FreeBSD$
-cpu CPU_CORTEXA
+cpu CPU_CORTEXA_MP
machine arm armv6
makeoptions CONF_CFLAGS="-march=armv7a"
Modified: head/sys/arm/qemu/std.virt
==============================================================================
--- head/sys/arm/qemu/std.virt Tue Oct 4 12:01:08 2016 (r306671)
+++ head/sys/arm/qemu/std.virt Tue Oct 4 12:25:44 2016 (r306672)
@@ -1,6 +1,6 @@
# $FreeBSD$
machine arm armv6
-cpu CPU_CORTEXA
+cpu CPU_CORTEXA_MP
makeoptions CONF_CFLAGS="-march=armv7a"
options KERNVIRTADDR = 0xc1000000
Modified: head/sys/arm/rockchip/std.rk30xx
==============================================================================
--- head/sys/arm/rockchip/std.rk30xx Tue Oct 4 12:01:08 2016 (r306671)
+++ head/sys/arm/rockchip/std.rk30xx Tue Oct 4 12:25:44 2016 (r306672)
@@ -1,7 +1,7 @@
# Rockchip rk30xx common options
#$FreeBSD$
-cpu CPU_CORTEXA
+cpu CPU_CORTEXA_MP
machine arm armv6
makeoptions CONF_CFLAGS="-march=armv7a"
Modified: head/sys/arm/samsung/exynos/std.exynos5250
==============================================================================
--- head/sys/arm/samsung/exynos/std.exynos5250 Tue Oct 4 12:01:08 2016 (r306671)
+++ head/sys/arm/samsung/exynos/std.exynos5250 Tue Oct 4 12:25:44 2016 (r306672)
@@ -1,6 +1,6 @@
# $FreeBSD$
-cpu CPU_CORTEXA
+cpu CPU_CORTEXA_MP
machine arm armv6
makeoptions CONF_CFLAGS="-march=armv7a"
Modified: head/sys/arm/samsung/exynos/std.exynos5420
==============================================================================
--- head/sys/arm/samsung/exynos/std.exynos5420 Tue Oct 4 12:01:08 2016 (r306671)
+++ head/sys/arm/samsung/exynos/std.exynos5420 Tue Oct 4 12:25:44 2016 (r306672)
@@ -1,6 +1,6 @@
# $FreeBSD$
-cpu CPU_CORTEXA
+cpu CPU_CORTEXA_MP
machine arm armv6
makeoptions CONF_CFLAGS="-march=armv7a"
Modified: head/sys/arm/ti/am335x/std.am335x
==============================================================================
--- head/sys/arm/ti/am335x/std.am335x Tue Oct 4 12:01:08 2016 (r306671)
+++ head/sys/arm/ti/am335x/std.am335x Tue Oct 4 12:25:44 2016 (r306672)
@@ -3,6 +3,8 @@
files "../ti/am335x/files.am335x"
include "../ti/std.ti"
+cpu CPU_CORTEXA8
+
options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm
makeoptions KERNVIRTADDR=0xc0200000
Modified: head/sys/arm/ti/omap4/std.omap4
==============================================================================
--- head/sys/arm/ti/omap4/std.omap4 Tue Oct 4 12:01:08 2016 (r306671)
+++ head/sys/arm/ti/omap4/std.omap4 Tue Oct 4 12:25:44 2016 (r306672)
@@ -3,6 +3,8 @@
files "../ti/omap4/files.omap4"
include "../ti/std.ti"
+cpu CPU_CORTEXA_MP
+
options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm
makeoptions KERNVIRTADDR=0xc0200000
Modified: head/sys/arm/ti/std.ti
==============================================================================
--- head/sys/arm/ti/std.ti Tue Oct 4 12:01:08 2016 (r306671)
+++ head/sys/arm/ti/std.ti Tue Oct 4 12:25:44 2016 (r306672)
@@ -1,6 +1,5 @@
# $FreeBSD$
-cpu CPU_CORTEXA
machine arm armv6
makeoptions CONF_CFLAGS="-march=armv7a"
Modified: head/sys/arm/xilinx/std.zynq7
==============================================================================
--- head/sys/arm/xilinx/std.zynq7 Tue Oct 4 12:01:08 2016 (r306671)
+++ head/sys/arm/xilinx/std.zynq7 Tue Oct 4 12:25:44 2016 (r306672)
@@ -3,7 +3,7 @@
#
# $FreeBSD$
-cpu CPU_CORTEXA
+cpu CPU_CORTEXA_MP
machine arm armv6
makeoptions CONF_CFLAGS="-march=armv7a"
Modified: head/sys/conf/files.arm
==============================================================================
--- head/sys/conf/files.arm Tue Oct 4 12:01:08 2016 (r306671)
+++ head/sys/conf/files.arm Tue Oct 4 12:25:44 2016 (r306672)
@@ -32,7 +32,7 @@ arm/arm/cpufunc_asm_arm11x6.S optional c
arm/arm/cpufunc_asm_armv4.S optional cpu_arm9 | cpu_arm9e | cpu_fa526 | cpu_xscale_pxa2x0 | cpu_xscale_ixp425 | cpu_xscale_81342
arm/arm/cpufunc_asm_armv5_ec.S optional cpu_arm9e
arm/arm/cpufunc_asm_armv6.S optional cpu_arm1176
-arm/arm/cpufunc_asm_armv7.S optional cpu_cortexa | cpu_krait | cpu_mv_pj4b
+arm/arm/cpufunc_asm_armv7.S optional cpu_cortexa8 | cpu_cortexa_mp | cpu_krait | cpu_mv_pj4b
arm/arm/cpufunc_asm_fa526.S optional cpu_fa526
arm/arm/cpufunc_asm_pj4b.S optional cpu_mv_pj4b
arm/arm/cpufunc_asm_sheeva.S optional cpu_arm9e
Modified: head/sys/conf/options.arm
==============================================================================
--- head/sys/conf/options.arm Tue Oct 4 12:01:08 2016 (r306671)
+++ head/sys/conf/options.arm Tue Oct 4 12:25:44 2016 (r306672)
@@ -10,7 +10,8 @@ COUNTS_PER_SEC opt_timer.h
CPU_ARM9 opt_global.h
CPU_ARM9E opt_global.h
CPU_ARM1176 opt_global.h
-CPU_CORTEXA opt_global.h
+CPU_CORTEXA8 opt_global.h # Support the Cortex-A8 (no MP extensions)
+CPU_CORTEXA_MP opt_global.h # Support Cortex-A CPUs with MP extensions
CPU_KRAIT opt_global.h
CPU_FA526 opt_global.h
CPU_MV_PJ4B opt_global.h
More information about the svn-src-all
mailing list