diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2013-06-05 10:08:35 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2013-09-27 16:39:03 +0100 |
| commit | 7d163c0158f6d9a1a0285397d523ea5b57dc4b95 (patch) | |
| tree | 55d9e21a7a85a9557474e300f2a74bd4b62f1c2b /xen | |
| parent | 4deea8515b1caba8803816399068f2a75d65f8ad (diff) | |
| download | xen-7d163c0158f6d9a1a0285397d523ea5b57dc4b95.tar.gz xen-7d163c0158f6d9a1a0285397d523ea5b57dc4b95.tar.bz2 xen-7d163c0158f6d9a1a0285397d523ea5b57dc4b95.zip | |
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>
Diffstat (limited to 'xen')
| -rw-r--r-- | xen/arch/arm/setup.c | 8 |
1 files changed, 8 insertions, 0 deletions
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 ) |