qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [PATCH] ACPI: ARM: Present GIC version in MADT table


From: Andrew Jones
Subject: Re: [Qemu-devel] [PATCH] ACPI: ARM: Present GIC version in MADT table
Date: Wed, 15 Jun 2016 10:52:00 +0200
User-agent: Mutt/1.5.23.1 (2014-03-12)

On Wed, Jun 15, 2016 at 11:22:35AM +0800, Shannon Zhao wrote:
> From: Shannon Zhao <address@hidden>
> 
> In ACPI 5.1 Errata, it adds GIC version in GIC distributor structure.
> This is useful for guest kernel to identify which version GIC hardware
> is. Update GIC distributor structure and present GIC version in MADT
> table.
> 
> Signed-off-by: Shannon Zhao <address@hidden>
> ---
>  hw/arm/virt-acpi-build.c    | 1 +
>  include/hw/acpi/acpi-defs.h | 4 +++-
>  2 files changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> index 1fa0581..28fc59c 100644
> --- a/hw/arm/virt-acpi-build.c
> +++ b/hw/arm/virt-acpi-build.c
> @@ -523,6 +523,7 @@ build_madt(GArray *table_data, BIOSLinker *linker, 
> VirtGuestInfo *guest_info)
>      gicd->type = ACPI_APIC_GENERIC_DISTRIBUTOR;
>      gicd->length = sizeof(*gicd);
>      gicd->base_address = memmap[VIRT_GIC_DIST].base;
> +    gicd->version = guest_info->gic_version;
>  
>      for (i = 0; i < guest_info->smp_cpus; i++) {
>          AcpiMadtGenericInterrupt *gicc = acpi_data_push(table_data,
> diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
> index 850a962..ea9be0b 100644
> --- a/include/hw/acpi/acpi-defs.h
> +++ b/include/hw/acpi/acpi-defs.h
> @@ -367,7 +367,9 @@ struct AcpiMadtGenericDistributor {
>      uint32_t gic_id;
>      uint64_t base_address;
>      uint32_t global_irq_base;
> -    uint32_t reserved2;
> +    /* ACPI 5.1 Errata 1228 Present GIC version in MADT table */
> +    uint8_t version;
> +    uint8_t reserved2[3];
>  } QEMU_PACKED;
>  
>  typedef struct AcpiMadtGenericDistributor AcpiMadtGenericDistributor;
> -- 
> 2.0.4

AFAICT, Linux is actually fine with version=0 (as before this patch).
One way or another it has already determined that the gic is either v3
or v4, and then just proceeds. That said, it does seem like the right
thing to do to set it

Reviewed-by: Andrew Jones <address@hidden>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]