[coreboot-gerrit] Patch set updated for coreboot: 96e0f2f vboot2: implement vb2ex_read_resource

[Marc Jones]

Marc Jones ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8161

-gerrit

commit 96e0f2f24e79cd660abfd7a563c77bb32aef525d
Author: Daisuke Nojiri 
Date:   Mon Jun 30 08:28:17 2014 -0700

vboot2: implement vb2ex_read_resource

TEST=Built with VBOOT2_VERIFY_FIRMWARE on/off. Booted Nyan Blaze.
    BUG=None
    BRANCH=none
    Signed-off-by: Daisuke Nojiri

Original-Change-Id: I633f9dddbf8b2f25797aacc246bcebaafb02bea4
    Original-Reviewed-on: https://chromium-review.googlesource.com/206063
    Original-Reviewed-by: Aaron Durbin 
    Original-Tested-by: Daisuke Nojiri 
    Original-Commit-Queue: Daisuke Nojiri 
    (cherry picked from commit 1f215672de31847cc647e83d2c04633b7f8dfa33)
    Signed-off-by: Marc Jones

Change-Id: I57f449b052132b300f7bca4351871c539a7a8694
---
 src/vendorcode/google/chromeos/vboot_main.c | 55 +++++++++++++++++++----------
 1 file changed, 37 insertions(+), 18 deletions(-)

diff --git a/src/vendorcode/google/chromeos/vboot_main.c b/src/vendorcode/google/chromeos/vboot_main.c
index 9779d35..907afd7 100644
--- a/src/vendorcode/google/chromeos/vboot_main.c
+++ b/src/vendorcode/google/chromeos/vboot_main.c
@@ -31,6 +31,23 @@ struct vboot_region {
    int32_t size;
 };

+static void locate_region(const char *name, struct vboot_region *region)
+{
+	region->size = find_fmap_entry(name, (void **)&region->offset_addr);
+	VBDEBUG("Located %s @%x\n", name, region->offset_addr);
+}
+
+static int is_slot_a(struct vb2_context *ctx)
+{
+	return !(ctx->flags & VB2_CONTEXT_FW_SLOT_B);
+}
+
+static int in_ro(void)
+{
+	/* TODO: Implement */
+	return 1;
+}
+
 /* exports */

void vb2ex_printf(const char *func, const char *fmt, ...)
@@ -57,27 +74,29 @@ int vb2ex_read_resource(struct vb2_context *ctx,
    		void *buf,
    		uint32_t size)
 {
-	VBDEBUG("Reading resource\n");
-	return VB2_ERROR_UNKNOWN;
-}
+	struct vboot_region region;
+
+	switch (index) {
+	case VB2_RES_GBB:
+		locate_region("GBB", &region);
+		break;
+	case VB2_RES_FW_VBLOCK:
+		if (is_slot_a(ctx))
+			locate_region("VBLOCK_A", &region);
+		else
+			locate_region("VBLOCK_B", &region);
+		break;
+	default:
+		return VB2_ERROR_EX_READ_RESOURCE_INDEX;
+	}

-/* locals */
+	if (offset + size > region.size)
+		return VB2_ERROR_EX_READ_RESOURCE_SIZE;

-static void locate_region(const char *name, struct vboot_region *region)
-{
-	region->size = find_fmap_entry(name, (void **)&region->offset_addr);
-	VBDEBUG("Located %s @%x\n", name, region->offset_addr);
-}
+	if (vboot_get_region(region.offset_addr + offset, size, buf) == NULL)
+		return VB2_ERROR_UNKNOWN;

-static int is_slot_a(struct vb2_context *ctx)
-{
-	return !(ctx->flags & VB2_CONTEXT_FW_SLOT_B);
-}
-
-static int in_ro(void)
-{
-	/* TODO: Implement */
-	return 1;
+	return VB2_SUCCESS;
 }

static void reboot(void)