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

soc/intel/common: refactor locate_vbt and vbt_get

Browse Source 
Instead of having all callers provide a region_device just for the
purpose of reading vbt.bin, let locate_vbt handle its entire life cycle,
simplifying the VBT access API.

Change-Id: Ib85e55164e217050b67674d020d17b2edf5ad14d
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/21897
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Patrick Georgi
2017-10-05 18:10:09 +02:00
parent cba7316c26
commit 9d3de2649f
6 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@
#include <console/console.h>
#include <arch/acpi.h>
#include <bootmode.h>
#include <bootstate.h>
#include "vbt.h"
@ -28,11 +29,17 @@ const char *mainboard_vbt_filename(void)
return "vbt.bin";
}
void *locate_vbt(struct region_device *rdev)
static struct region_device vbt_rdev;
static void *vbt_data;
void *locate_vbt(void)
{
uint32_t vbtsig = 0;
struct cbfsf file_desc;
if (vbt_data != NULL)
return vbt_data;
const char *filename = mainboard_vbt_filename();
if (cbfs_boot_locate(&file_desc, filename, NULL) < 0) {
@ -40,18 +47,19 @@ void *locate_vbt(struct region_device *rdev)
return NULL;
}
cbfs_file_data(rdev, &file_desc);
rdev_readat(rdev, &vbtsig, 0, sizeof(uint32_t));
cbfs_file_data(&vbt_rdev, &file_desc);
rdev_readat(&vbt_rdev, &vbtsig, 0, sizeof(uint32_t));
if (vbtsig != VBT_SIGNATURE) {
printk(BIOS_ERR, "Missing/invalid signature in VBT data file!\n");
return NULL;
}
return rdev_mmap_full(rdev);
vbt_data = rdev_mmap_full(&vbt_rdev);
return vbt_data;
}
void *vbt_get(struct region_device *rdev)
void *vbt_get(void)
{
if (!IS_ENABLED(CONFIG_RUN_FSP_GOP))
return NULL;
@ -62,5 +70,13 @@ void *vbt_get(struct region_device *rdev)
return NULL;
if (!display_init_required())
return NULL;
return locate_vbt(rdev);
return locate_vbt();
}
static void unmap_vbt(void *unused)
{
if (vbt_data)
rdev_munmap(&vbt_rdev, vbt_data);
}
BOOT_STATE_INIT_ENTRY(BS_PAYLOAD_LOAD, BS_ON_EXIT, unmap_vbt, NULL);
BOOT_STATE_INIT_ENTRY(BS_OS_RESUME, BS_ON_ENTRY, unmap_vbt, NULL);