Re: [PATCH FOR-4.5] xen: arm: Do not enable EFI in dom0 since it is not yet supported.

[Julien Grall <julien.grall@linaro.org>]

(CC vijay)

Hi Suravee,

On 10/13/2014 05:17 PM, suravee.suthikulpanit@amd.com wrote:
> From: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
> 
> Since EFI is not yet supported in dom0, we need to remove the following
> properties from the chosen node:
> 
>   * linux,uefi-mmap-start
>   * linux,uefi-mmap-size
>   * linux,uefi-mmap-desc-size
>   * linux,uefi-mmap-desc-ver
> 
> These are added by "arch/arm/efi/efi-boot.h: fdt_add_uefi_nodes()",
> and used by dom0 kernel to enable EFI.
> 
> Cc: Julien Grall <julien.grall@linaro.org>
> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> Cc: Ian Campbell <ian.campbell@citrix.com>
> Cc: Roy Franz <roy.franz@linaro.org>
> Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>

Reviewed-by: Julien Grall <julien.grall@linaro.org>

Regards,

> ---
>  xen/arch/arm/domain_build.c | 11 ++++++++++-
>  1 file changed, 10 insertions(+), 1 deletion(-)
> 
> diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
> index 90abc3a..f1d0d20 100644
> --- a/xen/arch/arm/domain_build.c
> +++ b/xen/arch/arm/domain_build.c
> @@ -423,12 +423,21 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo,
>           *   bootargs (from module #1, above).
>           * * remove bootargs,  xen,dom0-bootargs, xen,xen-bootargs,
>           *   linux,initrd-start and linux,initrd-end.
> +         * * remove bootargs, linux,uefi-system-table,
> +         *   linux,uefi-mmap-start, linux,uefi-mmap-size,
> +         *   linux,uefi-mmap-desc-size, and linux,uefi-mmap-desc-ver
> +         *   (since EFI boot is not currently supported in dom0).
>           */
>          if ( dt_node_path_is_equal(node, "/chosen") )
>          {
>              if ( dt_property_name_is_equal(prop, "xen,xen-bootargs") ||
>                   dt_property_name_is_equal(prop, "linux,initrd-start") ||
> -                 dt_property_name_is_equal(prop, "linux,initrd-end") )
> +                 dt_property_name_is_equal(prop, "linux,initrd-end") ||
> +                 dt_property_name_is_equal(prop, "linux,uefi-system-table") ||
> +                 dt_property_name_is_equal(prop, "linux,uefi-mmap-start") ||
> +                 dt_property_name_is_equal(prop, "linux,uefi-mmap-size") ||
> +                 dt_property_name_is_equal(prop, "linux,uefi-mmap-desc-size") ||
> +                 dt_property_name_is_equal(prop, "linux,uefi-mmap-desc-ver"))
>                  continue;
>  
>              if ( dt_property_name_is_equal(prop, "xen,dom0-bootargs") )
> 

-- 
Julien Grall