Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f4d91a1 authored by Kenji Kaneshige's avatar Kenji Kaneshige Committed by Jesse Barnes
Browse files

PCI: use pci_is_pcie() in pci core 



Change for PCI core to use pci_is_pcie() instead of checking
pci_dev->is_pcie.

Signed-off-by: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 7eb776c4

drivers/pci/dmar.c

+1 −1
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ int dmar_find_matched_atsr_unit(struct pci_dev *dev) 
	for (bus = dev->bus; bus; bus = bus->parent) {

		struct pci_dev *bridge = bus->self;



		if (!bridge || !bridge->is_pcie ||

		if (!bridge || !pci_is_pcie(bridge) ||

		    bridge->pcie_type == PCI_EXP_TYPE_PCI_BRIDGE)

			return 0;

drivers/pci/intel-iommu.c

+5 −5
Original line number Diff line number Diff line
@@ -1611,7 +1611,7 @@ domain_context_mapping(struct dmar_domain *domain, struct pci_dev *pdev, 
			return ret;

		parent = parent->bus->self;

	}

	if (tmp->is_pcie) /* this is a PCIE-to-PCI bridge */

	if (pci_is_pcie(tmp)) /* this is a PCIE-to-PCI bridge */

		return domain_context_mapping_one(domain,

					pci_domain_nr(tmp->subordinate),

					tmp->subordinate->number, 0,
@@ -1651,7 +1651,7 @@ static int domain_context_mapped(struct pci_dev *pdev) 
			return ret;

		parent = parent->bus->self;

	}

	if (tmp->is_pcie)

	if (pci_is_pcie(tmp))

		return device_context_mapped(iommu, tmp->subordinate->number,

					     0);

	else
@@ -1821,7 +1821,7 @@ static struct dmar_domain *get_domain_for_dev(struct pci_dev *pdev, int gaw) 


	dev_tmp = pci_find_upstream_pcie_bridge(pdev);

	if (dev_tmp) {

		if (dev_tmp->is_pcie) {

		if (pci_is_pcie(dev_tmp)) {

			bus = dev_tmp->subordinate->number;

			devfn = 0;

		} else {
@@ -2182,7 +2182,7 @@ static int iommu_should_identity_map(struct pci_dev *pdev, int startup) 
	 * the 1:1 domain, just in _case_ one of their siblings turns out

	 * not to be able to map all of memory.

	 */

	if (!pdev->is_pcie) {

	if (!pci_is_pcie(pdev)) {

		if (!pci_is_root_bus(pdev->bus))

			return 0;

		if (pdev->class >> 8 == PCI_CLASS_BRIDGE_PCI)
@@ -3280,7 +3280,7 @@ static void iommu_detach_dependent_devices(struct intel_iommu *iommu, 
					 parent->devfn);

			parent = parent->bus->self;

		}

		if (tmp->is_pcie) /* this is a PCIE-to-PCI bridge */

		if (pci_is_pcie(tmp)) /* this is a PCIE-to-PCI bridge */

			iommu_detach_dev(iommu,

				tmp->subordinate->number, 0);

		else /* this is a legacy PCI bridge */

drivers/pci/intr_remapping.c

+2 −2
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ int set_msi_sid(struct irte *irte, struct pci_dev *dev) 
		return -1;



	/* PCIe device or Root Complex integrated PCI device */

	if (dev->is_pcie || !dev->bus->parent) {

	if (pci_is_pcie(dev) || !dev->bus->parent) {

		set_irte_sid(irte, SVT_VERIFY_SID_SQ, SQ_ALL_16,

			     (dev->bus->number << 8) | dev->devfn);

		return 0;
@@ -486,7 +486,7 @@ int set_msi_sid(struct irte *irte, struct pci_dev *dev) 


	bridge = pci_find_upstream_pcie_bridge(dev);

	if (bridge) {

		if (bridge->is_pcie) /* this is a PCIE-to-PCI/PCIX bridge */

		if (pci_is_pcie(bridge))/* this is a PCIE-to-PCI/PCIX bridge */

			set_irte_sid(irte, SVT_VERIFY_BUS, SQ_ALL_16,

				(bridge->bus->number << 8) | dev->bus->number);

		else /* this is a legacy PCI bridge */

drivers/pci/iov.c

+1 −1
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ int pci_iov_init(struct pci_dev *dev) 
{

	int pos;



	if (!dev->is_pcie)

	if (!pci_is_pcie(dev))

		return -ENODEV;



	pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_SRIOV);

drivers/pci/pci-acpi.c

+2 −2
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static void acpi_pci_propagate_wakeup_enable(struct pci_bus *bus, bool enable) 
		int ret;



		ret = acpi_pm_device_sleep_wake(&bridge->dev, enable);

		if (!ret || bridge->is_pcie)

		if (!ret || pci_is_pcie(bridge))

			return;

		bus = bus->parent;

	}
@@ -131,7 +131,7 @@ static int acpi_pci_sleep_wake(struct pci_dev *dev, bool enable) 
	if (acpi_pci_can_wakeup(dev))

		return acpi_pm_device_sleep_wake(&dev->dev, enable);



	if (!dev->is_pcie)

	if (!pci_is_pcie(dev))

		acpi_pci_propagate_wakeup_enable(dev->bus, enable);



	return 0;