diff options
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/arm64/c_entry.c | 14 | ||||
| -rw-r--r-- | src/arch/arm64/cpu-internal.h | 7 | ||||
| -rw-r--r-- | src/arch/arm64/include/armv8/arch/cpu.h | 13 |
3 files changed, 7 insertions, 27 deletions
diff --git a/src/arch/arm64/c_entry.c b/src/arch/arm64/c_entry.c index aba9fd3719..4e5c1510c0 100644 --- a/src/arch/arm64/c_entry.c +++ b/src/arch/arm64/c_entry.c @@ -36,11 +36,6 @@ void __attribute__((weak)) arm64_soc_init(void) /* Default weak implementation does nothing. */ } -void __attribute__((weak)) soc_secondary_cpu_init(void) -{ - /* Default weak implementation does nothing. */ -} - static void seed_stack(void) { char *stack_begin; @@ -71,15 +66,6 @@ static void secondary_cpu_start(void) mmu_enable(); exception_hwinit(); - if (!IS_ENABLED(CONFIG_SMP)) { - soc_secondary_cpu_init(); - /* - * TODO(adurbin): need a proper place to park the CPUs. - * Currently assuming SoC code does the appropriate thing. - */ - while (1); - } - /* This will never return. */ arch_secondary_cpu_init(); } diff --git a/src/arch/arm64/cpu-internal.h b/src/arch/arm64/cpu-internal.h index be13ba4e98..266dc633c6 100644 --- a/src/arch/arm64/cpu-internal.h +++ b/src/arch/arm64/cpu-internal.h @@ -21,6 +21,13 @@ #define ARCH_CPU_INTERNAL_H /* + * Do the necessary work to prepare for secondary CPUs coming up. The + * SoC will call this function before bringing up the other CPUs. The + * entry point for the seoncdary CPUs is returned. + */ +void *prepare_secondary_cpu_startup(void); + +/* * Code path for the non-BSP CPUs. This is an internal function used. */ void arch_secondary_cpu_init(void); diff --git a/src/arch/arm64/include/armv8/arch/cpu.h b/src/arch/arm64/include/armv8/arch/cpu.h index 8a8e3b6c91..a5d20c49ac 100644 --- a/src/arch/arm64/include/armv8/arch/cpu.h +++ b/src/arch/arm64/include/armv8/arch/cpu.h @@ -97,19 +97,6 @@ int arch_run_on_all_cpus(struct cpu_action *action); int arch_run_on_cpu_async(unsigned int cpu, struct cpu_action *action); int arch_run_on_all_cpus_async(struct cpu_action *action); -/* - * Do the necessary work to prepare for secondary CPUs coming up. The - * SoC will call this function before bringing up the other CPUs. The - * entry point for the seoncdary CPUs is returned. - */ -void *prepare_secondary_cpu_startup(void); - -/* - * Function provided by the SoC code that is called for each secondary - * CPU startup. - */ -void soc_secondary_cpu_init(void); - #endif /* !__PRE_RAM__ */ /* |