From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50872) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z61FP-0004XN-Lg for qemu-devel@nongnu.org; Fri, 19 Jun 2015 14:42:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z61FL-0000yI-I8 for qemu-devel@nongnu.org; Fri, 19 Jun 2015 14:42:39 -0400 Received: from mx5-phx2.redhat.com ([209.132.183.37]:58478) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z61FL-0000xj-BR for qemu-devel@nongnu.org; Fri, 19 Jun 2015 14:42:35 -0400 Date: Fri, 19 Jun 2015 14:42:27 -0400 (EDT) From: Andrew Jones Message-ID: <1207487120.5779701.1434739347409.JavaMail.zimbra@redhat.com> In-Reply-To: <1434676210-2276-1-git-send-email-shannon.zhao@linaro.org> References: <1434676210-2276-1-git-send-email-shannon.zhao@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2] hw/arm/virt-acpi-build: Add GICv2m description in ACPI MADT table List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: shannon zhao Cc: peter maydell , mst@redhat.com, qemu-devel@nongnu.org, zhaoshenglong@huawei.com, imammedo@redhat.com, christoffer dall ----- Original Message ----- > From: Shannon Zhao > > Add GICv2m description in ACPI MADT table, so guest can use MSI when > booting with ACPI. > > Signed-off-by: Shannon Zhao > Signed-off-by: Shannon Zhao Tested-by: Andrew Jones Reviewed-by: Andrew Jones > --- > 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 > > > >