erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

soc/intel/common/block/cpu/smmrelocate: Fix regression

Browse source 
Fix regression introduced by commit d18cc50e6a ("soc/intel/xeon_sp:
Use common smm_relocate").

The MSR SMM_FEATURE_CONTROL_MSR is only implemented on client SoCs.
Starting from Haswell server onwards the "SMM feature control" on
server platforms resides on the UBOX in PCI space.

Parallel SMM relocation was never supported on server platforms, thus
disable parallel SMM relocation for now and thus fix booting on all
Xeon-SP platforms. Added a FIXME to possibly implement this feature
in the future.

TEST=Can boot on OCP/tiogapass again.

Change-Id: I7b4fbe633046acbf9f921cca722ff343a64962cd
Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/90970
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Jérémy Compostella <jeremy.compostella@intel.com>
Reviewed-by: Maximilian Brune <maximilian.brune@9elements.com>
This commit is contained in:
Patrick Rudolph 2026-01-28 11:11:12 +01:00
commit 8ec0dc7356
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/soc/intel/common/block/cpu/smmrelocate.c
View file

@ -78,6 +78,15 @@ static int bsp_setup_msr_save_state(struct smm_relocation_params *relo_params)
{
msr_t smm_mca_cap;
/*
* FIXME: On Xeon-SP the MSR SMM_FEATURE_CONTROL_MSR is not implemented.
* SMM feature control resides on the UBOX PCI device.
* FIXME: Need to enable save state in MSRs on all sockets, however BSP
* runs on a single socket only.
*/
if (CONFIG(XEON_SP_COMMON_BASE) || CONFIG(SOC_INTEL_SNOWRIDGE))
return 0;
smm_mca_cap = rdmsr(SMM_MCA_CAP_MSR);
if (smm_mca_cap.hi & SMM_CPU_SVRSTR_MASK) {
msr_t smm_feature_control;

8
src/soc/intel/snowridge/include/soc/msr.h
View file

@ -5,14 +5,6 @@
#include <intelblocks/msr.h>
/**
* @brief Force serialized SMM relocation by hardcoding `SMM_CPU_SVRSTR` feature as not supported.
*/
#ifdef SMM_CPU_SVRSTR_MASK
#undef SMM_CPU_SVRSTR_MASK
#endif
#define SMM_CPU_SVRSTR_MASK 0
#define MSR_BIOS_DONE 0x151
#define ENABLE_IA_UNTRUSTED BIT(0)