aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/intel-iommu.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pci/intel-iommu.c')
-rw-r--r--drivers/pci/intel-iommu.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index b1e97e682500..b8802ae4bcdb 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -1611,7 +1611,7 @@ domain_context_mapping(struct dmar_domain *domain, struct pci_dev *pdev,
1611 return ret; 1611 return ret;
1612 parent = parent->bus->self; 1612 parent = parent->bus->self;
1613 } 1613 }
1614 if (tmp->is_pcie) /* this is a PCIE-to-PCI bridge */ 1614 if (pci_is_pcie(tmp)) /* this is a PCIE-to-PCI bridge */
1615 return domain_context_mapping_one(domain, 1615 return domain_context_mapping_one(domain,
1616 pci_domain_nr(tmp->subordinate), 1616 pci_domain_nr(tmp->subordinate),
1617 tmp->subordinate->number, 0, 1617 tmp->subordinate->number, 0,
@@ -1651,7 +1651,7 @@ static int domain_context_mapped(struct pci_dev *pdev)
1651 return ret; 1651 return ret;
1652 parent = parent->bus->self; 1652 parent = parent->bus->self;
1653 } 1653 }
1654 if (tmp->is_pcie) 1654 if (pci_is_pcie(tmp))
1655 return device_context_mapped(iommu, tmp->subordinate->number, 1655 return device_context_mapped(iommu, tmp->subordinate->number,
1656 0); 1656 0);
1657 else 1657 else
@@ -1821,7 +1821,7 @@ static struct dmar_domain *get_domain_for_dev(struct pci_dev *pdev, int gaw)
1821 1821
1822 dev_tmp = pci_find_upstream_pcie_bridge(pdev); 1822 dev_tmp = pci_find_upstream_pcie_bridge(pdev);
1823 if (dev_tmp) { 1823 if (dev_tmp) {
1824 if (dev_tmp->is_pcie) { 1824 if (pci_is_pcie(dev_tmp)) {
1825 bus = dev_tmp->subordinate->number; 1825 bus = dev_tmp->subordinate->number;
1826 devfn = 0; 1826 devfn = 0;
1827 } else { 1827 } else {
@@ -2182,7 +2182,7 @@ static int iommu_should_identity_map(struct pci_dev *pdev, int startup)
2182 * the 1:1 domain, just in _case_ one of their siblings turns out 2182 * the 1:1 domain, just in _case_ one of their siblings turns out
2183 * not to be able to map all of memory. 2183 * not to be able to map all of memory.
2184 */ 2184 */
2185 if (!pdev->is_pcie) { 2185 if (!pci_is_pcie(pdev)) {
2186 if (!pci_is_root_bus(pdev->bus)) 2186 if (!pci_is_root_bus(pdev->bus))
2187 return 0; 2187 return 0;
2188 if (pdev->class >> 8 == PCI_CLASS_BRIDGE_PCI) 2188 if (pdev->class >> 8 == PCI_CLASS_BRIDGE_PCI)
@@ -3280,7 +3280,7 @@ static void iommu_detach_dependent_devices(struct intel_iommu *iommu,
3280 parent->devfn); 3280 parent->devfn);
3281 parent = parent->bus->self; 3281 parent = parent->bus->self;
3282 } 3282 }
3283 if (tmp->is_pcie) /* this is a PCIE-to-PCI bridge */ 3283 if (pci_is_pcie(tmp)) /* this is a PCIE-to-PCI bridge */
3284 iommu_detach_dev(iommu, 3284 iommu_detach_dev(iommu,
3285 tmp->subordinate->number, 0); 3285 tmp->subordinate->number, 0);
3286 else /* this is a legacy PCI bridge */ 3286 else /* this is a legacy PCI bridge */