From a1ce81ca2669d1dee2c8c5cf989f409d8d02f7cc Mon Sep 17 00:00:00 2001 From: "Edgar E. Iglesias" Date: Fri, 8 May 2015 17:10:08 +1000 Subject: [PATCH] xen/arm: Re-order iommu_setup to after setup_virt_paging This is needed to allow the paging setup to probe for IPA bit sizes to be used in p2m tables prior to iommu setup. Acked-by: Ian Campbell Reviewed-by: Julien Grall Signed-off-by: Edgar E. Iglesias --- xen/arch/arm/setup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 711562cf18..06f8e54b1f 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -800,8 +800,6 @@ void __init start_xen(unsigned long boot_phys_offset, local_irq_enable(); local_abort_enable(); - iommu_setup(); - smp_prepare_cpus(cpus); initialize_keytable(); @@ -825,6 +823,8 @@ void __init start_xen(unsigned long boot_phys_offset, setup_virt_paging(); + iommu_setup(); + do_initcalls(); /* Create initial domain 0. */ -- 2.30.2