From patchwork Fri Jun 19 01:10:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 486540 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7D40514027F for ; Fri, 19 Jun 2015 11:10:37 +1000 (AEST) Received: from localhost ([::1]:55480 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5kpH-0000FM-5n for incoming@patchwork.ozlabs.org; Thu, 18 Jun 2015 21:10:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60394) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5kp3-0008Pv-4U for qemu-devel@nongnu.org; Thu, 18 Jun 2015 21:10:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5koz-000507-Rq for qemu-devel@nongnu.org; Thu, 18 Jun 2015 21:10:21 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:34227) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5koz-0004zk-La for qemu-devel@nongnu.org; Thu, 18 Jun 2015 21:10:17 -0400 Received: by pabvl15 with SMTP id vl15so26772326pab.1 for ; Thu, 18 Jun 2015 18:10:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=NY2bdpiHNdO3ThQ2iwCeEZtNe2MH6rTcqu45BqUoBzI=; b=Pyk42uJ09/YeU/jFyJN+JbISjr7bATKWxh8LOUXvdkJhmuEVQROxQYTmOwPIf5XLv5 9bdJO8H0d3ZS/uyidT9Pp4PNzcSElNzqKdrlxiOcj6RM3eNAV1IQ1fN74QTiFhJ6Ub9V QIhTxWc0tsg1CVfGMi5W9+mB2QCFdvTnYjyEPU9WWaUT3+kdZvMSUiz5HxTzyDT4hxj7 qs3lqPRrHCOLDKR4tACKSytvYR/PuwdeR50fH+R+TkXgAHz/4PpRR/sM19Z7rGgsJKqQ +ZcWxwgMyOC9rG2tSDV6Xxs+fIx+oFV4V90OKAtADmK3oK291bfdSgbR9JlA6AUvc3jQ LBTA== X-Gm-Message-State: ALoCoQmnXAObS533LlTIHotUiiEU2Er4z+S1g5T98CmXPYYLwoqCAQsrZ8uGFFqQLMpqTBa47TLO X-Received: by 10.68.219.1 with SMTP id pk1mr26177801pbc.18.1434676216607; Thu, 18 Jun 2015 18:10:16 -0700 (PDT) Received: from localhost ([180.150.134.149]) by mx.google.com with ESMTPSA id xo3sm9229139pbb.74.2015.06.18.18.10.14 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 18 Jun 2015 18:10:15 -0700 (PDT) From: shannon.zhao@linaro.org To: qemu-devel@nongnu.org, peter.maydell@linaro.org, imammedo@redhat.com, mst@redhat.com, christoffer.dall@linaro.org Date: Fri, 19 Jun 2015 09:10:10 +0800 Message-Id: <1434676210-2276-1-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 1.9.5.msysgit.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.220.47 Cc: shannon.zhao@linaro.org, zhaoshenglong@huawei.com Subject: [Qemu-devel] [PATCH v2] hw/arm/virt-acpi-build: Add GICv2m description in ACPI MADT table X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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) */