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

security/vboot: Remove vboot_named_region_device(_rw) 

Remove vboot_named_region_device(_rw) and use
fmap_locate_area_as_rdev(_rw) directly.

BRANCH=none
BUG=none
TEST=emerge-kukui coreboot

Change-Id: I244ac4e01ae5b80285162b3baffc0b30aa057bfb
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36922
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Yu-Ping Wu 2019-11-18 11:25:47 +08:00 committed by Aaron Durbin
parent ab8edda14a
commit 29c8fa4769
4 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/security/vboot/vbnv_flash.c
View File

@ -16,6 +16,7 @@
#include <arch/early_variables.h> #include <arch/early_variables.h>
#include <commonlib/region.h> #include <commonlib/region.h>
#include <console/console.h> #include <console/console.h>
#include <fmap.h>
#include <string.h> #include <string.h>
#include <vb2_api.h> #include <vb2_api.h>
#include <security/vboot/vboot_common.h> #include <security/vboot/vboot_common.h>
@ -67,7 +68,7 @@ static int init_vbnv(void)
int offset; int offset;
int i; int i;
if (vboot_named_region_device_rw("RW_NVRAM", rdev) || if (fmap_locate_area_as_rdev_rw("RW_NVRAM", rdev) ||
region_device_sz(rdev) < BLOB_SIZE) { region_device_sz(rdev) < BLOB_SIZE) {
printk(BIOS_ERR, "%s: failed to locate NVRAM\n", __func__); printk(BIOS_ERR, "%s: failed to locate NVRAM\n", __func__);
return 1; return 1;

10
src/security/vboot/vboot_common.c
View File

@ -24,16 +24,6 @@
#include <security/vboot/vbnv.h> #include <security/vboot/vbnv.h>
#include <vb2_api.h> #include <vb2_api.h>
int vboot_named_region_device(const char *name, struct region_device *rdev)
{
return fmap_locate_area_as_rdev(name, rdev);
}
int vboot_named_region_device_rw(const char *name, struct region_device *rdev)
{
return fmap_locate_area_as_rdev_rw(name, rdev);
}
/* Check if it is okay to enable USB Device Controller (UDC). */ /* Check if it is okay to enable USB Device Controller (UDC). */
int vboot_can_enable_udc(void) int vboot_can_enable_udc(void)
{ {

6
src/security/vboot/vboot_common.h
View File

@ -20,12 +20,6 @@
#include <vboot_api.h> #include <vboot_api.h>
#include <vboot_struct.h> #include <vboot_struct.h>
/* Locate vboot area by name. Returns 0 on success and -1 on error. */
int vboot_named_region_device(const char *name, struct region_device *rdev);
/* Like vboot_named_region_device() but provides a RW region device. */
int vboot_named_region_device_rw(const char *name, struct region_device *rdev);
/* /*
* Function to check if there is a request to enter recovery mode. Returns * Function to check if there is a request to enter recovery mode. Returns
* reason code if request to enter recovery mode is present, otherwise 0. * reason code if request to enter recovery mode is present, otherwise 0.

5
src/security/vboot/vboot_logic.c
View File

@ -19,6 +19,7 @@
#include <cbmem.h> #include <cbmem.h>
#include <console/console.h> #include <console/console.h>
#include <console/vtxprintf.h> #include <console/vtxprintf.h>
#include <fmap.h>
#include <string.h> #include <string.h>
#include <timestamp.h> #include <timestamp.h>
#include <vb2_api.h> #include <vb2_api.h>
@ -78,7 +79,7 @@ vb2_error_t vb2ex_read_resource(struct vb2_context *ctx,
return VB2_ERROR_EX_READ_RESOURCE_INDEX; return VB2_ERROR_EX_READ_RESOURCE_INDEX;
} }
if (vboot_named_region_device(name, &rdev)) if (fmap_locate_area_as_rdev(name, &rdev))
return VB2_ERROR_EX_READ_RESOURCE_SIZE; return VB2_ERROR_EX_READ_RESOURCE_SIZE;
if (rdev_readat(&rdev, buf, offset, size) != size) if (rdev_readat(&rdev, buf, offset, size) != size)
@ -265,7 +266,7 @@ static int locate_firmware(struct vb2_context *ctx,
else else
name = "FW_MAIN_B"; name = "FW_MAIN_B";
return vboot_named_region_device(name, fw_main); return fmap_locate_area_as_rdev(name, fw_main);
} }
/** /**