[Xen-changelog] [xen-unstable] vt-d: fix Dom0 S3 resume.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1251967897 -3600
# Node ID 8f81bdd57afeff23145e96dc9758363b6990aed4
# Parent  372feb56b6daea5163edb9bda63627d6841dde81
vt-d: fix Dom0 S3 resume.

When resuming from Dom0 S3, here 'irq' is -1, so we can't use it at
all. We should always use iommu->irq.

With the patch applied on the current tip 20153 and using the 2.6.18
Dom0, Dom0 S3 works fine (at least on my DQ35).

Signed-off-by: Dexuan Cui <dexuan.cui@xxxxxxxxx>
---
 xen/drivers/passthrough/vtd/iommu.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff -r 372feb56b6da -r 8f81bdd57afe xen/drivers/passthrough/vtd/iommu.c
--- a/xen/drivers/passthrough/vtd/iommu.c       Thu Sep 03 09:50:46 2009 +0100
+++ b/xen/drivers/passthrough/vtd/iommu.c       Thu Sep 03 09:51:37 2009 +0100
@@ -1602,7 +1602,7 @@ static int init_vtd_hw(void)
     struct acpi_drhd_unit *drhd;
     struct iommu *iommu;
     struct iommu_flush *flush = NULL;
-    int irq = -1;
+    int irq;
     int ret;
     unsigned long flags;
     struct irq_cfg *cfg;
@@ -1621,8 +1621,8 @@ static int init_vtd_hw(void)
             iommu->irq = irq;
         }
 
-        cfg = irq_cfg(irq);
-        dma_msi_set_affinity(irq, cfg->domain);
+        cfg = irq_cfg(iommu->irq);
+        dma_msi_set_affinity(iommu->irq, cfg->domain);
 
         clear_fault_bits(iommu);
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog