From: Peter Xu <peterx@redhat.com>
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
Subject: [Qemu-devel] [PATCH v9 07/25] intel_iommu: set IR bit for ECAP register
Date: Mon, 13 Jun 2016 21:09:23 +0800 [thread overview]
Message-ID: <1465823381-23602-8-git-send-email-peterx@redhat.com> (raw)
In-Reply-To: <1465823381-23602-1-git-send-email-peterx@redhat.com>
Enable IR in IOMMU Extended Capability register.
Signed-off-by: Peter Xu <peterx@redhat.com>
---
hw/i386/intel_iommu.c | 6 ++++++
hw/i386/intel_iommu_internal.h | 2 ++
2 files changed, 8 insertions(+)
diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index b170f97..e216fd3 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -1948,6 +1948,8 @@ static AddressSpace *vtd_find_add_as(X86IOMMUState *x86_iommu, PCIBus *bus,
*/
static void vtd_init(IntelIOMMUState *s)
{
+ X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(s);
+
memset(s->csr, 0, DMAR_REG_SIZE);
memset(s->wmask, 0, DMAR_REG_SIZE);
memset(s->w1cmask, 0, DMAR_REG_SIZE);
@@ -1968,6 +1970,10 @@ static void vtd_init(IntelIOMMUState *s)
VTD_CAP_SAGAW | VTD_CAP_MAMV | VTD_CAP_PSI | VTD_CAP_SLLPS;
s->ecap = VTD_ECAP_QI | VTD_ECAP_IRO;
+ if (x86_iommu->intr_supported) {
+ s->ecap |= VTD_ECAP_IR;
+ }
+
vtd_reset_context_cache(s);
vtd_reset_iotlb(s);
diff --git a/hw/i386/intel_iommu_internal.h b/hw/i386/intel_iommu_internal.h
index b648e69..5b98a11 100644
--- a/hw/i386/intel_iommu_internal.h
+++ b/hw/i386/intel_iommu_internal.h
@@ -176,6 +176,8 @@
/* (offset >> 4) << 8 */
#define VTD_ECAP_IRO (DMAR_IOTLB_REG_OFFSET << 4)
#define VTD_ECAP_QI (1ULL << 1)
+/* Interrupt Remapping support */
+#define VTD_ECAP_IR (1ULL << 3)
/* CAP_REG */
/* (offset >> 4) << 24 */
--
2.4.11
next prev parent reply other threads:[~2016-06-13 13:10 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-13 13:09 [Qemu-devel] [PATCH v9 00/25] IOMMU: Enable interrupt remapping for Intel IOMMU Peter Xu
2016-06-13 13:09 ` [Qemu-devel] [PATCH v9 01/25] x86-iommu: introduce parent class Peter Xu
2016-06-13 13:09 ` [Qemu-devel] [PATCH v9 02/25] x86-iommu: provide x86_iommu_get_default Peter Xu
2016-06-13 13:09 ` [Qemu-devel] [PATCH v9 03/25] x86-iommu: q35: generalize find_add_as() Peter Xu
2016-06-13 13:09 ` [Qemu-devel] [PATCH v9 04/25] x86-iommu: introduce "intremap" property Peter Xu
2016-06-13 13:09 ` [Qemu-devel] [PATCH v9 05/25] acpi: enable INTR for DMAR report structure Peter Xu
2016-06-13 13:09 ` [Qemu-devel] [PATCH v9 06/25] intel_iommu: allow queued invalidation for IR Peter Xu
2016-06-13 13:09 ` Peter Xu [this message]
2016-06-13 13:09 ` [Qemu-devel] [PATCH v9 08/25] acpi: add DMAR scope definition for root IOAPIC Peter Xu
2016-06-13 13:09 ` [Qemu-devel] [PATCH v9 09/25] intel_iommu: define interrupt remap table addr register Peter Xu
2016-06-13 13:09 ` [Qemu-devel] [PATCH v9 10/25] intel_iommu: handle interrupt remap enable Peter Xu
2016-06-13 13:09 ` [Qemu-devel] [PATCH v9 11/25] intel_iommu: define several structs for IOMMU IR Peter Xu
2016-06-13 13:09 ` [Qemu-devel] [PATCH v9 12/25] intel_iommu: add IR translation faults defines Peter Xu
2016-06-13 13:09 ` [Qemu-devel] [PATCH v9 13/25] intel_iommu: Add support for PCI MSI remap Peter Xu
2016-06-13 13:09 ` [Qemu-devel] [PATCH v9 14/25] q35: ioapic: add support for emulated IOAPIC IR Peter Xu
2016-06-13 13:09 ` [Qemu-devel] [PATCH v9 15/25] ioapic: introduce ioapic_entry_parse() helper Peter Xu
2016-06-13 13:09 ` [Qemu-devel] [PATCH v9 16/25] intel_iommu: add support for split irqchip Peter Xu
2016-06-13 13:09 ` [Qemu-devel] [PATCH v9 17/25] x86-iommu: introduce IEC notifiers Peter Xu
2016-06-13 13:09 ` [Qemu-devel] [PATCH v9 18/25] ioapic: register IOMMU IEC notifier for ioapic Peter Xu
2016-06-13 13:09 ` [Qemu-devel] [PATCH v9 19/25] intel_iommu: Add support for Extended Interrupt Mode Peter Xu
2016-06-13 13:09 ` [Qemu-devel] [PATCH v9 20/25] intel_iommu: add SID validation for IR Peter Xu
2016-06-13 13:09 ` [Qemu-devel] [PATCH v9 21/25] kvm-irqchip: simplify kvm_irqchip_add_msi_route Peter Xu
2016-06-13 13:09 ` [Qemu-devel] [PATCH v9 22/25] kvm-irqchip: i386: add hook for add/remove virq Peter Xu
2016-06-13 13:09 ` [Qemu-devel] [PATCH v9 23/25] kvm-irqchip: x86: add msi route notify fn Peter Xu
2016-06-13 13:09 ` [Qemu-devel] [PATCH v9 24/25] kvm-irqchip: do explicit commit when update irq Peter Xu
2016-06-13 13:09 ` [Qemu-devel] [PATCH v9 25/25] intel_iommu: support all masks in interrupt entry cache invalidation Peter Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1465823381-23602-8-git-send-email-peterx@redhat.com \
--to=peterx@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=davidkiarie4@gmail.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=jan.kiszka@web.de \
--cc=jasowang@redhat.com \
--cc=marcel@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rkrcmar@redhat.com \
--cc=rth@twiddle.net \
--cc=wexu@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).