[xen master] xen/arm: Don't call process_shm_chosen() during ACPI boot

[patchbot@xxxxxxx]

commit c95346e14417f78dcd47defb9ae52d8b6c904d4b
Author:     Michal Orzel <michal.orzel@xxxxxxx>
AuthorDate: Wed Apr 2 10:42:32 2025 +0200
Commit:     Michal Orzel <michal.orzel@xxxxxxx>
CommitDate: Thu Apr 3 09:52:54 2025 +0200

    xen/arm: Don't call process_shm_chosen() during ACPI boot
    
    Static shared memory requires device-tree boot. At the moment, booting
    with ACPI enabled and CONFIG_STATIC_SHM=y results in a data abort when
    dereferencing node in process_shm() because dt_host is always NULL.
    
    Fixes: 09c0a8976acf ("xen/arm: enable statically shared memory on Dom0")
    Signed-off-by: Michal Orzel <michal.orzel@xxxxxxx>
    Reviewed-by: Bertrand Marquis <bertrand.marquis@xxxxxxx>
---
 xen/arch/arm/domain_build.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 2b5b433183..85f423214a 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -2325,9 +2325,12 @@ int __init construct_hwdom(struct kernel_info *kinfo)
     else
         allocate_memory(d, kinfo);
 
-    rc = process_shm_chosen(d, kinfo);
-    if ( rc < 0 )
-        return rc;
+    if ( acpi_disabled )
+    {
+        rc = process_shm_chosen(d, kinfo);
+        if ( rc < 0 )
+            return rc;
+    }
 
     /* Map extra GIC MMIO, irqs and other hw stuffs to dom0. */
     rc = gic_map_hwdom_extra_mappings(d);
--
generated by git-patchbot for /home/xen/git/xen.git#master