[Xen-changelog] [xen-unstable] Enable IOMMU by default.

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1263915894 0
# Node ID 07f95839e4313e3b59a4c9e1ea67b0643a096376
# Parent  89907dab1aefaabb2928b392d65a7880306bf394
Enable IOMMU by default.

Can be disabled with 'iommu=0' boot parameter.

Note that iommu_inclusive_mapping is now also enabled by default, to
deal with systems with broken BIOS tables specifying bad RMRRs. Old
behaviour can be specified via 'iommu_inclusive_mapping=0'.

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/drivers/passthrough/iommu.c       |   15 ++++-----------
 xen/drivers/passthrough/vtd/x86/vtd.c |    2 +-
 2 files changed, 5 insertions(+), 12 deletions(-)

diff -r 89907dab1aef -r 07f95839e431 xen/drivers/passthrough/iommu.c
--- a/xen/drivers/passthrough/iommu.c   Tue Jan 19 10:56:59 2010 +0000
+++ b/xen/drivers/passthrough/iommu.c   Tue Jan 19 15:44:54 2010 +0000
@@ -37,26 +37,19 @@ static int iommu_populate_page_table(str
  *   no-intremap                Disable VT-d Interrupt Remapping
  */
 custom_param("iommu", parse_iommu_param);
-int iommu_enabled;
+int iommu_enabled = 1;
 int iommu_pv_enabled;
 int force_iommu;
 int iommu_passthrough;
-int iommu_snoop;
-int iommu_qinval;
-int iommu_intremap;
+int iommu_snoop = 1;
+int iommu_qinval = 1;
+int iommu_intremap = 1;
 int amd_iommu_debug;
 int amd_iommu_perdev_intremap;
 
 static void __init parse_iommu_param(char *s)
 {
     char *ss;
-
-    iommu_enabled = 1;
-    iommu_snoop = 1;
-    iommu_qinval = 1;
-    iommu_intremap = 1;
-    amd_iommu_debug = 0;
-    amd_iommu_perdev_intremap = 0;
 
     do {
         ss = strchr(s, ',');
diff -r 89907dab1aef -r 07f95839e431 xen/drivers/passthrough/vtd/x86/vtd.c
--- a/xen/drivers/passthrough/vtd/x86/vtd.c     Tue Jan 19 10:56:59 2010 +0000
+++ b/xen/drivers/passthrough/vtd/x86/vtd.c     Tue Jan 19 15:44:54 2010 +0000
@@ -31,7 +31,7 @@
  * iommu_inclusive_mapping: when set, all memory below 4GB is included in dom0
  * 1:1 iommu mappings except xen and unusable regions.
  */
-static int iommu_inclusive_mapping;
+static int iommu_inclusive_mapping = 1;
 boolean_param("iommu_inclusive_mapping", iommu_inclusive_mapping);
 
 void *map_vtd_domain_page(u64 maddr)

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