aboutsummaryrefslogtreecommitdiffstats
path: root/xen
diff options
context:
space:
mode:
authorDario Faggioli <dario.faggioli@citrix.com>2012-01-20 10:20:32 +0000
committerDario Faggioli <dario.faggioli@citrix.com>2012-01-20 10:20:32 +0000
commit403d341a190f18210f32057059e4c0685b9c423d (patch)
tree4e9d907524ef20f892bf58177f81ec9a004b8bd5 /xen
parent696f3581a2272cdab7c0ca1f3bedade4934ecc76 (diff)
downloadxen-403d341a190f18210f32057059e4c0685b9c423d.tar.gz
xen-403d341a190f18210f32057059e4c0685b9c423d.tar.bz2
xen-403d341a190f18210f32057059e4c0685b9c423d.zip
iommu: Move IOMMU faults handling into softirq for AMD-Vi.
Dealing with interrupts from AMD-Vi IOMMU(s) is deferred to a softirq-tasklet, raised by the actual IRQ handler. To avoid more interrupts being generated (because of further faults), they must be masked in the IOMMU within the low level IRQ handler and enabled back in the tasklet body. Notice that this may cause the log to overflow, but none of the existing entry will be overwritten. Signed-off-by: Dario Faggioli <dario.faggioli@citrix.com> Committed-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen')
-rw-r--r--xen/drivers/passthrough/amd/iommu_init.c44
1 files changed, 41 insertions, 3 deletions
diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c
index 024dac9721..5a98cb83a8 100644
--- a/xen/drivers/passthrough/amd/iommu_init.c
+++ b/xen/drivers/passthrough/amd/iommu_init.c
@@ -32,6 +32,8 @@
static int __initdata nr_amd_iommus;
+static struct tasklet amd_iommu_irq_tasklet;
+
unsigned short ivrs_bdf_entries;
static struct radix_tree_root ivrs_maps;
struct list_head amd_iommu_head;
@@ -689,14 +691,48 @@ static void iommu_check_ppr_log(struct amd_iommu *iommu)
spin_unlock_irqrestore(&iommu->lock, flags);
}
+static void do_amd_iommu_irq(unsigned long data)
+{
+ struct amd_iommu *iommu;
+
+ if ( !iommu_found() )
+ {
+ AMD_IOMMU_DEBUG("no device found, something must be very wrong!\n");
+ return;
+ }
+
+ /*
+ * No matter from where the interrupt came from, check all the
+ * IOMMUs present in the system. This allows for having just one
+ * tasklet (instead of one per each IOMMUs).
+ */
+ for_each_amd_iommu ( iommu ) {
+ iommu_check_event_log(iommu);
+
+ if ( iommu->ppr_log.buffer != NULL )
+ iommu_check_ppr_log(iommu);
+ }
+}
+
static void iommu_interrupt_handler(int irq, void *dev_id,
struct cpu_user_regs *regs)
{
+ u32 entry;
+ unsigned long flags;
struct amd_iommu *iommu = dev_id;
- iommu_check_event_log(iommu);
- if ( iommu->ppr_log.buffer != NULL )
- iommu_check_ppr_log(iommu);
+ spin_lock_irqsave(&iommu->lock, flags);
+
+ /* Silence interrupts from both event and PPR logging */
+ entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET);
+ iommu_clear_bit(&entry, IOMMU_STATUS_EVENT_LOG_INT_SHIFT);
+ iommu_clear_bit(&entry, IOMMU_STATUS_PPR_LOG_INT_SHIFT);
+ writel(entry, iommu->mmio_base+IOMMU_STATUS_MMIO_OFFSET);
+
+ spin_unlock_irqrestore(&iommu->lock, flags);
+
+ /* It is the tasklet that will clear the logs and re-enable interrupts */
+ tasklet_schedule(&amd_iommu_irq_tasklet);
}
static int __init set_iommu_interrupt_handler(struct amd_iommu *iommu)
@@ -876,6 +912,8 @@ static int __init amd_iommu_init_one(struct amd_iommu *iommu)
printk("AMD-Vi: IOMMU %d Enabled.\n", nr_amd_iommus );
nr_amd_iommus++;
+ softirq_tasklet_init(&amd_iommu_irq_tasklet, do_amd_iommu_irq, 0);
+
return 0;
error_out: