From 7d163c0158f6d9a1a0285397d523ea5b57dc4b95 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Wed, 5 Jun 2013 10:08:35 +0100
Subject: xen: arm: Load xen under 4GB on 32-bit

We need to be able to use a 1:1 mapping during bring up.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Julien Grall <julien.grall@linaro.org>
Acked-by: Tim Deegan <tim@xen.org>
---
 xen/arch/arm/setup.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'xen')

diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
index d97b900e1a..315fa1d8b8 100644
--- a/xen/arch/arm/setup.c
+++ b/xen/arch/arm/setup.c
@@ -323,6 +323,14 @@ static paddr_t __init get_xen_paddr(void)
             if ( !e )
                 continue;
 
+#ifdef CONFIG_ARM_32
+            /* Xen must be under 4GB */
+            if ( e > 0x100000000ULL )
+                e = 0x100000000ULL;
+            if ( e < bank->start )
+                continue;
+#endif
+
             s = e - min_size;
 
             if ( s > paddr )
-- 
cgit v1.2.3