ia64/xen-unstable

changeset 18209:05391ca07588

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@intel.com>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Jul 31 11:14:23 2008 +0100 (2008-07-31)
parents 482c16b55c28
children 2ee49553a944
files xen/drivers/passthrough/vtd/dmar.c xen/drivers/passthrough/vtd/utils.c
line diff
     1.1 --- a/xen/drivers/passthrough/vtd/dmar.c	Thu Jul 31 11:13:30 2008 +0100
     1.2 +++ b/xen/drivers/passthrough/vtd/dmar.c	Thu Jul 31 11:14:23 2008 +0100
     1.3 @@ -483,9 +483,6 @@ int acpi_dmar_init(void)
     1.4      if ( !iommu_enabled )
     1.5          goto fail;
     1.6  
     1.7 -    if ( (rc = vtd_hw_check()) != 0 )
     1.8 -        goto fail;
     1.9 -
    1.10      acpi_table_parse(ACPI_SIG_DMAR, acpi_parse_dmar);
    1.11  
    1.12      rc = -ENODEV;
     2.1 --- a/xen/drivers/passthrough/vtd/utils.c	Thu Jul 31 11:13:30 2008 +0100
     2.2 +++ b/xen/drivers/passthrough/vtd/utils.c	Thu Jul 31 11:14:23 2008 +0100
     2.3 @@ -29,10 +29,6 @@
     2.4  #include "vtd.h"
     2.5  #include "extern.h"
     2.6  
     2.7 -#define INTEL   0x8086
     2.8 -#define SEABURG 0x4000
     2.9 -#define C_STEP  2
    2.10 -
    2.11  int is_usb_device(u8 bus, u8 devfn)
    2.12  {
    2.13      u16 class = pci_conf_read16(bus, PCI_SLOT(devfn), PCI_FUNC(devfn),
    2.14 @@ -40,32 +36,6 @@ int is_usb_device(u8 bus, u8 devfn)
    2.15      return (class == 0xc03);
    2.16  }
    2.17  
    2.18 -int vtd_hw_check(void)
    2.19 -{
    2.20 -    u16 vendor, device;
    2.21 -    u8 revision, stepping;
    2.22 -
    2.23 -    vendor   = pci_conf_read16(0, 0, 0, PCI_VENDOR_ID);
    2.24 -    device   = pci_conf_read16(0, 0, 0, PCI_DEVICE_ID);
    2.25 -    revision = pci_conf_read8(0, 0, 0, PCI_REVISION_ID);
    2.26 -    stepping = revision & 0xf;
    2.27 -
    2.28 -    if ( (vendor == INTEL) && (device == SEABURG) )
    2.29 -    {
    2.30 -        if ( stepping < C_STEP )
    2.31 -        {
    2.32 -            dprintk(XENLOG_WARNING VTDPREFIX,
    2.33 -                    "*** VT-d disabled - pre C0-step Seaburg found\n");
    2.34 -            dprintk(XENLOG_WARNING VTDPREFIX,
    2.35 -                    "***  vendor = %x device = %x revision = %x\n",
    2.36 -                    vendor, device, revision);
    2.37 -            return -ENODEV;
    2.38 -        }
    2.39 -    }
    2.40 -
    2.41 -    return 0;
    2.42 -}
    2.43 -
    2.44  /* Disable vt-d protected memory registers. */
    2.45  void disable_pmr(struct iommu *iommu)
    2.46  {