lib: Refactor bmp_load_logo() implementation

This refactoring ensures bmp_load_logo() takes logo_size as an
argument, returning a valid logo_ptr only if logo_size is non-zero.

This prevents potential errors from mismatched size assumption.

BUG=b:242829490
TEST=google/rex0 builds successfully.

Change-Id: I14bc54670a67980ec93bc366b274832d1f959e50
Signed-off-by: Subrata Banik <subratabanik@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/81618
Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Dinesh Gehlot <digehlot@google.com>
Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
Subrata Banik 2024-04-02 08:00:14 +00:00
commit 9c4d85d83a
8 changed files with 29 additions and 17 deletions

View file

@ -55,6 +55,6 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd)
void soc_load_logo(FSPS_UPD *supd)
{
uint32_t logo_size;
bmp_load_logo(&supd->FspsConfig.logo_bmp_buffer, &logo_size);
size_t logo_size;
supd->FspsConfig.logo_bmp_buffer = (uint32_t)(uintptr_t)bmp_load_logo(&logo_size);
}

View file

@ -915,7 +915,9 @@ void mainboard_silicon_init_params(FSP_S_CONFIG *silconfig)
/* Handle FSP logo params */
void soc_load_logo(FSPS_UPD *supd)
{
bmp_load_logo(&supd->FspsConfig.LogoPtr, &supd->FspsConfig.LogoSize);
size_t logo_size;
supd->FspsConfig.LogoPtr = (uint32_t)(uintptr_t)bmp_load_logo(&logo_size);
supd->FspsConfig.LogoSize = (uint32_t)logo_size;
}
BOOT_STATE_INIT_ENTRY(BS_PRE_DEVICE, BS_ON_ENTRY, spi_flash_init_cb, NULL);

View file

@ -754,5 +754,7 @@ __weak void mainboard_silicon_init_params(FSPS_UPD *supd)
/* Handle FSP logo params */
void soc_load_logo(FSPS_UPD *supd)
{
bmp_load_logo(&supd->FspsConfig.LogoPtr, &supd->FspsConfig.LogoSize);
size_t logo_size;
supd->FspsConfig.LogoPtr = (uintptr_t)bmp_load_logo(&logo_size);
supd->FspsConfig.LogoSize = (uint32_t)logo_size;
}

View file

@ -529,5 +529,7 @@ __weak void mainboard_silicon_init_params(FSP_S_CONFIG *params)
/* Handle FSP logo params */
void soc_load_logo(FSPS_UPD *supd)
{
bmp_load_logo(&supd->FspsConfig.LogoPtr, &supd->FspsConfig.LogoSize);
size_t logo_size;
supd->FspsConfig.LogoPtr = (uint32_t)(uintptr_t)bmp_load_logo(&logo_size);
supd->FspsConfig.LogoSize = (uint32_t)logo_size;
}