| Message ID | 1434676210-2276-1-git-send-email-shannon.zhao@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 19 June 2015 at 02:10, <shannon.zhao@linaro.org> wrote: > From: Shannon Zhao <shannon.zhao@linaro.org> > > Add GICv2m description in ACPI MADT table, so guest can use MSI when > booting with ACPI. > > Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com> > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> > --- This looks ok, but I would like a review or ack from somebody before I put it in target-arm.next. thanks -- PMM
----- Original Message ----- > From: Shannon Zhao <shannon.zhao@linaro.org> > > Add GICv2m description in ACPI MADT table, so guest can use MSI when > booting with ACPI. > > Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com> > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> Tested-by: Andrew Jones <drjones@redhat.com> Reviewed-by: Andrew Jones <drjones@redhat.com> > --- > Fix endianness [Peter] > --- > hw/arm/virt-acpi-build.c | 11 +++++++++++ > include/hw/acpi/acpi-defs.h | 12 ++++++++++++ > 2 files changed, 23 insertions(+) > > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > index d5a8b9c..3652c87 100644 > --- a/hw/arm/virt-acpi-build.c > +++ b/hw/arm/virt-acpi-build.c > @@ -423,8 +423,10 @@ build_madt(GArray *table_data, GArray *linker, > VirtGuestInfo *guest_info, > { > int madt_start = table_data->len; > const MemMapEntry *memmap = guest_info->memmap; > + const int *irqmap = guest_info->irqmap; > AcpiMultipleApicTable *madt; > AcpiMadtGenericDistributor *gicd; > + AcpiMadtGenericMsiFrame *gic_msi; > int i; > > madt = acpi_data_push(table_data, sizeof *madt); > @@ -448,6 +450,15 @@ build_madt(GArray *table_data, GArray *linker, > VirtGuestInfo *guest_info, > gicd->length = sizeof(*gicd); > gicd->base_address = memmap[VIRT_GIC_DIST].base; > > + gic_msi = acpi_data_push(table_data, sizeof *gic_msi); > + gic_msi->type = ACPI_APIC_GENERIC_MSI_FRAME; > + gic_msi->length = sizeof(*gic_msi); > + gic_msi->gic_msi_frame_id = 0; > + gic_msi->base_address = cpu_to_le64(memmap[VIRT_GIC_V2M].base); > + gic_msi->flags = cpu_to_le32(1); > + gic_msi->spi_count = cpu_to_le16(NUM_GICV2M_SPIS); > + gic_msi->spi_base = cpu_to_le16(irqmap[VIRT_GIC_V2M] + ARM_SPI_BASE); > + > build_header(linker, table_data, > (void *)(table_data->data + madt_start), "APIC", > table_data->len - madt_start, 5); > diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h > index 7b4bfb7..2b431e6 100644 > --- a/include/hw/acpi/acpi-defs.h > +++ b/include/hw/acpi/acpi-defs.h > @@ -372,6 +372,18 @@ struct AcpiMadtGenericDistributor { > > typedef struct AcpiMadtGenericDistributor AcpiMadtGenericDistributor; > > +struct AcpiMadtGenericMsiFrame { > + ACPI_SUB_HEADER_DEF > + uint16_t reserved; > + uint32_t gic_msi_frame_id; > + uint64_t base_address; > + uint32_t flags; > + uint16_t spi_count; > + uint16_t spi_base; > +} QEMU_PACKED; > + > +typedef struct AcpiMadtGenericMsiFrame AcpiMadtGenericMsiFrame; > + > /* > * Generic Timer Description Table (GTDT) > */ > -- > 2.1.0 > > > >
On 19 June 2015 at 19:42, Andrew Jones <drjones@redhat.com> wrote: > > > ----- Original Message ----- >> From: Shannon Zhao <shannon.zhao@linaro.org> >> >> Add GICv2m description in ACPI MADT table, so guest can use MSI when >> booting with ACPI. >> >> Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com> >> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> > > Tested-by: Andrew Jones <drjones@redhat.com> > Reviewed-by: Andrew Jones <drjones@redhat.com> Applied to target-arm.next, thanks. -- PMM
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index d5a8b9c..3652c87 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -423,8 +423,10 @@ build_madt(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info, { int madt_start = table_data->len; const MemMapEntry *memmap = guest_info->memmap; + const int *irqmap = guest_info->irqmap; AcpiMultipleApicTable *madt; AcpiMadtGenericDistributor *gicd; + AcpiMadtGenericMsiFrame *gic_msi; int i; madt = acpi_data_push(table_data, sizeof *madt); @@ -448,6 +450,15 @@ build_madt(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info, gicd->length = sizeof(*gicd); gicd->base_address = memmap[VIRT_GIC_DIST].base; + gic_msi = acpi_data_push(table_data, sizeof *gic_msi); + gic_msi->type = ACPI_APIC_GENERIC_MSI_FRAME; + gic_msi->length = sizeof(*gic_msi); + gic_msi->gic_msi_frame_id = 0; + gic_msi->base_address = cpu_to_le64(memmap[VIRT_GIC_V2M].base); + gic_msi->flags = cpu_to_le32(1); + gic_msi->spi_count = cpu_to_le16(NUM_GICV2M_SPIS); + gic_msi->spi_base = cpu_to_le16(irqmap[VIRT_GIC_V2M] + ARM_SPI_BASE); + build_header(linker, table_data, (void *)(table_data->data + madt_start), "APIC", table_data->len - madt_start, 5); diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h index 7b4bfb7..2b431e6 100644 --- a/include/hw/acpi/acpi-defs.h +++ b/include/hw/acpi/acpi-defs.h @@ -372,6 +372,18 @@ struct AcpiMadtGenericDistributor { typedef struct AcpiMadtGenericDistributor AcpiMadtGenericDistributor; +struct AcpiMadtGenericMsiFrame { + ACPI_SUB_HEADER_DEF + uint16_t reserved; + uint32_t gic_msi_frame_id; + uint64_t base_address; + uint32_t flags; + uint16_t spi_count; + uint16_t spi_base; +} QEMU_PACKED; + +typedef struct AcpiMadtGenericMsiFrame AcpiMadtGenericMsiFrame; + /* * Generic Timer Description Table (GTDT) */