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

Commit 62f87c0e authored by Yijing Wang's avatar Yijing Wang Committed by Bjorn Helgaas
Browse files

PCI: Introduce pci_pcie_type(dev) to replace pci_dev->pcie_type 



Introduce an inline function pci_pcie_type(dev) to extract PCIe
device type from pci_dev->pcie_flags_reg field, and prepare for
removing pci_dev->pcie_type.

Signed-off-by: default avatarYijing Wang <wangyijing@huawei.com>
Signed-off-by: default avatarJiang Liu <jiang.liu@huawei.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 786e2288

arch/powerpc/platforms/powernv/pci-ioda.c

+1 −1
Original line number Diff line number Diff line
@@ -855,7 +855,7 @@ static void __devinit pnv_ioda_setup_PEs(struct pci_bus *bus) 
		if (pe == NULL)

			continue;

		/* Leaving the PCIe domain ... single PE# */

		if (dev->pcie_type == PCI_EXP_TYPE_PCI_BRIDGE)

		if (pci_pcie_type(dev) == PCI_EXP_TYPE_PCI_BRIDGE)

			pnv_ioda_setup_bus_PE(dev, pe);

		else if (dev->subordinate)

			pnv_ioda_setup_PEs(dev->subordinate);

drivers/iommu/intel-iommu.c

+3 −3
Original line number Diff line number Diff line
@@ -2350,7 +2350,7 @@ static int iommu_should_identity_map(struct pci_dev *pdev, int startup) 
			return 0;

		if (pdev->class >> 8 == PCI_CLASS_BRIDGE_PCI)

			return 0;

	} else if (pdev->pcie_type == PCI_EXP_TYPE_PCI_BRIDGE)

	} else if (pci_pcie_type(pdev) == PCI_EXP_TYPE_PCI_BRIDGE)

		return 0;



	/*
@@ -3545,10 +3545,10 @@ int dmar_find_matched_atsr_unit(struct pci_dev *dev) 
		struct pci_dev *bridge = bus->self;



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

		    bridge->pcie_type == PCI_EXP_TYPE_PCI_BRIDGE)

		    pci_pcie_type(bridge) == PCI_EXP_TYPE_PCI_BRIDGE)

			return 0;



		if (bridge->pcie_type == PCI_EXP_TYPE_ROOT_PORT) {

		if (pci_pcie_type(bridge) == PCI_EXP_TYPE_ROOT_PORT) {

			for (i = 0; i < atsru->devices_cnt; i++)

				if (atsru->devices[i] == bridge)

					return 1;

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+1 −1
Original line number Diff line number Diff line
@@ -7527,7 +7527,7 @@ static pci_ers_result_t ixgbe_io_error_detected(struct pci_dev *pdev, 
		goto skip_bad_vf_detection;



	bdev = pdev->bus->self;

	while (bdev && (bdev->pcie_type != PCI_EXP_TYPE_ROOT_PORT))

	while (bdev && (pci_pcie_type(bdev) != PCI_EXP_TYPE_ROOT_PORT))

		bdev = bdev->bus->self;



	if (!bdev)

drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1382,7 +1382,7 @@ static void netxen_mask_aer_correctable(struct netxen_adapter *adapter) 
		adapter->ahw.board_type != NETXEN_BRDTYPE_P3_10G_TP)

		return;



	if (root->pcie_type != PCI_EXP_TYPE_ROOT_PORT)

	if (pci_pcie_type(root) != PCI_EXP_TYPE_ROOT_PORT)

		return;



	aer_pos = pci_find_ext_capability(root, PCI_EXT_CAP_ID_ERR);

drivers/pci/iov.c

+3 −3
Original line number Diff line number Diff line
@@ -433,8 +433,8 @@ static int sriov_init(struct pci_dev *dev, int pos) 
	struct resource *res;

	struct pci_dev *pdev;



	if (dev->pcie_type != PCI_EXP_TYPE_RC_END &&

	    dev->pcie_type != PCI_EXP_TYPE_ENDPOINT)

	if (pci_pcie_type(dev) != PCI_EXP_TYPE_RC_END &&

	    pci_pcie_type(dev) != PCI_EXP_TYPE_ENDPOINT)

		return -ENODEV;



	pci_read_config_word(dev, pos + PCI_SRIOV_CTRL, &ctrl);
@@ -503,7 +503,7 @@ static int sriov_init(struct pci_dev *dev, int pos) 
	iov->self = dev;

	pci_read_config_dword(dev, pos + PCI_SRIOV_CAP, &iov->cap);

	pci_read_config_byte(dev, pos + PCI_SRIOV_FUNC_LINK, &iov->link);

	if (dev->pcie_type == PCI_EXP_TYPE_RC_END)

	if (pci_pcie_type(dev) == PCI_EXP_TYPE_RC_END)

		iov->link = PCI_DEVFN(PCI_SLOT(dev->devfn), iov->link);



	if (pdev)