]> git.hungrycats.org Git - linux/commitdiff
PCI: Export pcie_find_root_port
authorJohannes Thumshirn <jthumshirn@suse.de>
Wed, 2 Nov 2016 22:35:51 +0000 (16:35 -0600)
committerJiri Slaby <jslaby@suse.cz>
Mon, 12 Dec 2016 14:25:46 +0000 (15:25 +0100)
commit e784930bd645e7df78c66e7872fec282b0620075 upstream.

Export pcie_find_root_port() so we can use it outside of PCIe-AER error
injection.

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/pci/pcie/aer/aer_inject.c
include/linux/pci.h

index 587e7e853107136b81f416d0e1e932db855bfa61..3b507a51248705f03a5fa9caa561b8eb90a51d1c 100644 (file)
@@ -283,20 +283,6 @@ out:
        return 0;
 }
 
-static struct pci_dev *pcie_find_root_port(struct pci_dev *dev)
-{
-       while (1) {
-               if (!pci_is_pcie(dev))
-                       break;
-               if (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT)
-                       return dev;
-               if (!dev->bus->self)
-                       break;
-               dev = dev->bus->self;
-       }
-       return NULL;
-}
-
 static int find_aer_device_iter(struct device *device, void *data)
 {
        struct pcie_device **result = data;
index 81562314df8cfb48990743717c4a82918c34332e..00bc7bb960729305f1c8c17290a8e45ec215464e 100644 (file)
@@ -1787,6 +1787,20 @@ static inline int pci_pcie_type(const struct pci_dev *dev)
        return (pcie_caps_reg(dev) & PCI_EXP_FLAGS_TYPE) >> 4;
 }
 
+static inline struct pci_dev *pcie_find_root_port(struct pci_dev *dev)
+{
+       while (1) {
+               if (!pci_is_pcie(dev))
+                       break;
+               if (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT)
+                       return dev;
+               if (!dev->bus->self)
+                       break;
+               dev = dev->bus->self;
+       }
+       return NULL;
+}
+
 void pci_request_acs(void);
 bool pci_acs_enabled(struct pci_dev *pdev, u16 acs_flags);
 bool pci_acs_path_enabled(struct pci_dev *start,