leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

amd_iommu: Make use of DMA quirks and ACS checks in IOMMU groups

Browse Source 
Work around broken devices and adhere to ACS support when determining
IOMMU grouping.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
This commit is contained in:
Alex Williamson 2012-05-30 14:19:31 -06:00 committed by Joerg Roedel
parent abdfdde253
commit 664b600331
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/iommu/amd_iommu.c
View File

@ -254,6 +254,14 @@ static bool check_device(struct device *dev)
return true; return true;
} }
static void swap_pci_ref(struct pci_dev **from, struct pci_dev *to)
{
pci_dev_put(*from);
*from = to;
}
#define REQ_ACS_FLAGS (PCI_ACS_SV | PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_UF)
static int iommu_init_device(struct device *dev) static int iommu_init_device(struct device *dev)
{ {
struct pci_dev *dma_pdev, *pdev = to_pci_dev(dev); struct pci_dev *dma_pdev, *pdev = to_pci_dev(dev);
@ -286,6 +294,23 @@ static int iommu_init_device(struct device *dev)
} else } else
dma_pdev = pci_dev_get(pdev); dma_pdev = pci_dev_get(pdev);
swap_pci_ref(&dma_pdev, pci_get_dma_source(dma_pdev));
if (dma_pdev->multifunction &&
!pci_acs_enabled(dma_pdev, REQ_ACS_FLAGS))
swap_pci_ref(&dma_pdev,
pci_get_slot(dma_pdev->bus,
PCI_DEVFN(PCI_SLOT(dma_pdev->devfn),
0)));
while (!pci_is_root_bus(dma_pdev->bus)) {
if (pci_acs_path_enabled(dma_pdev->bus->self,
NULL, REQ_ACS_FLAGS))
break;
swap_pci_ref(&dma_pdev, pci_dev_get(dma_pdev->bus->self));
}
group = iommu_group_get(&dma_pdev->dev); group = iommu_group_get(&dma_pdev->dev);
pci_dev_put(dma_pdev); pci_dev_put(dma_pdev);
if (!group) { if (!group) {