Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37166 )
Change subject: cpu/intel: Move common mp_init.c ......................................................................
cpu/intel: Move common mp_init.c
TBD: apparently 6ex, f3x and f4x have legacy save state TBD: apparently 6fx, 1067x, 106cx have em64t100 save state
Change-Id: I71dbce26d4a428165f370d39e84c54b59d789301 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/cpu/intel/common/Kconfig M src/cpu/intel/common/Makefile.inc R src/cpu/intel/common/mp_init.c M src/cpu/intel/model_1067x/Kconfig M src/cpu/intel/model_1067x/Makefile.inc M src/cpu/intel/model_106cx/Kconfig M src/cpu/intel/model_106cx/Makefile.inc M src/cpu/intel/model_6ex/Kconfig M src/cpu/intel/model_6ex/Makefile.inc M src/cpu/intel/model_6fx/Kconfig M src/cpu/intel/model_6fx/Makefile.inc M src/cpu/intel/model_f3x/Kconfig M src/cpu/intel/model_f3x/Makefile.inc M src/cpu/intel/model_f4x/Kconfig M src/cpu/intel/model_f4x/Makefile.inc 15 files changed, 11 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/66/37166/1
diff --git a/src/cpu/intel/common/Kconfig b/src/cpu/intel/common/Kconfig index 0f2a652..68c59fc 100644 --- a/src/cpu/intel/common/Kconfig +++ b/src/cpu/intel/common/Kconfig @@ -25,6 +25,10 @@ config CPU_INTEL_COMMON_HYPERTHREADING bool
+config CPU_INTEL_COMMON_MP_INIT + bool + depends on PARALLEL_MP + endif
config CPU_INTEL_COMMON_SMM diff --git a/src/cpu/intel/common/Makefile.inc b/src/cpu/intel/common/Makefile.inc index 1612012..e89b94d 100644 --- a/src/cpu/intel/common/Makefile.inc +++ b/src/cpu/intel/common/Makefile.inc @@ -1,5 +1,6 @@ ramstage-$(CONFIG_CPU_INTEL_COMMON) += common_init.c ramstage-$(CONFIG_CPU_INTEL_COMMON_HYPERTHREADING) += hyperthreading.c +ramstage-$(CONFIG_CPU_INTEL_COMMON_MP_INIT) += mp_init.c
ifeq ($(CONFIG_CPU_INTEL_COMMON_TIMEBASE),y) bootblock-y += fsb.c diff --git a/src/cpu/intel/model_1067x/mp_init.c b/src/cpu/intel/common/mp_init.c similarity index 100% rename from src/cpu/intel/model_1067x/mp_init.c rename to src/cpu/intel/common/mp_init.c diff --git a/src/cpu/intel/model_1067x/Kconfig b/src/cpu/intel/model_1067x/Kconfig index 564a428..c1b2001 100644 --- a/src/cpu/intel/model_1067x/Kconfig +++ b/src/cpu/intel/model_1067x/Kconfig @@ -11,5 +11,6 @@ select TSC_SYNC_MFENCE select SUPPORT_CPU_UCODE_IN_CBFS select CPU_INTEL_COMMON + select CPU_INTEL_COMMON_MP_INIT select CPU_INTEL_COMMON_TIMEBASE select SETUP_XIP_CACHE if C_ENVIRONMENT_BOOTBLOCK diff --git a/src/cpu/intel/model_1067x/Makefile.inc b/src/cpu/intel/model_1067x/Makefile.inc index 545f04d..72c03d9 100644 --- a/src/cpu/intel/model_1067x/Makefile.inc +++ b/src/cpu/intel/model_1067x/Makefile.inc @@ -1,5 +1,4 @@ ramstage-y += model_1067x_init.c -ramstage-$(CONFIG_PARALLEL_MP) += mp_init.c subdirs-y += ../../x86/name subdirs-y += ../smm/gen1
diff --git a/src/cpu/intel/model_106cx/Kconfig b/src/cpu/intel/model_106cx/Kconfig index 1ba8894..0f459a9 100644 --- a/src/cpu/intel/model_106cx/Kconfig +++ b/src/cpu/intel/model_106cx/Kconfig @@ -14,6 +14,7 @@ select SUPPORT_CPU_UCODE_IN_CBFS select SERIALIZED_SMM_INITIALIZATION select CPU_INTEL_COMMON + select CPU_INTEL_COMMON_MP_INIT select CPU_INTEL_COMMON_TIMEBASE
if CPU_INTEL_MODEL_106CX diff --git a/src/cpu/intel/model_106cx/Makefile.inc b/src/cpu/intel/model_106cx/Makefile.inc index 6d8414e..a428d01 100644 --- a/src/cpu/intel/model_106cx/Makefile.inc +++ b/src/cpu/intel/model_106cx/Makefile.inc @@ -1,6 +1,5 @@ ramstage-y += model_106cx_init.c subdirs-y += ../../x86/name subdirs-y += ../smm/gen1 -ramstage-$(CONFIG_PARALLEL_MP) += ../model_1067x/mp_init.c
cpu_microcode_bins += $(wildcard 3rdparty/intel-microcode/intel-ucode/06-1c-*) diff --git a/src/cpu/intel/model_6ex/Kconfig b/src/cpu/intel/model_6ex/Kconfig index 3af5272..1db889b 100644 --- a/src/cpu/intel/model_6ex/Kconfig +++ b/src/cpu/intel/model_6ex/Kconfig @@ -12,4 +12,5 @@ select TSC_SYNC_MFENCE select SUPPORT_CPU_UCODE_IN_CBFS select CPU_INTEL_COMMON + select CPU_INTEL_COMMON_MP_INIT select CPU_INTEL_COMMON_TIMEBASE diff --git a/src/cpu/intel/model_6ex/Makefile.inc b/src/cpu/intel/model_6ex/Makefile.inc index e1491e6..34aeee5 100644 --- a/src/cpu/intel/model_6ex/Makefile.inc +++ b/src/cpu/intel/model_6ex/Makefile.inc @@ -2,6 +2,5 @@ subdirs-y += ../../x86/name subdirs-y += ../common subdirs-y += ../smm/gen1 -ramstage-y += ../model_1067x/mp_init.c
cpu_microcode_bins += $(wildcard 3rdparty/intel-microcode/intel-ucode/06-0e-*) diff --git a/src/cpu/intel/model_6fx/Kconfig b/src/cpu/intel/model_6fx/Kconfig index cfd3e7c..fbc30d6 100644 --- a/src/cpu/intel/model_6fx/Kconfig +++ b/src/cpu/intel/model_6fx/Kconfig @@ -12,5 +12,6 @@ select TSC_SYNC_MFENCE select SUPPORT_CPU_UCODE_IN_CBFS select CPU_INTEL_COMMON + select CPU_INTEL_COMMON_MP_INIT select CPU_INTEL_COMMON_TIMEBASE select SETUP_XIP_CACHE if C_ENVIRONMENT_BOOTBLOCK diff --git a/src/cpu/intel/model_6fx/Makefile.inc b/src/cpu/intel/model_6fx/Makefile.inc index f1d64b7..c9e67e6 100644 --- a/src/cpu/intel/model_6fx/Makefile.inc +++ b/src/cpu/intel/model_6fx/Makefile.inc @@ -1,7 +1,6 @@ ramstage-y += model_6fx_init.c subdirs-y += ../../x86/name subdirs-y += ../common -ramstage-$(CONFIG_PARALLEL_MP) += ../model_1067x/mp_init.c subdirs-y += ../smm/gen1
cpu_microcode_bins += $(wildcard 3rdparty/intel-microcode/intel-ucode/06-0f-*) diff --git a/src/cpu/intel/model_f3x/Kconfig b/src/cpu/intel/model_f3x/Kconfig index 9a5e2a1..491f794 100644 --- a/src/cpu/intel/model_f3x/Kconfig +++ b/src/cpu/intel/model_f3x/Kconfig @@ -8,3 +8,4 @@ select SUPPORT_CPU_UCODE_IN_CBFS select CPU_INTEL_COMMON select CPU_INTEL_COMMON_HYPERTHREADING + select CPU_INTEL_COMMON_MP_INIT diff --git a/src/cpu/intel/model_f3x/Makefile.inc b/src/cpu/intel/model_f3x/Makefile.inc index 1f2b564..a16835c 100644 --- a/src/cpu/intel/model_f3x/Makefile.inc +++ b/src/cpu/intel/model_f3x/Makefile.inc @@ -1,5 +1,4 @@ ramstage-y += model_f3x_init.c subdirs-y += ../smm/gen1 -ramstage-$(CONFIG_PARALLEL_MP) += ../model_1067x/mp_init.c
cpu_microcode_bins += $(wildcard 3rdparty/intel-microcode/intel-ucode/0f-03-*) diff --git a/src/cpu/intel/model_f4x/Kconfig b/src/cpu/intel/model_f4x/Kconfig index 4ef60b5..134533a 100644 --- a/src/cpu/intel/model_f4x/Kconfig +++ b/src/cpu/intel/model_f4x/Kconfig @@ -6,3 +6,4 @@ select ARCH_RAMSTAGE_X86_32 select SMP select SUPPORT_CPU_UCODE_IN_CBFS + select CPU_INTEL_COMMON_MP_INIT diff --git a/src/cpu/intel/model_f4x/Makefile.inc b/src/cpu/intel/model_f4x/Makefile.inc index 7e853b0..95f7398 100644 --- a/src/cpu/intel/model_f4x/Makefile.inc +++ b/src/cpu/intel/model_f4x/Makefile.inc @@ -1,5 +1,4 @@ ramstage-y += model_f4x_init.c subdirs-y += ../smm/gen1 -ramstage-$(CONFIG_PARALLEL_MP) += ../model_1067x/mp_init.c
cpu_microcode_bins += $(wildcard 3rdparty/intel-microcode/intel-ucode/0f-04-*)
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37166 )
Change subject: cpu/intel: Move common mp_init.c ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37166/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/37166/1//COMMIT_MSG@9 PS1, Line 9: f3x and f4x probably em64t100 too if they support long mode.
Kyösti Mälkki has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/37166 )
Change subject: cpu/intel: Move common mp_init.c ......................................................................
Abandoned
Kyösti Mälkki has restored this change. ( https://review.coreboot.org/c/coreboot/+/37166 )
Change subject: cpu/intel: Move common mp_init.c ......................................................................
Restored
Hello build bot (Jenkins), Patrick Georgi, Martin Roth, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37166
to look at the new patch set (#3).
Change subject: cpu/intel: Move common mp_init.c ......................................................................
cpu/intel: Move common mp_init.c
TBD: apparently 6ex, f3x and f4x have legacy save state TBD: apparently 6fx, 1067x, 106cx have em64t100 save state
Change-Id: I71dbce26d4a428165f370d39e84c54b59d789301 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/cpu/intel/common/Kconfig M src/cpu/intel/common/Makefile.inc R src/cpu/intel/common/mp_init.c M src/cpu/intel/model_1067x/Kconfig M src/cpu/intel/model_1067x/Makefile.inc M src/cpu/intel/model_106cx/Kconfig M src/cpu/intel/model_106cx/Makefile.inc M src/cpu/intel/model_6ex/Kconfig M src/cpu/intel/model_6ex/Makefile.inc M src/cpu/intel/model_6fx/Kconfig M src/cpu/intel/model_6fx/Makefile.inc M src/cpu/intel/model_f3x/Kconfig M src/cpu/intel/model_f3x/Makefile.inc M src/cpu/intel/model_f4x/Kconfig M src/cpu/intel/model_f4x/Makefile.inc 15 files changed, 11 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/66/37166/3
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37166 )
Change subject: cpu/intel: Move common mp_init.c ......................................................................
Patch Set 7:
This change is ready for review.
Kyösti Mälkki has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/37166 )
Change subject: cpu/intel: Move common mp_init.c ......................................................................
Abandoned
-
Arthur Heymans (Code Review) -
Kyösti Mälkki (Code Review)