GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers/intel/fsp1_1: Rename hob finding functions 

The hob finding functions are never looped over so there is no point
for the 'next' inside their name.

Change-Id: I18e452d313612ba14edda479d43f2797f6c84034
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/63204
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Arthur Heymans 2022-03-30 14:41:16 +02:00 committed by Felix Held
parent 2bcc5f39c1
commit ca74d7e65b
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/drivers/intel/fsp1_1/hob.c
View File

@ -45,7 +45,7 @@ static void *get_next_hob(uint16_t type, const void *hob_start)
} }
/* Returns the next instance of the matched GUID HOB from the starting HOB. */ /* Returns the next instance of the matched GUID HOB from the starting HOB. */
void *get_next_guid_hob(const EFI_GUID *guid, const void *hob_start) void *get_guid_hob(const EFI_GUID *guid, const void *hob_start)
{ {
EFI_PEI_HOB_POINTERS hob; EFI_PEI_HOB_POINTERS hob;
@ -62,7 +62,7 @@ void *get_next_guid_hob(const EFI_GUID *guid, const void *hob_start)
/* /*
* Returns the next instance of the matching resource HOB from the starting HOB. * Returns the next instance of the matching resource HOB from the starting HOB.
*/ */
void *get_next_resource_hob(const EFI_GUID *guid, const void *hob_start) void *get_resource_hob(const EFI_GUID *guid, const void *hob_start)
{ {
EFI_PEI_HOB_POINTERS hob; EFI_PEI_HOB_POINTERS hob;

4
src/drivers/intel/fsp1_1/include/fsp/util.h
View File

@ -24,7 +24,7 @@ void fsp_early_init(FSP_INFO_HEADER *fsp_info);
void fsp_notify(u32 phase); void fsp_notify(u32 phase);
void print_hob_type_structure(u16 hob_type, void *hob_list_ptr); void print_hob_type_structure(u16 hob_type, void *hob_list_ptr);
void print_fsp_info(FSP_INFO_HEADER *fsp_header); void print_fsp_info(FSP_INFO_HEADER *fsp_header);
void *get_next_resource_hob(const EFI_GUID *guid, const void *hob_start); void *get_resource_hob(const EFI_GUID *guid, const void *hob_start);
void fsp_display_upd_value(const char *name, uint32_t size, uint64_t old, void fsp_display_upd_value(const char *name, uint32_t size, uint64_t old,
uint64_t new); uint64_t new);
void report_fsp_output(void); void report_fsp_output(void);
@ -77,7 +77,7 @@ extern void *FspHobListPtr;
#endif #endif
void *get_hob_list(void); void *get_hob_list(void);
void *get_next_guid_hob(const EFI_GUID *guid, const void *hob_start); void *get_guid_hob(const EFI_GUID *guid, const void *hob_start);
asmlinkage void chipset_teardown_car_main(void); asmlinkage void chipset_teardown_car_main(void);

10
src/drivers/intel/fsp1_1/raminit.c
View File

@ -120,7 +120,7 @@ void raminit(struct romstage_params *params)
/* Locate the FSP reserved memory area */ /* Locate the FSP reserved memory area */
fsp_reserved_bytes = 0; fsp_reserved_bytes = 0;
fsp_memory = get_next_resource_hob(&fsp_reserved_guid, hob_list_ptr); fsp_memory = get_resource_hob(&fsp_reserved_guid, hob_list_ptr);
if (fsp_memory == NULL) { if (fsp_memory == NULL) {
fsp_verification_failure = 1; fsp_verification_failure = 1;
printk(BIOS_ERR, printk(BIOS_ERR,
@ -155,7 +155,7 @@ void raminit(struct romstage_params *params)
fsp_set_runtime(fsp_header, hob_list_ptr); fsp_set_runtime(fsp_header, hob_list_ptr);
/* Lookup the FSP_BOOTLOADER_TOLUM_HOB */ /* Lookup the FSP_BOOTLOADER_TOLUM_HOB */
cbmem_root = get_next_resource_hob(&bootldr_tolum_guid, hob_list_ptr); cbmem_root = get_resource_hob(&bootldr_tolum_guid, hob_list_ptr);
if (cbmem_root == NULL) { if (cbmem_root == NULL) {
fsp_verification_failure = 1; fsp_verification_failure = 1;
printk(BIOS_ERR, "7.4: FSP_BOOTLOADER_TOLUM_HOB missing!\n"); printk(BIOS_ERR, "7.4: FSP_BOOTLOADER_TOLUM_HOB missing!\n");
@ -164,7 +164,7 @@ void raminit(struct romstage_params *params)
} }
/* Locate the FSP_SMBIOS_MEMORY_INFO HOB */ /* Locate the FSP_SMBIOS_MEMORY_INFO HOB */
memory_info_hob = get_next_guid_hob(&memory_info_hob_guid, memory_info_hob = get_guid_hob(&memory_info_hob_guid,
hob_list_ptr); hob_list_ptr);
if (memory_info_hob == NULL) { if (memory_info_hob == NULL) {
printk(BIOS_ERR, "FSP_SMBIOS_MEMORY_INFO HOB missing!\n"); printk(BIOS_ERR, "FSP_SMBIOS_MEMORY_INFO HOB missing!\n");
@ -185,7 +185,7 @@ void raminit(struct romstage_params *params)
* 7.5: EFI_PEI_GRAPHICS_INFO_HOB produced by SiliconInit * 7.5: EFI_PEI_GRAPHICS_INFO_HOB produced by SiliconInit
* FSP_SMBIOS_MEMORY_INFO HOB verified above * FSP_SMBIOS_MEMORY_INFO HOB verified above
*/ */
hob_ptr.Raw = get_next_guid_hob(&mrc_guid, hob_list_ptr); hob_ptr.Raw = get_guid_hob(&mrc_guid, hob_list_ptr);
if ((hob_ptr.Raw == NULL) && (params->saved_data == NULL)) { if ((hob_ptr.Raw == NULL) && (params->saved_data == NULL)) {
printk(BIOS_ERR, "7.3: FSP_NON_VOLATILE_STORAGE_HOB missing!\n"); printk(BIOS_ERR, "7.3: FSP_NON_VOLATILE_STORAGE_HOB missing!\n");
fsp_verification_failure = 1; fsp_verification_failure = 1;
@ -236,7 +236,7 @@ void raminit(struct romstage_params *params)
"ERROR - coreboot's requirements not met by FSP binary!\n"); "ERROR - coreboot's requirements not met by FSP binary!\n");
/* Locate the memory configuration data to speed up the next reboot */ /* Locate the memory configuration data to speed up the next reboot */
mrc_hob = get_next_guid_hob(&mrc_guid, hob_list_ptr); mrc_hob = get_guid_hob(&mrc_guid, hob_list_ptr);
if (mrc_hob == NULL) { if (mrc_hob == NULL) {
printk(BIOS_DEBUG, printk(BIOS_DEBUG,
"Memory Configuration Data Hob not present\n"); "Memory Configuration Data Hob not present\n");

4
src/drivers/intel/fsp1_1/ramstage.c
View File

@ -38,7 +38,7 @@ static void display_hob_info(FSP_INFO_HEADER *fsp_info_header)
* FSP_SMBIOS_MEMORY_INFO HOB verified by raminit * FSP_SMBIOS_MEMORY_INFO HOB verified by raminit
*/ */
if ((fsp_info_header->ImageAttribute & GRAPHICS_SUPPORT_BIT) && if ((fsp_info_header->ImageAttribute & GRAPHICS_SUPPORT_BIT) &&
!get_next_guid_hob(&graphics_info_guid, hob_list_ptr) && !get_guid_hob(&graphics_info_guid, hob_list_ptr) &&
CONFIG(DISPLAY_HOBS)) { CONFIG(DISPLAY_HOBS)) {
printk(BIOS_ERR, "7.5: EFI_PEI_GRAPHICS_INFO_HOB missing!\n"); printk(BIOS_ERR, "7.5: EFI_PEI_GRAPHICS_INFO_HOB missing!\n");
printk(BIOS_ERR, "Missing one or more required FSP HOBs!\n"); printk(BIOS_ERR, "Missing one or more required FSP HOBs!\n");
@ -117,7 +117,7 @@ static void fsp_run_silicon_init(FSP_INFO_HEADER *fsp_info_header)
u32 *vbt_hob; u32 *vbt_hob;
void *hob_list_ptr = get_hob_list(); void *hob_list_ptr = get_hob_list();
vbt_hob = get_next_guid_hob(&vbt_guid, hob_list_ptr); vbt_hob = get_guid_hob(&vbt_guid, hob_list_ptr);
if (vbt_hob == NULL) { if (vbt_hob == NULL) {
printk(BIOS_ERR, "FSP_ERR: Graphics Data HOB is not present\n"); printk(BIOS_ERR, "FSP_ERR: Graphics Data HOB is not present\n");
} else { } else {

2
src/drivers/intel/fsp1_1/romstage.c
View File

@ -152,7 +152,7 @@ __weak void mainboard_save_dimm_info(
/* Locate the memory info HOB, presence validated by raminit */ /* Locate the memory info HOB, presence validated by raminit */
hob_list_ptr = fsp_get_hob_list(); hob_list_ptr = fsp_get_hob_list();
hob_ptr = get_next_guid_hob(&memory_info_hob_guid, hob_list_ptr); hob_ptr = get_guid_hob(&memory_info_hob_guid, hob_list_ptr);
memory_info_hob = (FSP_SMBIOS_MEMORY_INFO *)(hob_ptr + 1); memory_info_hob = (FSP_SMBIOS_MEMORY_INFO *)(hob_ptr + 1);
/* Display the data in the FSP_SMBIOS_MEMORY_INFO HOB */ /* Display the data in the FSP_SMBIOS_MEMORY_INFO HOB */

2
src/mainboard/google/cyan/spd/spd.c
View File

@ -118,7 +118,7 @@ static void set_dimm_info(const uint8_t *spd, struct dimm_info *dimm)
/* Locate the memory info HOB, presence validated by raminit */ /* Locate the memory info HOB, presence validated by raminit */
hob_list_ptr = fsp_get_hob_list(); hob_list_ptr = fsp_get_hob_list();
hob_ptr = get_next_guid_hob(&memory_info_hob_guid, hob_list_ptr); hob_ptr = get_guid_hob(&memory_info_hob_guid, hob_list_ptr);
if (hob_ptr != NULL) { if (hob_ptr != NULL) {
memory_info_hob = (FSP_SMBIOS_MEMORY_INFO *)(hob_ptr + 1); memory_info_hob = (FSP_SMBIOS_MEMORY_INFO *)(hob_ptr + 1);
dimm->ddr_frequency = memory_info_hob->MemoryFrequencyInMHz; dimm->ddr_frequency = memory_info_hob->MemoryFrequencyInMHz;