All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Peter Xu <peterx@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>,
	Richard Henderson <rth@twiddle.net>,
	Eduardo Habkost <ehabkost@redhat.com>
Subject: [Qemu-devel] [PULL v5 17/57] intel_iommu: define interrupt remap table addr register
Date: Thu, 21 Jul 2016 20:52:19 +0300	[thread overview]
Message-ID: <1469123413-20809-18-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1469123413-20809-1-git-send-email-mst@redhat.com>

From: Peter Xu <peterx@redhat.com>

Defined Interrupt Remap Table Address register to store IR table
pointer. Also, do proper handling on global command register writes to
store table pointer and its size.

One more debug flag "DEBUG_IR" is added for interrupt remapping.

Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/i386/intel_iommu_internal.h |  4 ++++
 include/hw/i386/intel_iommu.h  |  5 ++++
 hw/i386/intel_iommu.c          | 52 +++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/hw/i386/intel_iommu_internal.h b/hw/i386/intel_iommu_internal.h
index 5b98a11..309833f 100644
--- a/hw/i386/intel_iommu_internal.h
+++ b/hw/i386/intel_iommu_internal.h
@@ -172,6 +172,10 @@
 #define VTD_RTADDR_RTT              (1ULL << 11)
 #define VTD_RTADDR_ADDR_MASK        (VTD_HAW_MASK ^ 0xfffULL)
 
+/* IRTA_REG */
+#define VTD_IRTA_ADDR_MASK          (VTD_HAW_MASK ^ 0xfffULL)
+#define VTD_IRTA_SIZE_MASK          (0xfULL)
+
 /* ECAP_REG */
 /* (offset >> 4) << 8 */
 #define VTD_ECAP_IRO                (DMAR_IOTLB_REG_OFFSET << 4)
diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h
index 741242e..ce515c4 100644
--- a/include/hw/i386/intel_iommu.h
+++ b/include/hw/i386/intel_iommu.h
@@ -125,6 +125,11 @@ struct IntelIOMMUState {
     MemoryRegionIOMMUOps iommu_ops;
     GHashTable *vtd_as_by_busptr;   /* VTDBus objects indexed by PCIBus* reference */
     VTDBus *vtd_as_by_bus_num[VTD_PCI_BUS_MAX]; /* VTDBus objects indexed by bus number */
+
+    /* interrupt remapping */
+    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 */
 };
 
 /* 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 9c7a084..bf74533 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -33,7 +33,7 @@
 #ifdef DEBUG_INTEL_IOMMU
 enum {
     DEBUG_GENERAL, DEBUG_CSR, DEBUG_INV, DEBUG_MMU, DEBUG_FLOG,
-    DEBUG_CACHE,
+    DEBUG_CACHE, DEBUG_IR,
 };
 #define VTD_DBGBIT(x)   (1 << DEBUG_##x)
 static int vtd_dbgflags = VTD_DBGBIT(GENERAL) | VTD_DBGBIT(CSR);
@@ -903,6 +903,19 @@ static void vtd_root_table_setup(IntelIOMMUState *s)
                 (s->root_extended ? "(extended)" : ""));
 }
 
+static void vtd_interrupt_remap_table_setup(IntelIOMMUState *s)
+{
+    uint64_t value = 0;
+    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;
+
+    /* TODO: invalidate interrupt entry cache */
+
+    VTD_DPRINTF(CSR, "int remap table addr 0x%"PRIx64 " size %"PRIu32,
+                s->intr_root, s->intr_size);
+}
+
 static void vtd_context_global_invalidate(IntelIOMMUState *s)
 {
     s->context_cache_gen++;
@@ -1141,6 +1154,16 @@ static void vtd_handle_gcmd_srtp(IntelIOMMUState *s)
     vtd_set_clear_mask_long(s, DMAR_GSTS_REG, 0, VTD_GSTS_RTPS);
 }
 
+/* Set Interrupt Remap Table Pointer */
+static void vtd_handle_gcmd_sirtp(IntelIOMMUState *s)
+{
+    VTD_DPRINTF(CSR, "set Interrupt Remap Table Pointer");
+
+    vtd_interrupt_remap_table_setup(s);
+    /* Ok - report back to driver */
+    vtd_set_clear_mask_long(s, DMAR_GSTS_REG, 0, VTD_GSTS_IRTPS);
+}
+
 /* Handle Translation Enable/Disable */
 static void vtd_handle_gcmd_te(IntelIOMMUState *s, bool en)
 {
@@ -1180,6 +1203,10 @@ static void vtd_handle_gcmd_write(IntelIOMMUState *s)
         /* Queued Invalidation Enable */
         vtd_handle_gcmd_qie(s, val & VTD_GCMD_QIE);
     }
