[Xen-changelog] [xen-unstable] Remove vtd_hw_check().

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1217499263 -3600
# Node ID 05391ca07588c45f5c8dd16c2a470b0d615767b8
# Parent  482c16b55c28cd8dfc7b6dc93d0987f0b7bed42d
Remove vtd_hw_check().

Since we have separate VT-d page tables, actually we don't need the
checking.

Signed-off-by: Dexuan Cui <dexuan.cui@xxxxxxxxx>
---
 xen/drivers/passthrough/vtd/dmar.c  |    3 ---
 xen/drivers/passthrough/vtd/utils.c |   30 ------------------------------
 2 files changed, 33 deletions(-)

diff -r 482c16b55c28 -r 05391ca07588 xen/drivers/passthrough/vtd/dmar.c
--- a/xen/drivers/passthrough/vtd/dmar.c        Thu Jul 31 11:13:30 2008 +0100
+++ b/xen/drivers/passthrough/vtd/dmar.c        Thu Jul 31 11:14:23 2008 +0100
@@ -483,9 +483,6 @@ int acpi_dmar_init(void)
     if ( !iommu_enabled )
         goto fail;
 
-    if ( (rc = vtd_hw_check()) != 0 )
-        goto fail;
-
     acpi_table_parse(ACPI_SIG_DMAR, acpi_parse_dmar);
 
     rc = -ENODEV;
diff -r 482c16b55c28 -r 05391ca07588 xen/drivers/passthrough/vtd/utils.c
--- a/xen/drivers/passthrough/vtd/utils.c       Thu Jul 31 11:13:30 2008 +0100
+++ b/xen/drivers/passthrough/vtd/utils.c       Thu Jul 31 11:14:23 2008 +0100
@@ -29,41 +29,11 @@
 #include "vtd.h"
 #include "extern.h"
 
-#define INTEL   0x8086
-#define SEABURG 0x4000
-#define C_STEP  2
-
 int is_usb_device(u8 bus, u8 devfn)
 {
     u16 class = pci_conf_read16(bus, PCI_SLOT(devfn), PCI_FUNC(devfn),
                                 PCI_CLASS_DEVICE);
     return (class == 0xc03);
-}
-
-int vtd_hw_check(void)
-{
-    u16 vendor, device;
-    u8 revision, stepping;
-
-    vendor   = pci_conf_read16(0, 0, 0, PCI_VENDOR_ID);
-    device   = pci_conf_read16(0, 0, 0, PCI_DEVICE_ID);
-    revision = pci_conf_read8(0, 0, 0, PCI_REVISION_ID);
-    stepping = revision & 0xf;
-
-    if ( (vendor == INTEL) && (device == SEABURG) )
-    {
-        if ( stepping < C_STEP )
-        {
-            dprintk(XENLOG_WARNING VTDPREFIX,
-                    "*** VT-d disabled - pre C0-step Seaburg found\n");
-            dprintk(XENLOG_WARNING VTDPREFIX,
-                    "***  vendor = %x device = %x revision = %x\n",
-                    vendor, device, revision);
-            return -ENODEV;
-        }
-    }
-
-    return 0;
 }
 
 /* Disable vt-d protected memory registers. */

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