[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v3 27/55] intel_iommu: Add support for Extended Inter
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v3 27/55] intel_iommu: Add support for Extended Interrupt Mode |
Date: |
Wed, 20 Jul 2016 20:46:43 +0300 |
From: Jan Kiszka <address@hidden>
As neither QEMU nor KVM support more than 255 CPUs so far, this is
simple: we only need to switch the destination ID translation in
vtd_remap_irq_get if EIME is set.
Once CFI support is there, it will have to take EIM into account as
well. So far, nothing to do for this.
This patch allows to use x2APIC in split irqchip mode of KVM.
Signed-off-by: Jan Kiszka <address@hidden>
[use le32_to_cpu() to retrieve dest_id]
Signed-off-by: Peter Xu <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/i386/intel_iommu_internal.h | 2 ++
include/hw/i386/intel_iommu.h | 1 +
hw/i386/intel_iommu.c | 16 +++++++++-------
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/hw/i386/intel_iommu_internal.h b/hw/i386/intel_iommu_internal.h
index 10c20fe..72b0114 100644
--- a/hw/i386/intel_iommu_internal.h
+++ b/hw/i386/intel_iommu_internal.h
@@ -176,6 +176,7 @@
/* IRTA_REG */
#define VTD_IRTA_ADDR_MASK (VTD_HAW_MASK ^ 0xfffULL)
+#define VTD_IRTA_EIME (1ULL << 11)
#define VTD_IRTA_SIZE_MASK (0xfULL)
/* ECAP_REG */
@@ -184,6 +185,7 @@
#define VTD_ECAP_QI (1ULL << 1)
/* Interrupt Remapping support */
#define VTD_ECAP_IR (1ULL << 3)
+#define VTD_ECAP_EIM (1ULL << 4)
/* CAP_REG */
/* (offset >> 4) << 24 */
diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h
index e048ced..745b4e7 100644
--- a/include/hw/i386/intel_iommu.h
+++ b/include/hw/i386/intel_iommu.h
@@ -271,6 +271,7 @@ struct IntelIOMMUState {
bool intr_enabled; /* Whether guest enabled IR */
dma_addr_t intr_root; /* Interrupt remapping table pointer */
uint32_t intr_size; /* Number of IR table entries */
+ bool intr_eime; /* Extended interrupt mode enabled */
};
/* Find the VTD Address space associated with the given bus pointer,
diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index d9e3bf2..aa7fb9b 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -916,6 +916,7 @@ static void vtd_interrupt_remap_table_setup(IntelIOMMUState
*s)
value = vtd_get_quad_raw(s, DMAR_IRTA_REG);
s->intr_size = 1UL << ((value & VTD_IRTA_SIZE_MASK) + 1);
s->intr_root = value & VTD_IRTA_ADDR_MASK;
+ s->intr_eime = value & VTD_IRTA_EIME;
/* Notify global invalidation */
vtd_iec_notify_all(s, true, 0, 0);
@@ -2058,11 +2059,13 @@ static int vtd_remap_irq_get(IntelIOMMUState *iommu,
uint16_t index, VTDIrq *irq
irq->trigger_mode = irte.trigger_mode;
irq->vector = irte.vector;
irq->delivery_mode = irte.delivery_mode;
- /* Not support EIM yet: please refer to vt-d 9.10 DST bits */
+ irq->dest = le32_to_cpu(irte.dest_id);
+ if (!iommu->intr_eime) {
#define VTD_IR_APIC_DEST_MASK (0xff00ULL)
#define VTD_IR_APIC_DEST_SHIFT (8)
- irq->dest = (le32_to_cpu(irte.dest_id) & VTD_IR_APIC_DEST_MASK) >> \
- VTD_IR_APIC_DEST_SHIFT;
+ irq->dest = (irq->dest & VTD_IR_APIC_DEST_MASK) >>
+ VTD_IR_APIC_DEST_SHIFT;
+ }
irq->dest_mode = irte.dest_mode;
irq->redir_hint = irte.redir_hint;
@@ -2312,7 +2315,7 @@ static void vtd_init(IntelIOMMUState *s)
s->ecap = VTD_ECAP_QI | VTD_ECAP_IRO;
if (x86_iommu->intr_supported) {
- s->ecap |= VTD_ECAP_IR;
+ s->ecap |= VTD_ECAP_IR | VTD_ECAP_EIM;
}
vtd_reset_context_cache(s);
@@ -2366,10 +2369,9 @@ static void vtd_init(IntelIOMMUState *s)
vtd_define_quad(s, DMAR_FRCD_REG_0_2, 0, 0, 0x8000000000000000ULL);
/*
- * Interrupt remapping registers, not support extended interrupt
- * mode for now.
+ * Interrupt remapping registers.
*/
- vtd_define_quad(s, DMAR_IRTA_REG, 0, 0xfffffffffffff00fULL, 0);
+ vtd_define_quad(s, DMAR_IRTA_REG, 0, 0xfffffffffffff80fULL, 0);
}
/* Should not reset address_spaces when reset because devices will still use
--
MST
- [Qemu-devel] [PULL v3 17/55] intel_iommu: define interrupt remap table addr register, (continued)
- [Qemu-devel] [PULL v3 17/55] intel_iommu: define interrupt remap table addr register, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 18/55] intel_iommu: handle interrupt remap enable, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 19/55] intel_iommu: define several structs for IOMMU IR, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 20/55] intel_iommu: add IR translation faults defines, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 21/55] intel_iommu: Add support for PCI MSI remap, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 22/55] q35: ioapic: add support for emulated IOAPIC IR, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 23/55] ioapic: introduce ioapic_entry_parse() helper, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 24/55] intel_iommu: add support for split irqchip, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 25/55] x86-iommu: introduce IEC notifiers, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 26/55] ioapic: register IOMMU IEC notifier for ioapic, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 27/55] intel_iommu: Add support for Extended Interrupt Mode,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v3 28/55] intel_iommu: add SID validation for IR, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 29/55] kvm-irqchip: simplify kvm_irqchip_add_msi_route, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 30/55] kvm-irqchip: i386: add hook for add/remove virq, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 31/55] kvm-irqchip: x86: add msi route notify fn, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 32/55] kvm-irqchip: do explicit commit when update irq, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 33/55] intel_iommu: support all masks in interrupt entry cache invalidation, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 34/55] kvm-all: add trace events for kvm irqchip ops, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 35/55] intel_iommu: disallow kernel-irqchip=on with IR, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 36/55] virtio: Add typedef for handle_output, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 37/55] virtio: Introduce virtio_add_queue_aio, Michael S. Tsirkin, 2016/07/20