diff options
| author | Jan Beulich <jbeulich@suse.com> | 2012-09-10 09:45:30 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2012-09-10 09:45:30 +0200 |
| commit | d32a40244c1f7084a0fa1970001874b9474bfc31 (patch) | |
| tree | 1a68782fe59eb634cacdcb7bbf229d7759ffc546 | |
| parent | 79e6ef8c0cf1dd0820c950bb653985a8beb04203 (diff) | |
| download | xen-d32a40244c1f7084a0fa1970001874b9474bfc31.tar.gz xen-d32a40244c1f7084a0fa1970001874b9474bfc31.tar.bz2 xen-d32a40244c1f7084a0fa1970001874b9474bfc31.zip | |
VT-d: split .ack and .disable DMA-MSI actors
Calling irq_complete_move() from .disable is wrong, breaking S3 resume.
Comparing with all other .ack actors, it was also missing a call to
move_{native,masked}_irq(). As the actor is masking its interrupt
anyway (albeit it's not immediately obvious why), the latter is the
better choice.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
Acked-by Xiantao Zhang <xiantao.zhang@intel.com>
| -rw-r--r-- | xen/drivers/passthrough/vtd/iommu.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index fb8e6296f8..e4f464a0d5 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1040,8 +1040,6 @@ static void dma_msi_mask(struct irq_desc *desc) unsigned long flags; struct iommu *iommu = desc->action->dev_id; - irq_complete_move(desc); - /* mask it */ spin_lock_irqsave(&iommu->register_lock, flags); dmar_writel(iommu->reg, DMAR_FECTL_REG, DMA_FECTL_IM); @@ -1054,6 +1052,13 @@ static unsigned int dma_msi_startup(struct irq_desc *desc) return 0; } +static void dma_msi_ack(struct irq_desc *desc) +{ + irq_complete_move(desc); + dma_msi_mask(desc); + move_masked_irq(desc); +} + static void dma_msi_end(struct irq_desc *desc, u8 vector) { dma_msi_unmask(desc); @@ -1115,7 +1120,7 @@ static hw_irq_controller dma_msi_type = { .shutdown = dma_msi_mask, .enable = dma_msi_unmask, .disable = dma_msi_mask, - .ack = dma_msi_mask, + .ack = dma_msi_ack, .end = dma_msi_end, .set_affinity = dma_msi_set_affinity, }; |