Re: [Xen-devel] [PATCH v2 09/17] libxl/arm: Construct ACPI MADT table

[Julien Grall <julien.grall@xxxxxxx>]

Hi Shannon,

On 23/06/16 04:16, Shannon Zhao wrote:
> From: Shannon Zhao <shannon.zhao@xxxxxxxxxx>
>
> According to the GIC version, construct the MADT table.
>
> Signed-off-by: Shannon Zhao <shannon.zhao@xxxxxxxxxx>
> ---
>   tools/libxl/libxl_arm_acpi.c | 100 +++++++++++++++++++++++++++++++++++++++++++
>   1 file changed, 100 insertions(+)
>
> diff --git a/tools/libxl/libxl_arm_acpi.c b/tools/libxl/libxl_arm_acpi.c
> index de863f4..659dbfa 100644
> --- a/tools/libxl/libxl_arm_acpi.c
> +++ b/tools/libxl/libxl_arm_acpi.c
> @@ -42,6 +42,8 @@ typedef uint64_t u64;
>   #define ACPI_LEVEL_SENSITIVE            (u8) 0x00
>   #define ACPI_ACTIVE_LOW                 (u8) 0x01
>
> +#define ACPI_GICC_ENABLED 1
Is there any reason to not use ACPI_MADT_ENABLED?

> +
>   enum {
>       RSDP,
>       XSDT,
> @@ -137,6 +139,101 @@ static void make_acpi_gtdt(libxl__gc *gc, struct 
> xc_dom_image *dom)
>       dom->acpitable_size += ROUNDUP(acpitables[GTDT].size, 3);
>   }
>
> +static void make_acpi_madt_gicc(void *table, int nr_cpus, uint64_t gicc_base)
> +{
> +    uint32_t i;
> +    struct acpi_madt_generic_interrupt *gicc = table;
> +
> +    for (i = 0; i < nr_cpus; i++) {
> +        gicc->header.type = ACPI_MADT_TYPE_GENERIC_INTERRUPT;
> +        gicc->header.length = sizeof(*gicc);
> +        gicc->base_address = gicc_base;
> +        gicc->cpu_interface_number = i;
> +        gicc->arm_mpidr = libxl__compute_mpdir(i);
> +        gicc->uid = i;
> +        gicc->flags = ACPI_GICC_ENABLED;
> +        gicc++;
> +    }
> +}
> +
> +static void make_acpi_madt_gicd(void *table, uint64_t gicd_base,
> +                                uint8_t gic_version)
> +{
> +    struct acpi_madt_generic_distributor *gicd = table;
> +
> +    gicd->header.type = ACPI_MADT_TYPE_GENERIC_DISTRIBUTOR;
> +    gicd->header.length = sizeof(*gicd);
> +    gicd->base_address = gicd_base;
> +    /* This version filed has no meaning before ACPI 5.1 errata. */
s/filed/field/

> +    gicd->version = gic_version;
> +}
> +
> +static void make_acpi_madt_gicr(void *table, uint64_t gicr_base,
> +                                uint64_t gicr_size)
> +{
> +    struct acpi_madt_generic_redistributor *gicr = table;
> +
> +    gicr->header.type = ACPI_MADT_TYPE_GENERIC_REDISTRIBUTOR;
> +    gicr->header.length = sizeof(*gicr);
> +    gicr->base_address = gicr_base;
> +    gicr->length = gicr_size;
> +}
> +
> +static int make_acpi_madt(libxl__gc *gc, struct xc_dom_image *dom, int nr_cpus,
> +                          xc_domain_configuration_t *xc_config)
> +{

[...]

> +
> +    make_acpi_header(&madt->header, "APIC", size, 3);
> +
> +    acpitables[MADT].table = madt;
> +    acpitables[MADT].size = size;
> +    /* Align to 64bit. */
> +    dom->acpitable_size += ROUNDUP(acpitables[MADT].size, 3);
I am not sure how ROUNDUP(..., 3) will align to 64-bit.

> +
> +    return 0;
> +}
> +
>   int libxl__prepare_acpi(libxl__gc *gc, libxl_domain_build_info *info,
>                           libxl__domain_build_state *state,
>                           struct xc_dom_image *dom)
> @@ -160,6 +257,9 @@ int libxl__prepare_acpi(libxl__gc *gc, 
> libxl_domain_build_info *info,
>       make_acpi_rsdp(gc, dom);
>       make_acpi_xsdt(gc, dom);
>       make_acpi_gtdt(gc, dom);
> +    rc = make_acpi_madt(gc, dom, info->max_vcpus, xc_config);
> +    if (rc)
> +       return rc;
>
>       return 0;
>   }
Regards,

--
Julien Grall

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel