On 21/04/2019 10:47, Jared McNeill wrote:
On Sun, 21 Apr 2019, Nick Hudson wrote:Neither RPI2 nor GENERIC use ap_mpsubr.S, so I'm confused.Oops, my bad. Does the new generic start code set SW anywhere? I couldn't find it.
This will enable sctlr.sw on RPI2 (Cortex A7) Nick
Index: sys/arch/arm/arm/cpufunc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/arm/cpufunc.c,v
retrieving revision 1.175
diff -u -p -r1.175 cpufunc.c
--- sys/arch/arm/arm/cpufunc.c 20 Oct 2018 06:35:34 -0000 1.175
+++ sys/arch/arm/arm/cpufunc.c 22 Apr 2019 07:45:53 -0000
@@ -2983,6 +2983,8 @@ armv7_setup(char *args)
actlr_clr = CORTEXA5_ACTLR_EXCL;
actlr_set = CORTEXA5_ACTLR_SMP | CORTEXA5_ACTLR_FW;
} else if (CPU_ID_CORTEX_A7_P(lcputype)) {
+ cpuctrl |= CPU_CONTROL_SWP_ENABLE;
+ cpuctrlmask |= CPU_CONTROL_SWP_ENABLE;
#ifdef MULTIPROCESSOR
actlr_set |= CORTEXA7_ACTLR_SMP;
#endif