From: Julien Grall <julien.grall@arm.com>
Date: Mon, 9 Oct 2017 13:23:35 +0000 (+0100)
Subject: xen/arm: Switch to SYS_STATE_boot just after end_boot_allocator()
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~1175
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fc24d616beda7b0d9a96c588b06862f46b189181;p=xen.git

xen/arm: Switch to SYS_STATE_boot just after end_boot_allocator()

We should consider the early boot period to end when we stop using the
boot allocator. This is inline with x86 and will be helpful to know
whether we should allocate memory from the boot allocator or xenheap.

Signed-off-by: Julien Grall <julien.grall@arm.com>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
---

diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
index 3df451ae6f..16a3b1be8e 100644
--- a/xen/arch/arm/setup.c
+++ b/xen/arch/arm/setup.c
@@ -757,6 +757,12 @@ void __init start_xen(unsigned long boot_phys_offset,
 
     end_boot_allocator();
 
+    /*
+     * The memory subsystem has been initialized, we can now switch from
+     * early_boot -> boot.
+     */
+    system_state = SYS_STATE_boot;
+
     vm_init();
 
     if ( acpi_disabled )
@@ -779,8 +785,6 @@ void __init start_xen(unsigned long boot_phys_offset,
     console_init_preirq();
     console_init_ring();
 
-    system_state = SYS_STATE_boot;
-
     processor_id();
 
     smp_init_cpus();