Yu-Ping Wu has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36922 )
Change subject: security/vboot: Remove vboot_named_region_device(_rw) ......................................................................
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 --- M src/security/vboot/vbnv_flash.c M src/security/vboot/vboot_common.c M src/security/vboot/vboot_common.h M src/security/vboot/vboot_logic.c 4 files changed, 5 insertions(+), 19 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/36922/1
diff --git a/src/security/vboot/vbnv_flash.c b/src/security/vboot/vbnv_flash.c index 908846f..86c43cd 100644 --- a/src/security/vboot/vbnv_flash.c +++ b/src/security/vboot/vbnv_flash.c @@ -16,6 +16,7 @@ #include <arch/early_variables.h> #include <commonlib/region.h> #include <console/console.h> +#include <fmap.h> #include <string.h> #include <vb2_api.h> #include <security/vboot/vboot_common.h> @@ -67,7 +68,7 @@ int offset; 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) { printk(BIOS_ERR, "%s: failed to locate NVRAM\n", __func__); return 1; diff --git a/src/security/vboot/vboot_common.c b/src/security/vboot/vboot_common.c index 2d35c6b..a24b220 100644 --- a/src/security/vboot/vboot_common.c +++ b/src/security/vboot/vboot_common.c @@ -24,16 +24,6 @@ #include <security/vboot/vbnv.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). */ int vboot_can_enable_udc(void) { diff --git a/src/security/vboot/vboot_common.h b/src/security/vboot/vboot_common.h index 42b4a6b..a20ab62 100644 --- a/src/security/vboot/vboot_common.h +++ b/src/security/vboot/vboot_common.h @@ -20,12 +20,6 @@ #include <vboot_api.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 * reason code if request to enter recovery mode is present, otherwise 0. diff --git a/src/security/vboot/vboot_logic.c b/src/security/vboot/vboot_logic.c index 5facd28..71371cd 100644 --- a/src/security/vboot/vboot_logic.c +++ b/src/security/vboot/vboot_logic.c @@ -19,6 +19,7 @@ #include <cbmem.h> #include <console/console.h> #include <console/vtxprintf.h> +#include <fmap.h> #include <string.h> #include <timestamp.h> #include <vb2_api.h> @@ -78,7 +79,7 @@ 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;
if (rdev_readat(&rdev, buf, offset, size) != size) @@ -265,7 +266,7 @@ else name = "FW_MAIN_B";
- return vboot_named_region_device(name, fw_main); + return fmap_locate_area_as_rdev(name, fw_main); }
/**
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36922 )
Change subject: security/vboot: Remove vboot_named_region_device(_rw) ......................................................................
Patch Set 1: Code-Review+2
Aaron Durbin has submitted this change. ( https://review.coreboot.org/c/coreboot/+/36922 )
Change subject: security/vboot: Remove vboot_named_region_device(_rw) ......................................................................
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 --- M src/security/vboot/vbnv_flash.c M src/security/vboot/vboot_common.c M src/security/vboot/vboot_common.h M src/security/vboot/vboot_logic.c 4 files changed, 5 insertions(+), 19 deletions(-)
Approvals: build bot (Jenkins): Verified Aaron Durbin: Looks good to me, approved
diff --git a/src/security/vboot/vbnv_flash.c b/src/security/vboot/vbnv_flash.c index 908846f..86c43cd 100644 --- a/src/security/vboot/vbnv_flash.c +++ b/src/security/vboot/vbnv_flash.c @@ -16,6 +16,7 @@ #include <arch/early_variables.h> #include <commonlib/region.h> #include <console/console.h> +#include <fmap.h> #include <string.h> #include <vb2_api.h> #include <security/vboot/vboot_common.h> @@ -67,7 +68,7 @@ int offset; 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) { printk(BIOS_ERR, "%s: failed to locate NVRAM\n", __func__); return 1; diff --git a/src/security/vboot/vboot_common.c b/src/security/vboot/vboot_common.c index 2d35c6b..a24b220 100644 --- a/src/security/vboot/vboot_common.c +++ b/src/security/vboot/vboot_common.c @@ -24,16 +24,6 @@ #include <security/vboot/vbnv.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). */ int vboot_can_enable_udc(void) { diff --git a/src/security/vboot/vboot_common.h b/src/security/vboot/vboot_common.h index 42b4a6b..a20ab62 100644 --- a/src/security/vboot/vboot_common.h +++ b/src/security/vboot/vboot_common.h @@ -20,12 +20,6 @@ #include <vboot_api.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 * reason code if request to enter recovery mode is present, otherwise 0. diff --git a/src/security/vboot/vboot_logic.c b/src/security/vboot/vboot_logic.c index 5facd28..71371cd 100644 --- a/src/security/vboot/vboot_logic.c +++ b/src/security/vboot/vboot_logic.c @@ -19,6 +19,7 @@ #include <cbmem.h> #include <console/console.h> #include <console/vtxprintf.h> +#include <fmap.h> #include <string.h> #include <timestamp.h> #include <vb2_api.h> @@ -78,7 +79,7 @@ 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;
if (rdev_readat(&rdev, buf, offset, size) != size) @@ -265,7 +266,7 @@ else name = "FW_MAIN_B";
- return vboot_named_region_device(name, fw_main); + return fmap_locate_area_as_rdev(name, fw_main); }
/**
-
Aaron Durbin (Code Review) -
Yu-Ping Wu (Code Review)