From: Suravee Suthikulpanit Date: Tue, 6 Aug 2013 21:40:08 -0500 Subject: [Xen-devel] [PATCH 1/1] x86/AMD: Fix setup ssss:bb:dd:f for d0 failed The host bridge device (i.e. 0x18 for AMD) does not require IOMMU, and therefore is not included in the IVRS. The current logic tries to map all PCI devices to an IOMMU. In this case, "xl dmesg" shows the following message on AMD sytem. (XEN) setup 0000:00:18.0 for d0 failed (-19) (XEN) setup 0000:00:18.1 for d0 failed (-19) (XEN) setup 0000:00:18.2 for d0 failed (-19) (XEN) setup 0000:00:18.3 for d0 failed (-19) (XEN) setup 0000:00:18.4 for d0 failed (-19) (XEN) setup 0000:00:18.5 for d0 failed (-19) This patch add new device type (i.e. DEV_TYPE_PCI_HOST_BRIDGE) which is corresponded to PCI class code 0x06 and sub-class 0x00. Then, it use this new type to filter when trying to map device to IOMMU. Signed-off-by: Suravee Suthikulpanit --- xen/drivers/passthrough/amd/pci_amd_iommu.c | 20 +++++++++++++---- xen/drivers/passthrough/pci.c | 31 ++++++++++++++++----------- xen/drivers/passthrough/vtd/iommu.c | 2 ++ xen/include/xen/pci.h | 1 + 4 files changed, 38 insertions(+), 16 deletions(-) Index: xen-4.3.0/xen/drivers/passthrough/amd/pci_amd_iommu.c =================================================================== --- xen-4.3.0.orig/xen/drivers/passthrough/amd/pci_amd_iommu.c 2013-08-08 09:34:30.572474632 +0200 +++ xen-4.3.0/xen/drivers/passthrough/amd/pci_amd_iommu.c 2013-08-08 10:04:55.056397984 +0200 @@ -175,9 +175,20 @@ static int __init amd_iommu_setup_dom0_d if ( unlikely(!iommu) ) { + /* Filter the bridge devices */ + if ( (pdev->type == DEV_TYPE_PCIe_BRIDGE) + || (pdev->type == DEV_TYPE_PCIe2PCI_BRIDGE) + || (pdev->type == DEV_TYPE_LEGACY_PCI_BRIDGE) + || (pdev->type == DEV_TYPE_PCI_HOST_BRIDGE) ) + { + AMD_IOMMU_DEBUG("Skipping bridge %04x:%02x:%02x.%u (type %x)\n", + pdev->seg, PCI_BUS(bdf), PCI_SLOT(bdf), PCI_FUNC(bdf), + pdev->type); + return 0; + } AMD_IOMMU_DEBUG("No iommu for device %04x:%02x:%02x.%u\n", pdev->seg, pdev->bus, - PCI_SLOT(devfn), PCI_FUNC(devfn)); + PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn)); return -ENODEV; } Index: xen-4.3.0/xen/drivers/passthrough/pci.c =================================================================== --- xen-4.3.0.orig/xen/drivers/passthrough/pci.c 2013-08-08 09:34:30.572474632 +0200 +++ xen-4.3.0/xen/drivers/passthrough/pci.c 2013-08-08 10:02:34.472403890 +0200 @@ -189,9 +189,6 @@ static struct pci_dev *alloc_pdev(struct u16 cap; u8 sec_bus, sub_bus; - case DEV_TYPE_PCIe_BRIDGE: - break; - case DEV_TYPE_PCIe2PCI_BRIDGE: case DEV_TYPE_LEGACY_PCI_BRIDGE: sec_bus = pci_conf_read8(pseg->nr, bus, PCI_SLOT(devfn), @@ -239,6 +236,8 @@ static struct pci_dev *alloc_pdev(struct break; case DEV_TYPE_PCI: + case DEV_TYPE_PCI_HOST_BRIDGE: + case DEV_TYPE_PCIe_BRIDGE: break; default: @@ -691,7 +690,8 @@ void pci_release_devices(struct domain * spin_unlock(&pcidevs_lock); } -#define PCI_CLASS_BRIDGE_PCI 0x0604 +#define PCI_CLASS_PCI_HOST_BRIDGE 0x0600 +#define PCI_CLASS_BRIDGE_PCI 0x0604 enum pdev_type pdev_type(u16 seg, u8 bus, u8 devfn) { @@ -715,6 +715,9 @@ enum pdev_type pdev_type(u16 seg, u8 bus } return DEV_TYPE_PCIe_BRIDGE; + case PCI_CLASS_PCI_HOST_BRIDGE: + return DEV_TYPE_PCI_HOST_BRIDGE; + case 0x0000: case 0xffff: return DEV_TYPE_PCI_UNKNOWN; } Index: xen-4.3.0/xen/drivers/passthrough/vtd/iommu.c =================================================================== --- xen-4.3.0.orig/xen/drivers/passthrough/vtd/iommu.c 2013-08-08 09:34:30.572474632 +0200 +++ xen-4.3.0/xen/drivers/passthrough/vtd/iommu.c 2013-08-08 09:34:30.564474633 +0200 @@ -1447,6 +1447,7 @@ static int domain_context_mapping( break; case DEV_TYPE_PCI: + case DEV_TYPE_PCI_HOST_BRIDGE: if ( iommu_verbose ) dprintk(VTDPREFIX, "d%d:PCI: map %04x:%02x:%02x.%u\n", domain->domain_id, seg, bus, @@ -1576,6 +1577,7 @@ static int domain_context_unmap( break; case DEV_TYPE_PCI: + case DEV_TYPE_PCI_HOST_BRIDGE: if ( iommu_verbose ) dprintk(VTDPREFIX, "d%d:PCI: unmap %04x:%02x:%02x.%u\n", domain->domain_id, seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn)); Index: xen-4.3.0/xen/include/xen/pci.h =================================================================== --- xen-4.3.0.orig/xen/include/xen/pci.h 2013-08-08 09:34:30.572474632 +0200 +++ xen-4.3.0/xen/include/xen/pci.h 2013-08-08 09:34:30.564474633 +0200 @@ -73,6 +73,7 @@ struct pci_dev { DEV_TYPE_PCIe2PCI_BRIDGE, // PCIe-to-PCI/PCIx bridge DEV_TYPE_PCI2PCIe_BRIDGE, // PCI/PCIx-to-PCIe bridge DEV_TYPE_LEGACY_PCI_BRIDGE, // Legacy PCI bridge + DEV_TYPE_PCI_HOST_BRIDGE, // PCI Host bridge DEV_TYPE_PCI, } type;