[Xen-devel] [PATCH v3 40/62] arm/acpi: Estimate memory required for acpi/efi tables

[Stefano Stabellini]

On Mon, 4 Jan 2016, Shannon Zhao wrote:
> On 2015/11/30 23:14, Julien Grall wrote:
> > Hi Shannon,
> > 
> > On 17/11/15 09:40, shannon.zhao at linaro.org wrote:
> >> diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c
> >> index 53c7452..78d8ae9 100644
> >> --- a/xen/common/efi/boot.c
> >> +++ b/xen/common/efi/boot.c
> >> @@ -13,6 +13,7 @@
> >>  #include <xen/multiboot.h>
> >>  #include <xen/pci_regs.h>
> >>  #include <xen/pfn.h>
> >> +#include <asm/acpi.h>
> >>  #if EFI_PAGE_SIZE != PAGE_SIZE
> >>  # error Cannot use xen/pfn.h here!
> >>  #endif
> >> @@ -1171,6 +1172,26 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
> >>      for( ; ; ); /* not reached */
> >>  }
> >>  
> >> +#ifdef CONFIG_ACPI
> >> +/* Constant to indicate "Xen" in unicode u16 format */
> >> +static const u16 XEN_EFI_FW_VENDOR[] ={0x0058,0x0065,0x006E,0x0000};
> >> +
> >> +int __init estimate_efi_size(int mem_nr_banks)
> >> +{
> >> +    int size;
> >> +    int est_size = sizeof(EFI_SYSTEM_TABLE);
> >> +    int ect_size = sizeof(EFI_CONFIGURATION_TABLE);
> >> +    int emd_size = sizeof(EFI_MEMORY_DESCRIPTOR);
> >> +    int fw_vendor_size = sizeof(XEN_EFI_FW_VENDOR);
> >> +
> >> +    size = PAGE_ALIGN(est_size + ect_size + fw_vendor_size)
> >> +           + PAGE_ALIGN(emd_size *
> >> +                        (mem_nr_banks + acpi_mem.nr_banks + TBL_MMAX));
> >> +
> >> +    return size;
> >> +}
> >> +#endif
> >> +
> > 
> > efi/boot.c only contains code related to the stub EFI. This is not the
> > case of this code.
> > 
> 
> I add these codes at this file because I want to reuse the definitions
> of EFI structures like EFI_SYSTEM_TABLE. Parth re-define those
> structures at previous patch set and one comment suggested to reuse the
> existing ones. If I add these codes in xen/arch/arm/domain_build.c, it
> will have some conflicts. E.g:
> 
> In file included from /home/open-source/xen/xen/include/asm/efibind.h:2:0,
>                  from domain_build.c:29:
> /home/open-source/xen/xen/include/asm/arm64/efibind.h:86:20: error:
> conflicting types for 'UINT64'
>  typedef uint64_t   UINT64;
>                     ^
> In file included from /home/open-source/xen/xen/include/acpi/acpi.h:57:0,
>                  from /home/open-source/xen/xen/include/xen/acpi.h:33,
>                  from domain_build.c:15:
> /home/open-source/xen/xen/include/acpi/actypes.h:130:35: note: previous
> declaration of 'UINT64' was here
>  typedef COMPILER_DEPENDENT_UINT64 UINT64;

I think that having this code in efi/boot.c might be OK, but let's see
what Jan thinks.



> > Moreover, this code won't compile on x86 because acpi_mem is only
> > defined for ARM.
> > 
> > Regards,
> > 
> 
> Thanks,
> -- 
> Shannon
>