ia64/xen-unstable

changeset 19731:01748ccc4da3

Intel VT-d: fix Stoakley boot issue with iommu=1

Signed-off-by: Weidong Han <Weidong.han@intel.com>
Signed-off-by: Allen Kay <allen.m.kay@intel.com>
author Keir Fraser <keir.fraser@citrix.com>
date Fri Jun 05 09:25:50 2009 +0100 (2009-06-05)
parents 687040d3f342
children 931dbe86e5f3
files xen/drivers/passthrough/vtd/dmar.c
line diff
     1.1 --- a/xen/drivers/passthrough/vtd/dmar.c	Thu Jun 04 22:26:38 2009 +0100
     1.2 +++ b/xen/drivers/passthrough/vtd/dmar.c	Fri Jun 05 09:25:50 2009 +0100
     1.3 @@ -277,25 +277,25 @@ static int __init acpi_parse_dev_scope(v
     1.4              sub_bus = pci_conf_read8(
     1.5                  bus, path->dev, path->fn, PCI_SUBORDINATE_BUS);
     1.6              dprintk(XENLOG_INFO VTDPREFIX,
     1.7 -                    "found bridge: bdf = %x:%x.%x  sec = %x  sub = %x\n",
     1.8 -                    bus, path->dev, path->fn, sec_bus, sub_bus);
     1.9 +                    "bridge: %x:%x.%x  start = %x sec = %x  sub = %x\n",
    1.10 +                    bus, path->dev, path->fn,
    1.11 +                    acpi_scope->start_bus, sec_bus, sub_bus);
    1.12  
    1.13 -            dmar_scope_add_buses(scope, acpi_scope->start_bus, acpi_scope->start_bus);
    1.14              dmar_scope_add_buses(scope, sec_bus, sub_bus);
    1.15              break;
    1.16  
    1.17          case ACPI_DEV_MSI_HPET:
    1.18 -            dprintk(XENLOG_INFO VTDPREFIX, "found MSI HPET: bdf = %x:%x.%x\n",
    1.19 +            dprintk(XENLOG_INFO VTDPREFIX, "MSI HPET: %x:%x.%x\n",
    1.20                      bus, path->dev, path->fn);
    1.21              break;
    1.22  
    1.23          case ACPI_DEV_ENDPOINT:
    1.24 -            dprintk(XENLOG_INFO VTDPREFIX, "found endpoint: bdf = %x:%x.%x\n",
    1.25 +            dprintk(XENLOG_INFO VTDPREFIX, "endpoint: %x:%x.%x\n",
    1.26                      bus, path->dev, path->fn);
    1.27              break;
    1.28  
    1.29          case ACPI_DEV_IOAPIC:
    1.30 -            dprintk(XENLOG_INFO VTDPREFIX, "found IOAPIC: bdf = %x:%x.%x\n",
    1.31 +            dprintk(XENLOG_INFO VTDPREFIX, "IOAPIC: %x:%x.%x\n",
    1.32                      bus, path->dev, path->fn);
    1.33  
    1.34              if ( type == DMAR_TYPE )