Subrata Banik has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/84144?usp=email )
Change subject: soc/intel/alderlake: Prevent overlapping boot screens ......................................................................
soc/intel/alderlake: Prevent overlapping boot screens
Previously, `early_graphics_stop()` was skipped unconditionally if `CONFIG(SOC_INTEL_CSE_LITE_SYNC_IN_RAMSTAGE)` was enabled. This led to overlapping screens when CSE sync was not triggered in ramstage, as both the eSOL message and the firmware splash screen would be displayed.
This change refactors the condition for calling `early_graphics_stop()` to ensure it is only skipped if a CSE firmware update is actually required *and* `CONFIG(SOC_INTEL_CSE_LITE_SYNC_IN_RAMSTAGE)` is set.
This allows eSOL to display its message during CSE sync, but tears down early graphics programming in other cases to prevent overlapping screens.
Additionally, this change ensures that `early_graphics_stop()` is the last function called by the romstage to guarantee proper cleanup.
BUG=b:362895813 TEST=Able to boot google/tivviks_ufs without overlapping screens.
Change-Id: Idc01bfc8963d65fcb0441300e7c9267eaaefefb9 Signed-off-by: Subrata Banik subratabanik@google.com --- M src/soc/intel/alderlake/romstage/romstage.c 1 file changed, 8 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/44/84144/1
diff --git a/src/soc/intel/alderlake/romstage/romstage.c b/src/soc/intel/alderlake/romstage/romstage.c index b577e32..ff600db 100644 --- a/src/soc/intel/alderlake/romstage/romstage.c +++ b/src/soc/intel/alderlake/romstage/romstage.c @@ -215,16 +215,18 @@ if (!s3wake) save_dimm_info();
+ if (CONFIG(ENABLE_EARLY_DMA_PROTECTION)) + vtd_enable_dma_protection(); + + /* Keep eSOL active if CSE sync is pending at ramstage */ + if (CONFIG(SOC_INTEL_CSE_LITE_SYNC_IN_RAMSTAGE) && is_cse_fw_update_required()) + return; + /* * Turn-off early graphics configuration with two purposes: * - Clear any potentially still on-screen message * - Allow PEIM graphics driver to smoothly execute in ramstage if * RUN_FSP_GOP is selected */ - if (!CONFIG(SOC_INTEL_CSE_LITE_SYNC_IN_RAMSTAGE)) - /* Keep eSOL active if CSE sync in ramstage config is enabled */ - early_graphics_stop(); - - if (CONFIG(ENABLE_EARLY_DMA_PROTECTION)) - vtd_enable_dma_protection(); + early_graphics_stop(); }