[Xen-changelog] [xen master] xen: arm: configure correct dom0_gnttab_start/size

[patchbot@xxxxxxx]

commit 37f29b0cb2551b1d790015be81232b6202a43bf2
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Thu Sep 11 16:21:29 2014 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Wed Nov 5 10:10:22 2014 +0000

    xen: arm: configure correct dom0_gnttab_start/size
    
    Vexpress is currently failing to boot for me with:
    ------------[ cut here ]------------
    WARNING: CPU: 0 PID: 1 at arch/arm/mm/ioremap.c:301 
__arm_ioremap_pfn_caller+0x118/0x1a4()
    CPU: 0 PID: 1 Comm: swapper Tainted: G        W     3.16.0-arm-native+ #276
    [<c0011e9c>] (unwind_backtrace) from [<c0010758>] (show_stack+0x10/0x14)
    [<c0010758>] (show_stack) from [<c001a3ec>] (warn_slowpath_common+0x5c/0x7c)
    [<c001a3ec>] (warn_slowpath_common) from [<c001a4c8>] 
(warn_slowpath_null+0x18/0x20)
    [<c001a4c8>] (warn_slowpath_null) from [<c001488c>] 
(__arm_ioremap_pfn_caller+0x118/0x1a4)
    [<c001488c>] (__arm_ioremap_pfn_caller) from [<c00149a0>] 
(__arm_ioremap+0x14/0x20)
    [<c00149a0>] (__arm_ioremap) from [<c01d103c>] 
(gnttab_setup_auto_xlat_frames+0x30/0xdc)
    [<c01d103c>] (gnttab_setup_auto_xlat_frames) from [<c0495324>] 
(xen_guest_init+0x19c/0x2d4)
    [<c0495324>] (xen_guest_init) from [<c0492c6c>] (do_one_initcall+0xfc/0x1a4)
    [<c0492c6c>] (do_one_initcall) from [<c0492d6c>] 
(kernel_init_freeable+0x58/0x1b4)
    [<c0492d6c>] (kernel_init_freeable) from [<c039611c>] (kernel_init+0x8/0xe4)
    [<c039611c>] (kernel_init) from [<c000de58>] (ret_from_fork+0x14/0x3c)
    ---[ end trace 3406ff24bd97382f ]---
    xen:grant_table: Failed to ioremap gnttab share frames 
(addr=0x00000000b0000000)!
    
    which is:
            /*
             * Don't allow RAM to be mapped - this causes problems with ARMv6+
             */
            if (WARN_ON(pfn_valid(pfn)))
                    return NULL;
    
    This makes sense since the gnttab defaults to 0xb000000 and my dom0
    is being allocated a 1:1 mapping at 0xa0000000-0xc0000000.
    
    I suspect this broke around the time we stopped forcing dom0 memory to be
    allocated as low as possible which happened to prevent the default 
dom0_gnttab
    region overlapping RAM.
    
    This patch specifies an explicit dom0_gnttab base which is explicitly unused
    according to the FVP model docs (although it corresponds to CS5 this isn't
    wired up to anything).
    
    Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    Reviewed-by: Julien Grall <julien.grall@xxxxxxxxxx>
---
 xen/arch/arm/platforms/vexpress.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/xen/arch/arm/platforms/vexpress.c 
b/xen/arch/arm/platforms/vexpress.c
index 8e6a4ea..ce66935 100644
--- a/xen/arch/arm/platforms/vexpress.c
+++ b/xen/arch/arm/platforms/vexpress.c
@@ -176,6 +176,8 @@ PLATFORM_START(vexpress, "VERSATILE EXPRESS")
 #endif
     .reset = vexpress_reset,
     .blacklist_dev = vexpress_blacklist_dev,
+    .dom0_gnttab_start = 0x10000000,
+    .dom0_gnttab_size = 0x20000,
 PLATFORM_END
 
 /*
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog