From b3267e002e798e90ca09b11e42ea8949dccde2e7 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Tue, 13 Aug 2019 16:44:04 +0300 Subject: cpu/intel: Replace bsp_init_and_start_aps() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I7176efdd1000789a093a1b4e243b4b150e6bb06f Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/34864 Reviewed-by: Angel Pons Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/cpu/intel/haswell/haswell.h | 2 -- src/cpu/intel/haswell/haswell_init.c | 2 +- src/cpu/intel/model_1067x/mp_init.c | 3 ++- src/cpu/intel/model_2065x/model_2065x_init.c | 2 +- src/cpu/intel/model_206ax/model_206ax_init.c | 2 +- src/cpu/intel/smm/gen1/smi.h | 2 -- 6 files changed, 5 insertions(+), 8 deletions(-) (limited to 'src/cpu') diff --git a/src/cpu/intel/haswell/haswell.h b/src/cpu/intel/haswell/haswell.h index cfd9d45690..7b3a203415 100644 --- a/src/cpu/intel/haswell/haswell.h +++ b/src/cpu/intel/haswell/haswell.h @@ -161,8 +161,6 @@ void smm_info(uintptr_t *perm_smbase, size_t *perm_smsize, void smm_initialize(void); void smm_relocate(void); void smm_lock(void); -struct bus; -void bsp_init_and_start_aps(struct bus *cpu_bus); /* Determine if HyperThreading is disabled. The variable is not valid until * setup_ap_init() has been called. */ #endif diff --git a/src/cpu/intel/haswell/haswell_init.c b/src/cpu/intel/haswell/haswell_init.c index 95d719c2f1..0449235ba5 100644 --- a/src/cpu/intel/haswell/haswell_init.c +++ b/src/cpu/intel/haswell/haswell_init.c @@ -778,7 +778,7 @@ static const struct mp_ops mp_ops = { .post_mp_init = post_mp_init, }; -void bsp_init_and_start_aps(struct bus *cpu_bus) +void mp_init_cpus(struct bus *cpu_bus) { if (mp_init_with_smm(cpu_bus, &mp_ops)) printk(BIOS_ERR, "MP initialization failure.\n"); diff --git a/src/cpu/intel/model_1067x/mp_init.c b/src/cpu/intel/model_1067x/mp_init.c index ea2d83841f..73c9a4788e 100644 --- a/src/cpu/intel/model_1067x/mp_init.c +++ b/src/cpu/intel/model_1067x/mp_init.c @@ -21,6 +21,7 @@ #include #include #include +#include /* Parallel MP initialization support. */ static const void *microcode_patch; @@ -110,7 +111,7 @@ static const struct mp_ops mp_ops = { .post_mp_init = post_mp_init, }; -void bsp_init_and_start_aps(struct bus *cpu_bus) +void mp_init_cpus(struct bus *cpu_bus) { microcode_patch = intel_microcode_find(); diff --git a/src/cpu/intel/model_2065x/model_2065x_init.c b/src/cpu/intel/model_2065x/model_2065x_init.c index 289d4471e6..2f10945c3b 100644 --- a/src/cpu/intel/model_2065x/model_2065x_init.c +++ b/src/cpu/intel/model_2065x/model_2065x_init.c @@ -334,7 +334,7 @@ static const struct mp_ops mp_ops = { .post_mp_init = post_mp_init, }; -void bsp_init_and_start_aps(struct bus *cpu_bus) +void mp_init_cpus(struct bus *cpu_bus) { if (mp_init_with_smm(cpu_bus, &mp_ops)) printk(BIOS_ERR, "MP initialization failure.\n"); diff --git a/src/cpu/intel/model_206ax/model_206ax_init.c b/src/cpu/intel/model_206ax/model_206ax_init.c index 80d85f3347..d3aa52cf5d 100644 --- a/src/cpu/intel/model_206ax/model_206ax_init.c +++ b/src/cpu/intel/model_206ax/model_206ax_init.c @@ -560,7 +560,7 @@ static const struct mp_ops mp_ops = { .post_mp_init = post_mp_init, }; -void bsp_init_and_start_aps(struct bus *cpu_bus) +void mp_init_cpus(struct bus *cpu_bus) { if (mp_init_with_smm(cpu_bus, &mp_ops)) printk(BIOS_ERR, "MP initialization failure.\n"); diff --git a/src/cpu/intel/smm/gen1/smi.h b/src/cpu/intel/smm/gen1/smi.h index 3d5149a430..6623bcc7cf 100644 --- a/src/cpu/intel/smm/gen1/smi.h +++ b/src/cpu/intel/smm/gen1/smi.h @@ -13,8 +13,6 @@ #include -void bsp_init_and_start_aps(struct bus *cpu_bus); - /* These helpers are for performing SMM relocation. */ void southbridge_smm_init(void); u32 northbridge_get_tseg_base(void); -- cgit v1.2.3