[coreboot-gerrit] New patch to review for coreboot: cbfstool: Handle elf with different virtual and physical address

[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/10690

-gerrit

commit d62ab8846207cc042d7e9220036376aa000041d0
Author: Furquan Shaikh <furquan at google.com>
Date:   Fri May 29 12:46:18 2015 -0700

    cbfstool: Handle elf with different virtual and physical address
    
    Adds support in cbfstool to adjust the entry field based on the
    virtual and physical address in program header.
    
    BUG=chrome-os-partner:40713
    BRANCH=None
    TEST=Verified correct entry point address. Trusty loads and boots correctly.
    
    Change-Id: I215b0bea689626deec65e15fb3280e369d816406
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
    Original-Commit-Id: 32a740f0b628c124d3251cc416e2fc133bb15c57
    Original-Change-Id: Ia999b5c55887c86ef1e43794ceaef2d867957f4d
    Original-Signed-off-by: Furquan Shaikh <furquan at google.com>
    Original-Reviewed-on: https://chromium-review.googlesource.com/274087
    Original-Trybot-Ready: Furquan Shaikh <furquan at chromium.org>
    Original-Tested-by: Furquan Shaikh <furquan at chromium.org>
    Original-Reviewed-by: Aaron Durbin <adurbin at chromium.org>
    Original-Commit-Queue: Furquan Shaikh <furquan at chromium.org>
---
 util/cbfstool/cbfs-mkstage.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/util/cbfstool/cbfs-mkstage.c b/util/cbfstool/cbfs-mkstage.c
index f94d0da..3e62525 100644
--- a/util/cbfstool/cbfs-mkstage.c
+++ b/util/cbfstool/cbfs-mkstage.c
@@ -102,6 +102,7 @@ int parse_elf_to_stage(const struct buffer *input, struct buffer *output,
 	Elf64_Phdr *phdr;
 	Elf64_Ehdr *ehdr;
 	Elf64_Shdr *shdr_ignored;
+	Elf64_Addr virt_to_phys;
 	char *buffer;
 	struct buffer outheader;
 	int ret = -1;
@@ -143,6 +144,7 @@ int parse_elf_to_stage(const struct buffer *input, struct buffer *output,
 	data_start = ~0;
 	data_end = 0;
 	mem_end = 0;
+	virt_to_phys = 0;
 
 	for (i = 0; i < headers; i++) {
 		unsigned int start, mend, rend;
@@ -169,6 +171,9 @@ int parse_elf_to_stage(const struct buffer *input, struct buffer *output,
 
 		if (mend > mem_end)
 			mem_end = mend;
+
+		if (virt_to_phys == 0)
+			virt_to_phys = phdr[i].p_paddr - phdr[i].p_vaddr;
 	}
 
 	if (data_start < *location) {
@@ -262,7 +267,10 @@ int parse_elf_to_stage(const struct buffer *input, struct buffer *output,
 	 * Maybe we should just change the spec.
 	 */
 	xdr_le.put32(&outheader, algo);
-	xdr_le.put64(&outheader, ehdr->e_entry);
+	/* Coreboot expects entry point to be physical address. Thus, adjust the
+	 * entry point accordingly.
+	 */
+	xdr_le.put64(&outheader, ehdr->e_entry + virt_to_phys);
 	xdr_le.put64(&outheader, data_start);
 	xdr_le.put32(&outheader, outlen);
 	xdr_le.put32(&outheader, mem_end - data_start);