diff options
author | Ian Campbell <ian.campbell@citrix.com> | 2013-09-26 12:35:37 +0100 |
---|---|---|
committer | Ian Campbell <ian.campbell@citrix.com> | 2013-09-26 16:21:33 +0100 |
commit | db92b1ac55cd5e193ae22b0b6f01fb47bc9e5d2f (patch) | |
tree | 9df11b5804dabcd9b9b9f262201e2359221a3824 /xen | |
parent | c883eed77ae2bec5aca2f678bfd7fe4642fa6d37 (diff) | |
download | xen-db92b1ac55cd5e193ae22b0b6f01fb47bc9e5d2f.tar.gz xen-db92b1ac55cd5e193ae22b0b6f01fb47bc9e5d2f.tar.bz2 xen-db92b1ac55cd5e193ae22b0b6f01fb47bc9e5d2f.zip |
xen/arm: do not relocate Xen outside of visible RAM
Since we do not handle non-contiguous banks of memory lets avoid relocating
Xen into such a bank. Avoids issues such as free_init_memory releasing pages
which are outside of the frametable.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Tim Deegan <tim@xen.org>
Diffstat (limited to 'xen')
-rw-r--r-- | xen/arch/arm/setup.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index b5c2b1779b..82158978e2 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -240,17 +240,25 @@ static paddr_t __init get_xen_paddr(void) { struct dt_mem_info *mi = &early_info.mem; paddr_t min_size; - paddr_t paddr = 0; + paddr_t paddr = 0, last_end; 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, |