diff options
| author | Arthur Heymans <arthur@aheymans.xyz> | 2023-01-30 19:09:34 +0100 |
|---|---|---|
| committer | Arthur Heymans <arthur@aheymans.xyz> | 2023-02-23 08:53:38 +0000 |
| commit | 829e8e65b93963d15367092cd3d364c230465720 (patch) | |
| tree | ebcee8a625ed81f6beffe9a0324c713d6a20b9a6 /src/soc/intel/apollolake | |
| parent | 6b2b8355b321301f39335246afc0db71496961c3 (diff) | |
soc/intel: Use common codeflow for MP init
This fixes MP init on xeon_sp SoCs which was broken by 69cd729 (mb/*:
Remove lapic from devicetree).
Alderlake cpu code was linked in romstage but unused so drop it.
Change-Id: Ia822468a6f15565b97e57612a294a0b80b45b932
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/72604
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Sean Rhodes <sean@starlabs.systems>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Lean Sheng Tan <sheng.tan@9elements.com>
Diffstat (limited to 'src/soc/intel/apollolake')
| -rw-r--r-- | src/soc/intel/apollolake/chip.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/apollolake/cpu.c | 9 | ||||
| -rw-r--r-- | src/soc/intel/apollolake/include/soc/cpu.h | 1 |
3 files changed, 2 insertions, 10 deletions
diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c index 11e3a1e24a..e7a8168c94 100644 --- a/src/soc/intel/apollolake/chip.c +++ b/src/soc/intel/apollolake/chip.c @@ -209,7 +209,7 @@ static struct device_operations pci_domain_ops = { struct device_operations apl_cpu_bus_ops = { .read_resources = noop_read_resources, .set_resources = noop_set_resources, - .init = apollolake_init_cpus, + .init = mp_cpu_bus_init, .acpi_fill_ssdt = generate_cpu_entries, }; diff --git a/src/soc/intel/apollolake/cpu.c b/src/soc/intel/apollolake/cpu.c index 1e0b27b48c..fec2607345 100644 --- a/src/soc/intel/apollolake/cpu.c +++ b/src/soc/intel/apollolake/cpu.c @@ -262,18 +262,11 @@ static const struct mp_ops mp_ops = { .post_mp_init = post_mp_init, }; -void soc_init_cpus(struct bus *cpu_bus) +void mp_init_cpus(struct bus *cpu_bus) { /* Clear for take-off */ /* TODO: Handle mp_init_with_smm failure? */ mp_init_with_smm(cpu_bus, &mp_ops); -} - -void apollolake_init_cpus(struct device *dev) -{ - if (!dev->link_list) - add_more_links(dev, 1); - soc_init_cpus(dev->link_list); /* Temporarily cache the memory-mapped boot media. */ if (CONFIG(BOOT_DEVICE_MEMORY_MAPPED) && diff --git a/src/soc/intel/apollolake/include/soc/cpu.h b/src/soc/intel/apollolake/include/soc/cpu.h index 3157952455..621fe4cbb5 100644 --- a/src/soc/intel/apollolake/include/soc/cpu.h +++ b/src/soc/intel/apollolake/include/soc/cpu.h @@ -8,7 +8,6 @@ #include <soc/msr.h> struct device; -void apollolake_init_cpus(struct device *dev); void mainboard_devtree_update(struct device *dev); /* Flush L1D to L2 */ |