From 1aa094a9af369cd1b82374c6b6b2b2122f14112a Mon Sep 17 00:00:00 2001 From: Felix Held Date: Wed, 29 Mar 2023 15:58:36 +0200 Subject: [PATCH] drivers/intel/fsp2_0/hand_off_block: use cb_err in fsp_find_range_hob Use enum cb_err as return value of fsp_find_range_hob instead of using the raw -1 and 0 values. Also update the call sites accordingly. Signed-off-by: Felix Held Change-Id: Id6c9f69a886f53868f1ef543c8fa04be95381f53 Reviewed-on: https://review.coreboot.org/c/coreboot/+/74082 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth Reviewed-by: Felix Singer Reviewed-by: Matt DeVillier Reviewed-by: Pratikkumar V Prajapati Reviewed-by: Fred Reitberger --- src/drivers/intel/fsp2_0/hand_off_block.c | 12 ++++++------ src/drivers/intel/fsp2_0/include/fsp/util.h | 2 +- src/soc/amd/common/block/cpu/noncar/memmap.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/drivers/intel/fsp2_0/hand_off_block.c b/src/drivers/intel/fsp2_0/hand_off_block.c index 08b2555855..1e7551ce81 100644 --- a/src/drivers/intel/fsp2_0/hand_off_block.c +++ b/src/drivers/intel/fsp2_0/hand_off_block.c @@ -210,29 +210,29 @@ void fsp_print_guid(int level, const void *base) id[8], id[9], id[10], id[11], id[12], id[13], id[14], id[15]); } -int fsp_find_range_hob(struct range_entry *re, const uint8_t guid[16]) +enum cb_err fsp_find_range_hob(struct range_entry *re, const uint8_t guid[16]) { const struct hob_header *hob_iterator; const struct hob_resource *fsp_mem; if (fsp_hob_iterator_init(&hob_iterator) != CB_SUCCESS) - return -1; + return CB_ERR; range_entry_init(re, 0, 0, 0); if (fsp_hob_iterator_get_next_guid_resource(&hob_iterator, guid, &fsp_mem) != CB_SUCCESS) { fsp_print_guid(BIOS_SPEW, guid); printk(BIOS_SPEW, " not found!\n"); - return -1; + return CB_ERR; } range_entry_init(re, fsp_mem->addr, fsp_mem->addr + fsp_mem->length, 0); - return 0; + return CB_SUCCESS; } void fsp_find_reserved_memory(struct range_entry *re) { - if (fsp_find_range_hob(re, fsp_reserved_memory_guid)) + if (fsp_find_range_hob(re, fsp_reserved_memory_guid) != CB_SUCCESS) die("9.1: FSP_RESERVED_MEMORY_RESOURCE_HOB missing!\n"); } @@ -372,7 +372,7 @@ const void *fsp_find_nv_storage_data(size_t *size) void fsp_find_bootloader_tolum(struct range_entry *re) { - if (fsp_find_range_hob(re, fsp_bootloader_tolum_guid)) + if (fsp_find_range_hob(re, fsp_bootloader_tolum_guid) != CB_SUCCESS) die("9.3: FSP_BOOTLOADER_TOLUM_HOB missing!\n"); } diff --git a/src/drivers/intel/fsp2_0/include/fsp/util.h b/src/drivers/intel/fsp2_0/include/fsp/util.h index f9b31e96bf..80982f0e57 100644 --- a/src/drivers/intel/fsp2_0/include/fsp/util.h +++ b/src/drivers/intel/fsp2_0/include/fsp/util.h @@ -129,7 +129,7 @@ const void *fsp_get_hob_list(void); void *fsp_get_hob_list_ptr(void); const void *fsp_find_extension_hob_by_guid(const uint8_t *guid, size_t *size); const void *fsp_find_nv_storage_data(size_t *size); -int fsp_find_range_hob(struct range_entry *re, const uint8_t guid[16]); +enum cb_err fsp_find_range_hob(struct range_entry *re, const uint8_t guid[16]); void fsp_display_fvi_version_hob(void); void fsp_find_reserved_memory(struct range_entry *re); const struct hob_resource *fsp_hob_header_to_resource( diff --git a/src/soc/amd/common/block/cpu/noncar/memmap.c b/src/soc/amd/common/block/cpu/noncar/memmap.c index 097637ec21..ef87318183 100644 --- a/src/soc/amd/common/block/cpu/noncar/memmap.c +++ b/src/soc/amd/common/block/cpu/noncar/memmap.c @@ -46,7 +46,7 @@ void smm_region(uintptr_t *start, size_t *size) struct range_entry tseg; - if (fsp_find_range_hob(&tseg, AMD_FSP_TSEG_HOB_GUID.b) < 0) { + if (fsp_find_range_hob(&tseg, AMD_FSP_TSEG_HOB_GUID.b) != CB_SUCCESS) { printk(BIOS_ERR, "unable to find TSEG HOB\n"); return; }