From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59240) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7KUD-0001pQ-Ho for qemu-devel@nongnu.org; Mon, 30 May 2016 06:31:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b7KUC-0005En-CJ for qemu-devel@nongnu.org; Mon, 30 May 2016 06:31:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34648) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7KUC-0005Ef-5U for qemu-devel@nongnu.org; Mon, 30 May 2016 06:31:52 -0400 From: Peter Xu Date: Mon, 30 May 2016 18:31:14 +0800 Message-Id: <1464604298-16739-2-git-send-email-peterx@redhat.com> In-Reply-To: <1464604298-16739-1-git-send-email-peterx@redhat.com> References: <1464604298-16739-1-git-send-email-peterx@redhat.com> Subject: [Qemu-devel] [PATCH v8 01/25] acpi: enable INTR for DMAR report structure List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: imammedo@redhat.com, rth@twiddle.net, ehabkost@redhat.com, jasowang@redhat.com, marcel@redhat.com, mst@redhat.com, pbonzini@redhat.com, jan.kiszka@web.de, rkrcmar@redhat.com, alex.williamson@redhat.com, wexu@redhat.com, davidkiarie4@gmail.com, peterx@redhat.com Introduce iommu_intr in MachineState to show whether IOMMU IR is enabled. By default, IR is off. In ACPI DMA remapping report structure, enable INTR flag when specified. Signed-off-by: Peter Xu --- hw/core/machine.c | 2 ++ hw/i386/acpi-build.c | 12 +++++++++--- include/hw/boards.h | 1 + include/hw/i386/intel_iommu.h | 2 ++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index ccdd5fa..98471a7 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -397,6 +397,8 @@ static void machine_initfn(Object *obj) ms->dump_guest_core = true; ms->mem_merge = true; ms->enable_graphics = true; + /* Disable interrupt remapping by default. */ + ms->iommu_intr = false; object_property_add_str(obj, "accel", machine_get_accel, machine_set_accel, NULL); diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 279f0d7..ddc6f16 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2554,16 +2554,22 @@ build_mcfg_q35(GArray *table_data, GArray *linker, AcpiMcfgInfo *info) } static void -build_dmar_q35(GArray *table_data, GArray *linker) +build_dmar_q35(MachineState *ms, GArray *table_data, GArray *linker) { int dmar_start = table_data->len; AcpiTableDmar *dmar; AcpiDmarHardwareUnit *drhd; + uint8_t dmar_flags = 0; + + if (ms->iommu_intr) { + /* enable INTR for the IOMMU device */ + dmar_flags |= DMAR_REPORT_F_INTR; + } dmar = acpi_data_push(table_data, sizeof(*dmar)); dmar->host_address_width = VTD_HOST_ADDRESS_WIDTH - 1; - dmar->flags = 0; /* No intr_remap for now */ + dmar->flags = dmar_flags; /* DMAR Remapping Hardware Unit Definition structure */ drhd = acpi_data_push(table_data, sizeof(*drhd)); @@ -2724,7 +2730,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) } if (acpi_has_iommu()) { acpi_add_table(table_offsets, tables_blob); - build_dmar_q35(tables_blob, tables->linker); + build_dmar_q35(MACHINE(pcms), tables_blob, tables->linker); } if (pcms->acpi_nvdimm_state.is_enabled) { nvdimm_build_acpi(table_offsets, tables_blob, tables->linker); diff --git a/include/hw/boards.h b/include/hw/boards.h index d268bd0..b27018d 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -152,6 +152,7 @@ struct MachineState { bool igd_gfx_passthru; char *firmware; bool iommu; + bool iommu_intr; bool suppress_vmdesc; bool enforce_config_section; bool enable_graphics; diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h index b024ffa..0d89796 100644 --- a/include/hw/i386/intel_iommu.h +++ b/include/hw/i386/intel_iommu.h @@ -44,6 +44,8 @@ #define VTD_HOST_ADDRESS_WIDTH 39 #define VTD_HAW_MASK ((1ULL << VTD_HOST_ADDRESS_WIDTH) - 1) +#define DMAR_REPORT_F_INTR (1) + typedef struct VTDContextEntry VTDContextEntry; typedef struct VTDContextCacheEntry VTDContextCacheEntry; typedef struct IntelIOMMUState IntelIOMMUState; -- 2.4.11