diff options
| author | Felix Singer <felixsinger@posteo.net> | 2021-12-31 00:21:08 +0100 |
|---|---|---|
| committer | Felix Singer <felixsinger@posteo.net> | 2022-05-26 11:48:40 +0000 |
| commit | b9652482ce4556183c3b8f90de2c0a71b22d6691 (patch) | |
| tree | 580b482ee9a9a602310a19376641174fba811c07 | |
| parent | 8ba9410c69dbdb9e37bd7c8de2a523f7cfa7a76a (diff) | |
soc/intel/tigerlake: 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.
Also, remove related code from the mainboard starlabs/laptop/tgl, since
it is obsolete now.
Change-Id: I49bbd4a776b4e6c55cb373bbf88a3ca076342e3e
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/60545
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Sean Rhodes <sean@starlabs.systems>
| -rw-r--r-- | src/mainboard/starlabs/labtop/variants/tgl/romstage.c | 4 | ||||
| -rw-r--r-- | src/soc/intel/tigerlake/Kconfig | 1 | ||||
| -rw-r--r-- | src/soc/intel/tigerlake/romstage/fsp_params.c | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/mainboard/starlabs/labtop/variants/tgl/romstage.c b/src/mainboard/starlabs/labtop/variants/tgl/romstage.c index fed6efc9e4..41e7f6dc4d 100644 --- a/src/mainboard/starlabs/labtop/variants/tgl/romstage.c +++ b/src/mainboard/starlabs/labtop/variants/tgl/romstage.c @@ -30,10 +30,6 @@ void mainboard_memory_init_params(FSPM_UPD *mupd) const uint8_t vtd = get_uint_option("vtd", 1); mupd->FspmConfig.VtdDisable = !vtd; - const uint8_t ht = get_uint_option("hyper_threading", - mupd->FspmConfig.HyperThreading); - mupd->FspmConfig.HyperThreading = ht; - /* Enable/Disable Thunderbolt based on CMOS settings */ if (get_uint_option("thunderbolt", 1) == 0) { mupd->FspmConfig.VtdItbtEnable = 0; diff --git a/src/soc/intel/tigerlake/Kconfig b/src/soc/intel/tigerlake/Kconfig index 3d947a515a..fc77cdef6a 100644 --- a/src/soc/intel/tigerlake/Kconfig +++ b/src/soc/intel/tigerlake/Kconfig @@ -26,6 +26,7 @@ config CPU_SPECIFIC_OPTIONS select FSP_STATUS_GLOBAL_RESET_REQUIRED_3 select GENERIC_GPIO_LIB select HAVE_FSP_GOP + select HAVE_HYPERTHREADING select HAVE_INTEL_FSP_REPO select INTEL_DESCRIPTOR_MODE_CAPABLE select HAVE_SMI_HANDLER diff --git a/src/soc/intel/tigerlake/romstage/fsp_params.c b/src/soc/intel/tigerlake/romstage/fsp_params.c index 24b8575357..e07d239264 100644 --- a/src/soc/intel/tigerlake/romstage/fsp_params.c +++ b/src/soc/intel/tigerlake/romstage/fsp_params.c @@ -7,6 +7,7 @@ #include <device/device.h> #include <fsp/util.h> #include <intelblocks/cpulib.h> +#include <option.h> #include <soc/gpio.h> #include <soc/iomap.h> #include <soc/msr.h> @@ -21,6 +22,8 @@ static void soc_memory_init_params(FSP_M_CONFIG *m_cfg, unsigned int i; uint32_t cpu_id, mask = 0; + m_cfg->HyperThreading = get_uint_option("hyper_threading", CONFIG(FSP_HYPERTHREADING)); + m_cfg->InternalGfx = !CONFIG(SOC_INTEL_DISABLE_IGD) && is_devfn_enabled(SA_DEVFN_IGD); /* If IGD is enabled, set IGD stolen size to 60MB. Otherwise, skip IGD init in FSP */ |