From: Heinrich Schuchardt <xypron.glpk@gmx.de>
Date: Tue, 11 May 2021 19:03:16 +0000 (+0200)
Subject: sandbox: ensure that state->ram_buf is in low memory
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=3beba4ad34649e053b97c5a61cd7de55bc718866;p=u-boot.git

sandbox: ensure that state->ram_buf is in low memory

Addresses in state->ram_buf must be in the low 4 GiB of the address space.
Otherwise we cannot correctly fill SMBIOS tables. This shows up in warnings
like:

    WARNING: SMBIOS table_address overflow 7f752735e020

Ensure that state->ram_buf is initialized by the first invocation of
os_malloc().

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index 63b086dff8..ad17e17c59 100644
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -453,6 +453,14 @@ int main(int argc, char *argv[])
 
 	text_base = os_find_text_base();
 
+	/*
+	 * This must be the first invocation of os_malloc() to have
+	 * state->ram_buf in the low 4 GiB.
+	 */
+	ret = state_init();
+	if (ret)
+		goto err;
+
 	/*
 	 * Copy argv[] so that we can pass the arguments in the original
 	 * sequence when resetting the sandbox.
@@ -467,10 +475,6 @@ int main(int argc, char *argv[])
 	gd = &data;
 	gd->arch.text_base = text_base;
 
-	ret = state_init();
-	if (ret)
-		goto err;
-
 	state = state_get_current();
 	if (os_parse_args(state, argc, argv))
 		return 1;