diff options
author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2022-11-08 04:43:41 +0000 |
---|---|---|
committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2022-11-09 18:10:54 +0000 |
commit | 7b73e85283bea7f456ab2f86ed1d1099eb88bc2f (patch) | |
tree | a5aba9ebe735e4f904b5edad8f6b6ddf6122d607 /src/cpu/intel/model_f2x | |
parent | c8a20b9d3b8939e4b7d259c5857631c9690657de (diff) |
Revert "mb/aopen/dxplplusu: Remove board"
This reverts commit eb76a455cd39ec59b7f2ba28baeec9538befd59e
and applies minor fixes to make it build again.
PARALLEL_MP was working prior to board removal and no
relevant SMI handlers were implemented. So NO_SMM choice
is now selected.
Change-Id: Ia1cd02278240d1b5d006fb2a7730d3d86390f85b
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/69339
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Diffstat (limited to 'src/cpu/intel/model_f2x')
-rw-r--r-- | src/cpu/intel/model_f2x/Kconfig | 7 | ||||
-rw-r--r-- | src/cpu/intel/model_f2x/Makefile.inc | 5 | ||||
-rw-r--r-- | src/cpu/intel/model_f2x/model_f2x_init.c | 67 |
3 files changed, 79 insertions, 0 deletions
diff --git a/src/cpu/intel/model_f2x/Kconfig b/src/cpu/intel/model_f2x/Kconfig new file mode 100644 index 0000000000..999ea4d386 --- /dev/null +++ b/src/cpu/intel/model_f2x/Kconfig @@ -0,0 +1,7 @@ +config CPU_INTEL_MODEL_F2X + bool + select ARCH_X86 + select SUPPORT_CPU_UCODE_IN_CBFS + select CPU_INTEL_COMMON + select SSE2 + select NO_SMM diff --git a/src/cpu/intel/model_f2x/Makefile.inc b/src/cpu/intel/model_f2x/Makefile.inc new file mode 100644 index 0000000000..5d60d21eda --- /dev/null +++ b/src/cpu/intel/model_f2x/Makefile.inc @@ -0,0 +1,5 @@ +subdirs-y += ../common + +ramstage-y += model_f2x_init.c + +cpu_microcode_bins += $(wildcard 3rdparty/intel-microcode/intel-ucode/0f-02-*) diff --git a/src/cpu/intel/model_f2x/model_f2x_init.c b/src/cpu/intel/model_f2x/model_f2x_init.c new file mode 100644 index 0000000000..a228229371 --- /dev/null +++ b/src/cpu/intel/model_f2x/model_f2x_init.c @@ -0,0 +1,67 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <device/device.h> +#include <cpu/cpu.h> +#include <cpu/x86/mp.h> +#include <cpu/x86/mtrr.h> +#include <cpu/intel/microcode.h> +#include <cpu/intel/common/common.h> +#include <cpu/x86/cache.h> + +static void model_f2x_init(struct device *cpu) +{ + /* Turn on caching if we haven't already */ + enable_cache(); +}; + +static struct device_operations cpu_dev_ops = { + .init = model_f2x_init, +}; + +static const struct cpu_device_id cpu_table[] = { + { X86_VENDOR_INTEL, 0x0f22 }, + { X86_VENDOR_INTEL, 0x0f24 }, + { X86_VENDOR_INTEL, 0x0f25 }, + { X86_VENDOR_INTEL, 0x0f26 }, + { X86_VENDOR_INTEL, 0x0f27 }, + { X86_VENDOR_INTEL, 0x0f29 }, + { 0, 0 }, +}; + +static const struct cpu_driver driver __cpu_driver = { + .ops = &cpu_dev_ops, + .id_table = cpu_table, +}; + +/* Parallel MP initialization support. */ +static void pre_mp_init(void) +{ + const void *patch = intel_microcode_find(); + intel_microcode_load_unlocked(patch); + + /* Setup MTRRs based on physical address size. */ + x86_setup_mtrrs_with_detect(); + x86_mtrr_check(); +} + +static int get_cpu_count(void) +{ + return CONFIG_MAX_CPUS; +} + +static void get_microcode_info(const void **microcode, int *parallel) +{ + *microcode = intel_microcode_find(); + *parallel = !intel_ht_supported(); +} + +static const struct mp_ops mp_ops = { + .pre_mp_init = pre_mp_init, + .get_cpu_count = get_cpu_count, + .get_microcode_info = get_microcode_info, +}; + +void mp_init_cpus(struct bus *cpu_bus) +{ + mp_init_with_smm(cpu_bus, &mp_ops); +} |