From: Julien Grall <julien.grall@linaro.org>
Date: Fri, 10 May 2013 02:17:52 +0000 (+0100)
Subject: xen/arm: Load dtb after dom0 kernel
X-Git-Tag: 4.3.0-rc2~54
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=55eb2e2cb844a798b818fda7aac228885a064784;p=people%2Fiwj%2Fxen.git

xen/arm: Load dtb after dom0 kernel

On some setup, the first linux page table is at 0x40004000. Xen will load
dom0 device tree at 0x4000100. In case of the device tree is big, linux will
corrupt the device tree.

Signed-off-by: Julien Grall <julien.grall@linaro.org>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 874827240a..6581492b83 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -407,8 +407,9 @@ int construct_dom0(struct domain *d)
     /* The following loads use the domain's p2m */
     p2m_load_VTTBR(d);
 
-    dtb_load(&kinfo);
+    kinfo.dtb_paddr = kinfo.zimage.load_addr + kinfo.zimage.len;
     kernel_load(&kinfo);
+    dtb_load(&kinfo);
 
     discard_initial_modules();