Merge tag 'pci-v5.8-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci (7fec3ce5) · Commits · 戴 / test

Pull PCI fix from Bjorn Helgaas: "Fix a pcie_find_root_port() simplification that broke power management because it didn't handle the edge case of finding the Root Port of a Root Port itself (Mika Westerberg)"" * tag 'pci-v5.8-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: PCI: Make pcie_find_root_port() work for Root Ports

include/linux/pci.h

+5 −6

Original line number	Diff line number	Diff line
		@@ -2169,12 +2169,11 @@ static inline int pci_pcie_type(const struct pci_dev *dev)
		*/
		static inline struct pci_dev pcie_find_root_port(struct pci_dev dev)
		{
		struct pci_dev *bridge = pci_upstream_bridge(dev);

		while (bridge) {
		if (pci_pcie_type(bridge) == PCI_EXP_TYPE_ROOT_PORT)
		return bridge;
		bridge = pci_upstream_bridge(bridge);
		while (dev) {
		if (pci_is_pcie(dev) &&
		pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT)
		return dev;
		dev = pci_upstream_bridge(dev);
		}

		return NULL;

Admin message