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

soc/intel/{tigerlake,alderlake}: Correct FSP config rather than asserting

Browse source 
Meteor Lake handles a misconfigured devicetree better than Alder Lake
and Tiger Lake; it throws a warning and corrects the FSP config rather
than asserting.

Copy that behavior to Alder Lake and Tiger Lake.

Change-Id: Ifd768fc31a0a6ef2fa0ae7e890cf0b47a9968d30
Signed-off-by: Sean Rhodes <sean@starlabs.systems>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/84647
Reviewed-by: Subrata Banik <subratabanik@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nicholas Sudsgaard <devel+coreboot@nsudsgaard.com>
This commit is contained in:
Sean Rhodes 2024-10-03 09:15:26 +01:00 • committed by Martin L Roth
commit bd299aee38
2 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/soc/intel/alderlake/fsp_params.c
View file

@ -900,10 +900,16 @@ static void fill_fsps_cnvi_params(FSP_S_CONFIG *s_cfg,
s_cfg->CnviMode = is_devfn_enabled(PCH_DEVFN_CNVI_WIFI);
s_cfg->CnviBtCore = config->cnvi_bt_core;
s_cfg->CnviBtAudioOffload = config->cnvi_bt_audio_offload;
/* Assert if CNVi BT is enabled without CNVi being enabled. */
assert(s_cfg->CnviMode || !s_cfg->CnviBtCore);
/* Assert if CNVi BT offload is enabled without CNVi BT being enabled. */
assert(s_cfg->CnviBtCore || !s_cfg->CnviBtAudioOffload);
if (!s_cfg->CnviBtCore && s_cfg->CnviBtAudioOffload) {
printk(BIOS_ERR, "BT offload is enabled without CNVi BT being enabled\n");
s_cfg->CnviBtAudioOffload = 0;
}
if (!s_cfg->CnviMode && s_cfg->CnviBtCore) {
printk(BIOS_ERR, "CNVi BT is enabled without CNVi being enabled\n");
s_cfg->CnviBtCore = 0;
s_cfg->CnviBtAudioOffload = 0;
}
}
static void fill_fsps_vmd_params(FSP_S_CONFIG *s_cfg,

14
src/soc/intel/tigerlake/fsp_params.c
View file

@ -496,10 +496,16 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd)
params->CnviMode = is_devfn_enabled(PCH_DEVFN_CNVI_WIFI);
params->CnviBtCore = config->CnviBtCore;
params->CnviBtAudioOffload = config->CnviBtAudioOffload;
/* Assert if CNVi BT is enabled without CNVi being enabled. */
assert(params->CnviMode || !params->CnviBtCore);
/* Assert if CNVi BT offload is enabled without CNVi BT being enabled. */
assert(params->CnviBtCore || !params->CnviBtAudioOffload);
if (!params->CnviBtCore && params->CnviBtAudioOffload) {
printk(BIOS_ERR, "BT offload is enabled without CNVi BT being enabled\n");
params->CnviBtAudioOffload = 0;
}
if (!params->CnviMode && params->CnviBtCore) {
printk(BIOS_ERR, "CNVi BT is enabled without CNVi being enabled\n");
params->CnviBtCore = 0;
params->CnviBtAudioOffload = 0;
}
/* VMD */
params->VmdEnable = is_devfn_enabled(SA_DEVFN_VMD);