[xen staging] xen/arm: fix booting ACPI based system after static evtchn series

[patchbot@xxxxxxx]

commit 3161231abcb461314b205337fbd0530c7ead1696
Author:     Rahul Singh <rahul.singh@xxxxxxx>
AuthorDate: Fri Sep 23 12:02:18 2022 +0100
Commit:     Stefano Stabellini <stefano.stabellini@xxxxxxx>
CommitDate: Mon Oct 3 17:56:07 2022 -0700

    xen/arm: fix booting ACPI based system after static evtchn series
    
    When ACPI is enabled and the system booted with ACPI, BUG() is observed
    after merging the static event channel series. As there is no DT when
    booted with ACPI there will be no chosen node because of that
    "BUG_ON(chosen == NULL)" will be hit.
    
    (XEN) Xen BUG at arch/arm/domain_build.c:3578
    
    Move call to alloc_static_evtchn() under acpi_disabled check to fix the
    issue.
    
    Fixes: 1fe16b3ed78a (xen/arm: introduce xen-evtchn dom0less property)
    Signed-off-by: Rahul Singh <rahul.singh@xxxxxxx>
    [stefano: minor spelling fix in commit message]
    Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxx>
    Reviewed-by: Ayan Kumar Halder <ayankuma@xxxxxxx>
    Reviewed-by: Bertrand Marquis <bertrand.marquis@xxxxxxx>
---
 xen/arch/arm/setup.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
index 61b4f258a0..4395640019 100644
--- a/xen/arch/arm/setup.c
+++ b/xen/arch/arm/setup.c
@@ -1166,9 +1166,10 @@ void __init start_xen(unsigned long boot_phys_offset,
         printk(XENLOG_INFO "Xen dom0less mode detected\n");
 
     if ( acpi_disabled )
+    {
         create_domUs();
-
-    alloc_static_evtchn();
+        alloc_static_evtchn();
+    }
 
     /*
      * This needs to be called **before** heap_init_late() so modules
--
generated by git-patchbot for /home/xen/git/xen.git#staging