[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 02/13] acpi: enable INTR for DMAR report structur
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v2 02/13] acpi: enable INTR for DMAR report structure |
Date: |
Mon, 11 Apr 2016 17:19:12 +0800 |
In ACPI DMA remapping report structure, enable INTR flag when specified.
Signed-off-by: Peter Xu <address@hidden>
---
hw/i386/acpi-build.c | 12 +++++++++---
include/hw/i386/intel_iommu.h | 2 ++
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 35180ef..cf0121e 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -2565,16 +2565,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));
@@ -2735,7 +2741,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/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.3
- [Qemu-devel] [PATCH v2 00/13] IOMMU: Enable interrupt remapping for Intel IOMMU, Peter Xu, 2016/04/11
- [Qemu-devel] [PATCH v2 01/13] q35: add "int-remap" flag to enable intr, Peter Xu, 2016/04/11
- [Qemu-devel] [PATCH v2 02/13] acpi: enable INTR for DMAR report structure,
Peter Xu <=
- [Qemu-devel] [PATCH v2 03/13] intel_iommu: allow queued invalidation for IR, Peter Xu, 2016/04/11
- [Qemu-devel] [PATCH v2 04/13] intel_iommu: set IR bit for ECAP register, Peter Xu, 2016/04/11
- [Qemu-devel] [PATCH v2 05/13] acpi: add DMAR scope definition for root IOAPIC, Peter Xu, 2016/04/11
- [Qemu-devel] [PATCH v2 06/13] intel_iommu: define interrupt remap table addr register, Peter Xu, 2016/04/11
- [Qemu-devel] [PATCH v2 07/13] intel_iommu: handle interrupt remap enable, Peter Xu, 2016/04/11
- [Qemu-devel] [PATCH v2 08/13] intel_iommu: define several structs for IOMMU IR, Peter Xu, 2016/04/11
- [Qemu-devel] [PATCH v2 09/13] intel_iommu: provide helper function vtd_get_iommu, Peter Xu, 2016/04/11
- [Qemu-devel] [PATCH v2 10/13] ioapic-common: add iommu for IOAPICCommonState, Peter Xu, 2016/04/11
- [Qemu-devel] [PATCH v2 11/13] intel_iommu: add IR translation faults defines, Peter Xu, 2016/04/11
- [Qemu-devel] [PATCH v2 12/13] intel_iommu: ioapic: IR support for emulated IOAPIC, Peter Xu, 2016/04/11