vt-d: Disable PMR on every vt-d engine.

Signed-off-by Gang Wei (Jimmy) <gang.wei@intel.com>
Signed-off-by Kevin Tian <kevin.tian@intel.com>

diff --git a/xen/arch/x86/hvm/vmx/vtd/intel-iommu.c b/xen/arch/x86/hvm/vmx/vtd/intel-iommu.c
index a6676a439f4be78b1f76e948c75c138cb061f480..ae9a9f26dbbbb58998240e0360a345213b993237 100644 (file)
--- a/xen/arch/x86/hvm/vmx/vtd/intel-iommu.c
+++ b/xen/arch/x86/hvm/vmx/vtd/intel-iommu.c
@@ -688,6 +688,9 @@ static int iommu_enable_translation(struct iommu *iommu)
             break;
         cpu_relax();
     }
+
+    /* Disable PMRs when VT-d engine takes effect per spec definition */
+    disable_pmr(iommu);
     spin_unlock_irqrestore(&iommu->register_lock, flags);
     return 0;
 }
@@ -1767,7 +1770,7 @@ int iommu_setup(void)
     struct hvm_iommu *hd  = domain_hvm_iommu(dom0);
     struct acpi_drhd_unit *drhd;
     struct iommu *iommu;
-    unsigned long i, status;
+    unsigned long i;
 
     if ( !vtd_enabled )
         return 0;
@@ -1797,10 +1800,6 @@ int iommu_setup(void)
     if ( enable_vtd_translation() )
         goto error;
 
-    status = dmar_readl(iommu->reg, DMAR_PMEN_REG);
-    if (status & DMA_PMEN_PRS)
-        disable_pmr(iommu);
-
     return 0;
 
  error:

diff --git a/xen/arch/x86/hvm/vmx/vtd/utils.c b/xen/arch/x86/hvm/vmx/vtd/utils.c
index 66b3ce18c8861943dcdf943854a1f091607d8914..1ef25d4e989c5aa7cbd0ecfd10a2705428bdca42 100644 (file)
--- a/xen/arch/x86/hvm/vmx/vtd/utils.c
+++ b/xen/arch/x86/hvm/vmx/vtd/utils.c
@@ -67,25 +67,30 @@ int vtd_hw_check(void)
 /* Disable vt-d protected memory registers. */
 void disable_pmr(struct iommu *iommu)
 {
-    unsigned long start_time, status;
+    unsigned long start_time;
     unsigned int val;
 
     val = dmar_readl(iommu->reg, DMAR_PMEN_REG);
+    if ( !(val & DMA_PMEN_PRS) )
+        return;
+
     dmar_writel(iommu->reg, DMAR_PMEN_REG, val & ~DMA_PMEN_EPM);
     start_time = jiffies;
 
     for ( ; ; )
     {
-        status = dmar_readl(iommu->reg, DMAR_PMEN_REG);
-        if ( (status & DMA_PMEN_PRS) == 0 )
+        val = dmar_readl(iommu->reg, DMAR_PMEN_REG);
+        if ( (val & DMA_PMEN_PRS) == 0 )
             break;
+
         if ( time_after(jiffies, start_time + DMAR_OPERATION_TIMEOUT) )
-            panic("Cannot set QIE field for queue invalidation\n");
+            panic("Disable PMRs timeout\n");
+
         cpu_relax();
     }
 
     dprintk(XENLOG_INFO VTDPREFIX,
-            "disabled protected memory registers\n");
+            "Disabled protected memory registers\n");
 }
 
 #if defined(__x86_64__)