[coreboot-gerrit] Patch set updated for coreboot: cbfstool: Fix broken alignment because of flashmap

[Werner Zeh (werner.zeh@siemens.com)]

Werner Zeh (werner.zeh at siemens.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13417

-gerrit

commit 51a6c33d3153dec7ed8489dd236a5170cb5dbfd7
Author: Werner Zeh <werner.zeh at siemens.com>
Date:   Mon Jan 25 12:47:20 2016 +0100

    cbfstool: Fix broken alignment because of flashmap
    
    With the introduction of flashmap cbfs alignment of files gets
    broken because flashmap is located at the beginning of the flash
    and cbfstool didn't take care about that offset.
    This commit fixes the alignment in cbfs.
    
    Change-Id: Idebb86d4c691b49a351a402ef79c62d31622c773
    Signed-off-by: Werner Zeh <werner.zeh at siemens.com>
---
 util/cbfstool/cbfs_image.c | 19 +++++++++++++++----
 util/cbfstool/cbfs_image.h |  1 +
 util/cbfstool/cbfstool.c   |  2 ++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c
index 2d7a6f0..2a26f85 100644
--- a/util/cbfstool/cbfs_image.c
+++ b/util/cbfstool/cbfs_image.c
@@ -2,6 +2,7 @@
  * CBFS Image Manipulation
  *
  * Copyright (C) 2013 The Chromium OS Authors. All rights reserved.
+ * Copyright (C) 2016 Siemens AG. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1410,6 +1411,16 @@ static int is_in_range(size_t start, size_t end, size_t metadata_size,
 	return (offset >= start + metadata_size && offset + size <= end);
 }
 
+static size_t absolute_align(const struct cbfs_image *image, size_t val,
+				size_t align)
+{
+	const size_t region_offset = buffer_offset(&image->buffer);
+	/* To perform alignment on absolute address, take the region offset */
+	/* of the image into account.					    */
+	return align_up(val + region_offset, align) - region_offset;
+
+}
+
 int32_t cbfs_locate_entry(struct cbfs_image *image, size_t size,
 			  size_t page_size, size_t align, size_t metadata_size)
 {
@@ -1474,15 +1485,15 @@ int32_t cbfs_locate_entry(struct cbfs_image *image, size_t size,
 		if (addr_next - addr < need_len)
 			continue;
 
-		offset = align_up(addr + metadata_size, align);
+		offset = absolute_align(image, addr + metadata_size, align);
 		if (is_in_same_page(offset, size, page_size) &&
 		    is_in_range(addr, addr_next, metadata_size, offset, size)) {
 			DEBUG("cbfs_locate_entry: FIT (PAGE1).");
 			return offset;
 		}
 
-		addr2 = align_up(addr, page_size);
-		offset = align_up(addr2, align);
+		addr2 = absolute_align(image, addr, page_size);
+		offset = absolute_align(image, addr2, align);
 		if (is_in_range(addr, addr_next, metadata_size, offset, size)) {
 			DEBUG("cbfs_locate_entry: OVERLAP (PAGE2).");
 			return offset;
@@ -1492,7 +1503,7 @@ int32_t cbfs_locate_entry(struct cbfs_image *image, size_t size,
 		 * definitely provide the space for header. */
 		assert(page_size >= metadata_size);
 		addr3 = addr2 + page_size;
-		offset = align_up(addr3, align);
+		offset = absolute_align(image, addr3, align);
 		if (is_in_range(addr, addr_next, metadata_size, offset, size)) {
 			DEBUG("cbfs_locate_entry: OVERLAP+ (PAGE3).");
 			return offset;
diff --git a/util/cbfstool/cbfs_image.h b/util/cbfstool/cbfs_image.h
index 00adcc8..19c0b69 100644
--- a/util/cbfstool/cbfs_image.h
+++ b/util/cbfstool/cbfs_image.h
@@ -2,6 +2,7 @@
  * CBFS Image Manipulation
  *
  * Copyright (C) 2013 The Chromium OS Authors. All rights reserved.
+ * Copyright (C) 2016 Siemens AG. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c
index 23787d8..5b3d58a 100644
--- a/util/cbfstool/cbfstool.c
+++ b/util/cbfstool/cbfstool.c
@@ -166,6 +166,8 @@ static int do_cbfs_locate(int32_t *cbfs_addr, size_t metadata_size)
 	if (param.hash != VB2_HASH_INVALID)
 		metadata_size += sizeof(struct cbfs_file_attr_hash);
 
+	/* image.buffer.offset is passed so alignment is calculated relative */
+	/* to flash address, not the start of CBFS. */
 	int32_t address = cbfs_locate_entry(&image, buffer.size, param.pagesize,
 						param.alignment, metadata_size);
 	buffer_delete(&buffer);