# HG changeset patch
# User Tim Deegan <tim@xxxxxxx>
# Date 1314092605 -3600
# Node ID 9d2a8912597dba29e57a3e4db0a98f1f6c73168d
# Parent c7702b73f3823512864a39380799bf643f0312bf
IOMMU: only try to share IOMMU and HAP tables for domains with P2M.
This makes the check more precise, and brings VTd in line with AMD code.

Signed-off-by: Tim Deegan <tim@xxxxxxx>
xen-unstable changeset:   23788:9d2a8912597d
xen-unstable date:        Tue Aug 23 10:43:25 2011 +0100

diff -r c7702b73f382 xen/drivers/passthrough/iommu.c
--- a/xen/drivers/passthrough/iommu.c	Wed Aug 24 09:34:54 2011 +0100
+++ b/xen/drivers/passthrough/iommu.c	Thu Aug 25 10:34:16 2011 +0100
@@ -175,7 +175,7 @@ int assign_device(struct domain *d, u8 b
     if ( has_arch_pdevs(d) && !need_iommu(d) )
     {
         d->need_iommu = 1;
-        if ( !iommu_hap_pt_share )
+        if ( !iommu_use_hap_pt(d) )
             rc = iommu_populate_page_table(d);
         goto done;
     }
diff -r c7702b73f382 xen/drivers/passthrough/vtd/iommu.c
--- a/xen/drivers/passthrough/vtd/iommu.c	Wed Aug 24 09:34:54 2011 +0100
+++ b/xen/drivers/passthrough/vtd/iommu.c	Thu Aug 25 10:34:16 2011 +0100
@@ -1622,7 +1622,7 @@ void iommu_domain_teardown(struct domain
     if ( list_empty(&acpi_drhd_units) )
         return;
 
-    if ( iommu_hap_pt_share )
+    if ( iommu_use_hap_pt(d) )
         return;
 
     spin_lock(&hd->mapping_lock);
@@ -1644,7 +1644,7 @@ static int intel_iommu_map_page(
     int iommu_domid;
 
     /* Do nothing if VT-d shares EPT page table */
-    if ( iommu_hap_pt_share )
+    if ( iommu_use_hap_pt(d) )
         return 0;
 
     /* do nothing if dom0 and iommu supports pass thru */
@@ -1769,7 +1769,7 @@ void iommu_set_pgd(struct domain *d)
 
     ASSERT( is_hvm_domain(d) && d->arch.hvm_domain.hap_enabled );
 
-    if ( !iommu_hap_pt_share )
+    if ( !iommu_use_hap_pt(d) )
         return;
 
     pgd_mfn = pagetable_get_mfn(p2m_get_pagetable(p2m_get_hostp2m(d)));
diff -r c7702b73f382 xen/include/xen/iommu.h
--- a/xen/include/xen/iommu.h	Wed Aug 24 09:34:54 2011 +0100
+++ b/xen/include/xen/iommu.h	Thu Aug 25 10:34:16 2011 +0100
@@ -34,6 +34,9 @@ extern bool_t iommu_hap_pt_share;
 extern bool_t amd_iommu_debug;
 extern bool_t amd_iommu_perdev_intremap;
 
+/* Does this domain have a P2M table we can use as its IOMMU pagetable? */
+#define iommu_use_hap_pt(d) (paging_mode_hap(d) && iommu_hap_pt_share)
+
 extern struct rangeset *mmio_ro_ranges;
 
 #define domain_hvm_iommu(d)     (&d->arch.hvm_domain.hvm_iommu)