+    if (val & VTD_GCMD_SIRTP) {
+        /* Set/update the interrupt remapping root-table pointer */
+        vtd_handle_gcmd_sirtp(s);
+    }
 }
 
 /* Handle write to Context Command Register */
@@ -1841,6 +1868,23 @@ static void vtd_mem_write(void *opaque, hwaddr addr,
         vtd_update_fsts_ppf(s);
         break;
 
+    case DMAR_IRTA_REG:
+        VTD_DPRINTF(IR, "DMAR_IRTA_REG write addr 0x%"PRIx64
+                    ", size %d, val 0x%"PRIx64, addr, size, val);
+        if (size == 4) {
+            vtd_set_long(s, addr, val);
+        } else {
+            vtd_set_quad(s, addr, val);
+        }
+        break;
+
+    case DMAR_IRTA_REG_HI:
+        VTD_DPRINTF(IR, "DMAR_IRTA_REG_HI write addr 0x%"PRIx64
+                    ", size %d, val 0x%"PRIx64, addr, size, val);
+        assert(size == 4);
+        vtd_set_long(s, addr, val);
+        break;
+
     default:
         VTD_DPRINTF(GENERAL, "error: unhandled reg write addr 0x%"PRIx64
                     ", size %d, val 0x%"PRIx64, addr, size, val);
@@ -2032,6 +2076,12 @@ static void vtd_init(IntelIOMMUState *s)
     /* Fault Recording Registers, 128-bit */
     vtd_define_quad(s, DMAR_FRCD_REG_0_0, 0, 0, 0);
     vtd_define_quad(s, DMAR_FRCD_REG_0_2, 0, 0, 0x8000000000000000ULL);
+
+    /*
+     * Interrupt remapping registers, not support extended interrupt
+     * mode for now.
+     */
+    vtd_define_quad(s, DMAR_IRTA_REG, 0, 0xfffffffffffff00fULL, 0);
 }
 
 /* Should not reset address_spaces when reset because devices will still use
-- 
MST

  parent reply	other threads:[~2016-07-21 17:52 UTC|newest]

Thread overview: 82+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-21 17:50 [Qemu-devel] [PULL v5 00/57] pc, pci, virtio: new features, cleanups, fixes Michael S. Tsirkin
2016-07-21 17:50 ` [Qemu-devel] [PULL v5 01/57] nvdimm: fix memory leak in error code path Michael S. Tsirkin
2016-07-21 17:51 ` [Qemu-devel] [PULL v5 02/57] tests/prom-env-test: increase the test timeout Michael S. Tsirkin
2016-07-21 17:51 ` [Qemu-devel] [PULL v5 03/57] hw/alpha: fix PCI bus initialization Michael S. Tsirkin
2016-07-21 17:51 ` [Qemu-devel] [PULL v5 04/57] hw/mips: " Michael S. Tsirkin
2016-07-21 17:51 ` [Qemu-devel] [PULL v5 05/57] hw/apb: " Michael S. Tsirkin
2016-07-21 17:51 ` [Qemu-devel] [PULL v5 06/57] hw/grackle: " Michael S. Tsirkin
2016-07-21 17:51 ` [Qemu-devel] [PULL v5 07/57] hw/prep: realize the PCI root bus as part of the prep init Michael S. Tsirkin
2016-07-21 17:51 ` [Qemu-devel] [PULL v5 08/57] hw/versatile: realize the PCI root bus as part of the versatile init Michael S. Tsirkin
2016-07-21 17:51 ` [Qemu-devel] [PULL v5 09/57] x86-iommu: introduce parent class Michael S. Tsirkin
2016-07-21 17:51 ` [Qemu-devel] [PULL v5 10/57] intel_iommu: rename VTD_PCI_DEVFN_MAX to x86-iommu Michael S. Tsirkin
2016-07-21 17:51 ` [Qemu-devel] [PULL v5 11/57] x86-iommu: provide x86_iommu_get_default Michael S. Tsirkin
2016-07-21 17:51 ` [Qemu-devel] [PULL v5 12/57] x86-iommu: introduce "intremap" property Michael S. Tsirkin
2016-07-21 17:51 ` [Qemu-devel] [PULL v5 13/57] acpi: enable INTR for DMAR report structure Michael S. Tsirkin
2016-07-21 17:52 ` [Qemu-devel] [PULL v5 14/57] intel_iommu: allow queued invalidation for IR Michael S. Tsirkin
2016-07-21 17:52 ` [Qemu-devel] [PULL v5 15/57] intel_iommu: set IR bit for ECAP register Michael S. Tsirkin
2016-07-21 17:52 ` [Qemu-devel] [PULL v5 16/57] acpi: add DMAR scope definition for root IOAPIC Michael S. Tsirkin
2016-07-21 17:52 ` Michael S. Tsirkin [this message]
2016-07-21 17:52 ` [Qemu-devel] [PULL v5 18/57] intel_iommu: handle interrupt remap enable Michael S. Tsirkin
2016-07-21 17:52 ` [Qemu-devel] [PULL v5 19/57] intel_iommu: define several structs for IOMMU IR Michael S. Tsirkin
2016-07-21 17:52 ` [Qemu-devel] [PULL v5 20/57] intel_iommu: add IR translation faults defines Michael S. Tsirkin
2016-07-21 17:52 ` [Qemu-devel] [PULL v5 21/57] intel_iommu: Add support for PCI MSI remap Michael S. Tsirkin
2016-07-21 17:52 ` [Qemu-devel] [PULL v5 22/57] intel_iommu: get rid of {0} initializers Michael S. Tsirkin
2016-07-21 17:52 ` [Qemu-devel] [PULL v5 23/57] q35: ioapic: add support for emulated IOAPIC IR Michael S. Tsirkin
2016-07-21 17:52 ` [Qemu-devel] [PULL v5 24/57] ioapic: introduce ioapic_entry_parse() helper Michael S. Tsirkin
2016-07-21 17:53 ` [PULL v5 25/57] intel_iommu: add support for split irqchip Michael S. Tsirkin
2016-07-21 17:53   ` [Qemu-devel] " Michael S. Tsirkin
2016-07-21 17:53 ` [Qemu-devel] [PULL v5 26/57] x86-iommu: introduce IEC notifiers Michael S. Tsirkin
2016-07-30  7:52   ` Jan Kiszka
2016-07-31  3:59     ` Peter Xu
2016-07-31 12:01       ` Jan Kiszka
2016-07-31 12:51         ` Peter Xu
2016-07-21 17:53 ` [Qemu-devel] [PULL v5 27/57] ioapic: register IOMMU IEC notifier for ioapic Michael S. Tsirkin
2016-07-21 17:53 ` [Qemu-devel] [PULL v5 28/57] intel_iommu: Add support for Extended Interrupt Mode Michael S. Tsirkin
2016-07-21 17:53 ` [Qemu-devel] [PULL v5 29/57] intel_iommu: add SID validation for IR Michael S. Tsirkin
2016-08-01 16:39   ` Jan Kiszka
2016-08-02  8:36     ` Peter Xu
2016-08-02  8:46       ` Jan Kiszka
     [not found]         ` <CABdVeADOKgSCJoFDSDufQxDa9PmiFyiEx=FtS043vyJsZXM3sA@mail.gmail.com>
2016-08-02  8:59           ` Jan Kiszka
2016-08-02 10:28         ` Peter Xu
2016-08-02 11:58           ` David Kiarie
2016-08-02 12:12             ` Peter Xu
2016-08-02 12:17               ` David Kiarie
2016-08-02 12:28                 ` Jan Kiszka
2016-08-08  9:06                 ` Peter Xu
2016-08-08  9:44                   ` David Kiarie
2016-08-02 12:16             ` Jan Kiszka
2016-08-02 12:18               ` David Kiarie
2016-07-21 17:53 ` [PULL v5 30/57] kvm-irqchip: simplify kvm_irqchip_add_msi_route Michael S. Tsirkin
2016-07-21 17:53   ` [Qemu-devel] " Michael S. Tsirkin
2016-07-21 17:53 ` [PULL v5 31/57] kvm-irqchip: i386: add hook for add/remove virq Michael S. Tsirkin
2016-07-21 17:53   ` [Qemu-devel] " Michael S. Tsirkin
2016-07-21 17:53 ` [PULL v5 32/57] kvm-irqchip: x86: add msi route notify fn Michael S. Tsirkin
2016-07-21 17:53   ` [Qemu-devel] " Michael S. Tsirkin
2016-07-21 17:53 ` [PULL v5 33/57] kvm-irqchip: do explicit commit when update irq Michael S. Tsirkin
2016-07-21 17:53   ` [Qemu-devel] " Michael S. Tsirkin
2016-07-21 17:53 ` [Qemu-devel] [PULL v5 34/57] intel_iommu: support all masks in interrupt entry cache invalidation Michael S. Tsirkin
2016-07-21 17:53 ` [PULL v5 35/57] kvm-all: add trace events for kvm irqchip ops Michael S. Tsirkin
2016-07-21 17:53   ` [Qemu-devel] " Michael S. Tsirkin
2016-07-21 17:54 ` [Qemu-devel] [PULL v5 36/57] intel_iommu: disallow kernel-irqchip=on with IR Michael S. Tsirkin
2016-07-21 17:54 ` [Qemu-devel] [PULL v5 37/57] virtio: Add typedef for handle_output Michael S. Tsirkin
2016-07-21 17:54 ` [Qemu-devel] [PULL v5 38/57] virtio: Introduce virtio_add_queue_aio Michael S. Tsirkin
2016-07-21 17:54 ` [Qemu-devel] [PULL v5 39/57] virtio-blk: Call virtio_add_queue_aio Michael S. Tsirkin
2016-07-21 17:54 ` [Qemu-devel] [PULL v5 40/57] virtio-scsi: " Michael S. Tsirkin
2016-07-21 17:54 ` [Qemu-devel] [PULL v5 41/57] Revert "mirror: Workaround for unexpected iohandler events during completion" Michael S. Tsirkin
2016-07-21 17:54 ` [Qemu-devel] [PULL v5 42/57] virtio-scsi: Replace HandleOutput typedef Michael S. Tsirkin
2016-07-21 17:54 ` [Qemu-devel] [PULL v5 43/57] virtio-net: Remove old migration version support Michael S. Tsirkin
2016-07-21 17:54 ` [Qemu-devel] [PULL v5 44/57] virtio-serial: " Michael S. Tsirkin
2016-07-21 17:54 ` [Qemu-devel] [PULL v5 45/57] virtio: Migration helper function and macro Michael S. Tsirkin
2016-07-21 17:54 ` [Qemu-devel] [PULL v5 46/57] virtio-scsi: Wrap in vmstate Michael S. Tsirkin
2016-07-21 17:54 ` [Qemu-devel] [PULL v5 47/57] virtio-blk: " Michael S. Tsirkin
2016-07-21 17:55 ` [Qemu-devel] [PULL v5 48/57] virtio-rng: " Michael S. Tsirkin
2016-07-21 17:55 ` [Qemu-devel] [PULL v5 49/57] virtio-balloon: " Michael S. Tsirkin
2016-07-21 17:55 ` [Qemu-devel] [PULL v5 50/57] virtio-net: " Michael S. Tsirkin
2016-07-21 17:55 ` [Qemu-devel] [PULL v5 51/57] virtio-serial: " Michael S. Tsirkin
2016-07-21 17:55 ` [Qemu-devel] [PULL v5 52/57] 9pfs: " Michael S. Tsirkin
2016-07-21 17:55 ` [Qemu-devel] [PULL v5 53/57] virtio-input: " Michael S. Tsirkin
2016-07-21 17:55 ` [Qemu-devel] [PULL v5 54/57] virtio-gpu: Use migrate_add_blocker for virgl migration blocking Michael S. Tsirkin
2016-07-21 17:55 ` [Qemu-devel] [PULL v5 55/57] virtio-gpu: Wrap in vmstate Michael S. Tsirkin
2016-07-21 17:55 ` [Qemu-devel] [PULL v5 56/57] virtio: Update migration docs Michael S. Tsirkin
2016-07-21 17:55 ` [Qemu-devel] [PULL v5 57/57] intel_iommu: avoid unnamed fields Michael S. Tsirkin
2016-07-21 19:54 ` [Qemu-devel] [PULL v5 00/57] pc, pci, virtio: new features, cleanups, fixes Peter Maydell

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=1469123413-20809-18-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=peterx@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=rth@twiddle.net \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.