Hi Michal,

> On 2 Apr 2025, at 10:42, Michal Orzel <michal.or...@amd.com> wrote:
> 
> 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.or...@amd.com>

Reviewed-by: Bertrand Marquis <bertrand.marq...@arm.com>

Cheers
Bertrand

> ---
> 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 2b5b4331834f..85f423214a44 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);
> -- 
> 2.25.1
> 


Reply via email to