From: Sameer Goel <sgoel@codeaurora.org>
Date: Tue, 25 Oct 2016 16:40:28 +0000 (-0600)
Subject: Revert "xen/arm: do not relocate Xen outside of visible RAM"
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~3268
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9f954a5e90414d10632e6c2fef5a33ea8a4a1e4e;p=xen.git

Revert "xen/arm: do not relocate Xen outside of visible RAM"

This reverts commit db92b1ac55cd5e193ae22b0b6f01fb47bc9e5d2f.

The restriction on non contiguous memory was resolved by commit
2d02b05c77fc5e7c76bf6f112db84bbaa44fdcb5:
"xen: arm: improve handling of system with non-contiguous RAM regions"

So, reverting this change,to enable Xen image placement at the end of the
useable system RAM.

Signed-off-by: Sameer Goel <sgoel@codeaurora.org>
Acked-by: Stefano Stabellini <sstabellini@kernel.org>
---

diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
index 38eb888c0b..1678871b5e 100644
--- a/xen/arch/arm/setup.c
+++ b/xen/arch/arm/setup.c
@@ -392,25 +392,17 @@ static paddr_t __init get_xen_paddr(void)
 {
     struct meminfo *mi = &bootinfo.mem;
     paddr_t min_size;
-    paddr_t paddr = 0, last_end;
+    paddr_t paddr = 0;
     int i;
 
     min_size = (_end - _start + (XEN_PADDR_ALIGN-1)) & ~(XEN_PADDR_ALIGN-1);
 
-    last_end = mi->bank[0].start;
-
     /* Find the highest bank with enough space. */
     for ( i = 0; i < mi->nr_banks; i++ )
     {
         const struct membank *bank = &mi->bank[i];
         paddr_t s, e;
 
-        /* We can only deal with contiguous memory at the moment */
-        if ( last_end != bank->start )
-            break;
-
-        last_end = bank->start + bank->size;
-
         if ( bank->size >= min_size )
         {
             e = consider_modules(bank->start, bank->start + bank->size,