sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/intel/common: refactor locate_vbt

Browse Source 
All callers of locate_vbt just care about the file content and
immediately map the rdev for its content.
Instead of repeating this in all call sites, move that code to
locate_vbt.

Change-Id: I5b518e6c959437bd8f393269db7955358a786719
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/21896
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Patrick Georgi
2017-10-05 17:32:43 +02:00
parent c1ef5c1752
commit cba7316c26
4 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/soc/intel/common/vbt.c
View File

@ -28,7 +28,7 @@ const char *mainboard_vbt_filename(void)
return "vbt.bin";
}
enum cb_err locate_vbt(struct region_device *rdev)
void *locate_vbt(struct region_device *rdev)
{
uint32_t vbtsig = 0;
struct cbfsf file_desc;
@ -37,7 +37,7 @@ enum cb_err locate_vbt(struct region_device *rdev)
if (cbfs_boot_locate(&file_desc, filename, NULL) < 0) {
printk(BIOS_ERR, "Could not locate a VBT file in in CBFS\n");
return CB_ERR;
return NULL;
}
cbfs_file_data(rdev, &file_desc);
@ -45,16 +45,14 @@ enum cb_err locate_vbt(struct region_device *rdev)
if (vbtsig != VBT_SIGNATURE) {
printk(BIOS_ERR, "Missing/invalid signature in VBT data file!\n");
return CB_ERR;
return NULL;
}
return CB_SUCCESS;
return rdev_mmap_full(rdev);
}
void *vbt_get(struct region_device *rdev)
{
void *vbt_data;
if (!IS_ENABLED(CONFIG_RUN_FSP_GOP))
return NULL;
@ -64,10 +62,5 @@ void *vbt_get(struct region_device *rdev)
return NULL;
if (!display_init_required())
return NULL;
if (locate_vbt(rdev) != CB_ERR) {
vbt_data = rdev_mmap_full(rdev);
return vbt_data;
} else {
return NULL;
}
return locate_vbt(rdev);
}