summaryrefslogtreecommitdiffstats
path: root/src/soc/intel/alderlake
diff options
context:
space:
mode:
authorSean Rhodes <sean@starlabs.systems>2023-08-08 13:46:53 +0100
committerMartin L Roth <gaumless@gmail.com>2023-09-26 16:19:56 +0000
commit42f8b59c119309c49b8153dcedec19674ef7f435 (patch)
tree6e6f88e5769110094fd7933bb6d74021468d9aac /src/soc/intel/alderlake
parentfa259540668fe4f42865a73df1809c9d37ac92ae (diff)
downloadcoreboot-42f8b59c119309c49b8153dcedec19674ef7f435.tar.gz
coreboot-42f8b59c119309c49b8153dcedec19674ef7f435.tar.bz2
coreboot-42f8b59c119309c49b8153dcedec19674ef7f435.zip
soc/intel/alderlake: Move C State Demotion to mainboard config
Rather than disabling C State demotions for every single Raptor Lake board due to an issue with S0ix, regardless of if they even use S0ix, configure it in the mainboard. Signed-off-by: Sean Rhodes <sean@starlabs.systems> Change-Id: I4f941a549bc717ae2f8ec961ead7ac7668347c99 Reviewed-on: https://review.coreboot.org/c/coreboot/+/77087 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Martin L Roth <gaumless@gmail.com>
Diffstat (limited to 'src/soc/intel/alderlake')
-rw-r--r--src/soc/intel/alderlake/fsp_params.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/soc/intel/alderlake/fsp_params.c b/src/soc/intel/alderlake/fsp_params.c
index 67fb55bb7de5..d86d62cc9b5b 100644
--- a/src/soc/intel/alderlake/fsp_params.c
+++ b/src/soc/intel/alderlake/fsp_params.c
@@ -1061,11 +1061,12 @@ static void fill_fsps_misc_power_params(FSP_S_CONFIG *s_cfg,
s_cfg->VrPowerDeliveryDesign = config->vr_power_delivery_design;
- /* FIXME: Disable package C state demotion on Raptorlake as a W/A for S0ix issues */
- if ((cpu_id == CPUID_RAPTORLAKE_J0) || (cpu_id == CPUID_RAPTORLAKE_Q0))
- s_cfg->PkgCStateDemotion = 0;
- else
- s_cfg->PkgCStateDemotion = !config->disable_package_c_state_demotion;
+ /* C state demotion must be disabled for Raptorlake J0 and Q0 SKUs */
+ assert(!(config->s0ix_enable && ((cpu_id == CPUID_RAPTORLAKE_J0) ||
+ (cpu_id == CPUID_RAPTORLAKE_Q0)) &&
+ !config->disable_package_c_state_demotion));
+
+ s_cfg->PkgCStateDemotion = !config->disable_package_c_state_demotion;
if (cpu_id == CPUID_RAPTORLAKE_J0 || cpu_id == CPUID_RAPTORLAKE_Q0)
s_cfg->C1e = 0;