From 3c7bbde4fdfc90520b5281b266f321219912d942 Mon Sep 17 00:00:00 2001 From: Karthikeyan Ramasubramanian Date: Tue, 30 Apr 2024 04:25:05 +0000 Subject: drivers/intel/fsp2_0: Release bmp_logo during OS_PAYLOAD_LOAD stage bmp_load_logo() loads the custom logo.bmp file into CBMEM. This cbmem buffer is released after FSP-S init is complete. In certain platforms, the logo file is displayed during PCI enumeration. This means the logo buffer is used after it is released. Fix this issue by releasing the logo buffer when the coreboot has finished loading payload. During S3 scenario CBMEM is locked, bmp logo is not loaded and hence the release is a no-op. BUG=b:337144954 TEST=Build Skyrim BIOS Image and boot to OS. Ensure that the chromeOS boot logo is seen without any corruption. Change-Id: Id27cf02de04055075e7c1cb0ae531dee8524f828 Signed-off-by: Karthikeyan Ramasubramanian Reviewed-on: https://review.coreboot.org/c/coreboot/+/82121 Reviewed-by: Subrata Banik Tested-by: build bot (Jenkins) Reviewed-by: Tim Van Patten Reviewed-by: Matt DeVillier --- src/drivers/intel/fsp2_0/silicon_init.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/drivers/intel/fsp2_0') diff --git a/src/drivers/intel/fsp2_0/silicon_init.c b/src/drivers/intel/fsp2_0/silicon_init.c index 52d714d503..89b8a1b2a2 100644 --- a/src/drivers/intel/fsp2_0/silicon_init.c +++ b/src/drivers/intel/fsp2_0/silicon_init.c @@ -2,6 +2,7 @@ #include #include +#include #include #include #include @@ -142,9 +143,6 @@ static void do_silicon_init(struct fsp_header *hdr) timestamp_add_now(TS_FSP_SILICON_INIT_END); post_code(POSTCODE_FSP_SILICON_EXIT); - if (CONFIG(BMP_LOGO)) - bmp_release_logo(); - fsp_debug_after_silicon_init(status); fsps_return_value_handler(FSP_SILICON_INIT_API, status); @@ -261,3 +259,11 @@ void fsp_silicon_init(void) } __weak void soc_load_logo(FSPS_UPD *supd) { } + +static void release_logo(void *arg_unused) +{ + if (CONFIG(BMP_LOGO)) + bmp_release_logo(); +} + +BOOT_STATE_INIT_ENTRY(BS_PAYLOAD_LOAD, BS_ON_EXIT, release_logo, NULL); -- cgit v1.2.3