[coreboot-gerrit] Patch set updated for coreboot: b04b78a vboot2 workbuf alignment is now 16 bytes, not 8

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9705

-gerrit

commit b04b78a88c513b5046b304ba60903e01051f6659
Author: Bill Richardson <wfrichar at chromium.org>
Date:   Mon Jan 26 13:11:31 2015 -0800

    vboot2 workbuf alignment is now 16 bytes, not 8
    
    BUG=chromium:452179
    BRANCH=ToT
    CQ-DEPEND=CL:243362
    TEST=manual
    
      emerge-veyron_pinky coreboot
    
    Original-Change-Id: Ibcbaea2990e5e06ea7cfaaa5412ef7c1477f5fcc
    Original-Signed-off-by: Bill Richardson <wfrichar at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/243380
    Original-Reviewed-by: Randall Spangler <rspangler at chromium.org>
    
    (cherry picked from commit 8e5c18eeb21944bdcb064b4491c6781d16ef5608)
    Signed-off-by: Aaron Durbin <adurbin at chromium.org>
    
    Change-Id: I26f6fb67655cb1dfbdcdc48530ef6bfeb1aa692a
---
 src/vendorcode/google/chromeos/memlayout.h      | 2 +-
 src/vendorcode/google/chromeos/vboot2/verstub.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/vendorcode/google/chromeos/memlayout.h b/src/vendorcode/google/chromeos/memlayout.h
index a7ea32e..9a10093 100644
--- a/src/vendorcode/google/chromeos/memlayout.h
+++ b/src/vendorcode/google/chromeos/memlayout.h
@@ -26,7 +26,7 @@
  * and algorithm -- what works for you might stop working after an update. Do
  * NOT lower the asserted minimum without consulting vboot devs (rspangler)! */
 #define VBOOT2_WORK(addr, size) \
-	REGION(vboot2_work, addr, size, 8) \
+	REGION(vboot2_work, addr, size, 16) \
 	_ = ASSERT(size >= 12K, "vboot2 work buffer must be at least 12K!");
 
 #ifdef __VERSTAGE__
diff --git a/src/vendorcode/google/chromeos/vboot2/verstub.c b/src/vendorcode/google/chromeos/vboot2/verstub.c
index 86c6e1c..c4319ba 100644
--- a/src/vendorcode/google/chromeos/vboot2/verstub.c
+++ b/src/vendorcode/google/chromeos/vboot2/verstub.c
@@ -32,8 +32,11 @@ static struct vb2_working_data *init_vb2_working_data(void)
 
 	wd = vboot_get_working_data();
 	memset(wd, 0, _vboot2_work_size);
-	/* 8-byte alignment for ARMv7 */
-	wd->buffer_offset = ALIGN_UP(sizeof(*wd), 8);
+	/*
+	 * vboot prefers 16-byte alignment. This takes away 16 bytes
+	 * from the VBOOT2_WORK region, but the vboot devs said that's okay.
+	 */
+	wd->buffer_offset = ALIGN_UP(sizeof(*wd), 16);
 	wd->buffer_size = _vboot2_work_size - wd->buffer_offset;
 
 	return wd;