From a182faeb88a0b2313ac83371fdefd6ca0d30bb8d Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Fri, 31 Dec 2021 00:30:55 +0100 Subject: [PATCH] soc/intel/alderlake: Hook up FSP hyper-threading setting to option API Select `HAVE_HYPERTHREADING` and hook up the hyper-threading setting from the FSP to the option API so that related mainboards don't have to do that. Unless otherwise configured (e.g. the CMOS setting or overriden by the mainboard code), the value from the Kconfig setting `FSP_HYPERTHREADING` is used. Change-Id: I520a936b4c3a8997ba2c6bea0126b3bbcc5d68ce Signed-off-by: Felix Singer Reviewed-on: https://review.coreboot.org/c/coreboot/+/60547 Tested-by: build bot (Jenkins) Reviewed-by: Sean Rhodes Reviewed-by: Tim Wawrzynczak Reviewed-by: Subrata Banik --- src/soc/intel/alderlake/Kconfig | 1 + src/soc/intel/alderlake/romstage/fsp_params.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/soc/intel/alderlake/Kconfig b/src/soc/intel/alderlake/Kconfig index 1507d6f235..4e10f3d2de 100644 --- a/src/soc/intel/alderlake/Kconfig +++ b/src/soc/intel/alderlake/Kconfig @@ -53,6 +53,7 @@ config CPU_SPECIFIC_OPTIONS select GENERIC_GPIO_LIB select HAVE_DEBUG_RAM_SETUP select HAVE_FSP_GOP + select HAVE_HYPERTHREADING select INTEL_DESCRIPTOR_MODE_CAPABLE select HAVE_SMI_HANDLER select IDT_IN_EVERY_STAGE diff --git a/src/soc/intel/alderlake/romstage/fsp_params.c b/src/soc/intel/alderlake/romstage/fsp_params.c index 863fc43ffa..38d7c67bdc 100644 --- a/src/soc/intel/alderlake/romstage/fsp_params.c +++ b/src/soc/intel/alderlake/romstage/fsp_params.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -158,8 +159,7 @@ static void fill_fspm_cpu_params(FSP_M_CONFIG *m_cfg, m_cfg->PrmrrSize = get_valid_prmrr_size(); m_cfg->EnableC6Dram = config->enable_c6dram; - /* Enable Hyper Threading */ - m_cfg->HyperThreading = 1; + m_cfg->HyperThreading = get_uint_option("hyper_threading", CONFIG(FSP_HYPERTHREADING)); } static void fill_fspm_security_params(FSP_M_CONFIG *m_cfg,