Linux-PCI Archive on lore.kernel.org
 help / color / Atom feed
From: Mika Westerberg <mika.westerberg@linux.intel.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: Kalle Valo <kvalo@codeaurora.org>,
	Yicong Yang <yangyicong@hisilicon.com>,
	Mika Westerberg <mika.westerberg@linux.intel.com>,
	linux-pci@vger.kernel.org
Subject: [PATCH] PCI: Make pcie_find_root_port() work for PCIe root ports as well
Date: Mon, 22 Jun 2020 19:12:48 +0300
Message-ID: <20200622161248.51099-1-mika.westerberg@linux.intel.com> (raw)

Commit 6ae72bfa656e ("PCI: Unify pcie_find_root_port() and
pci_find_pcie_root_port()") unified the root port finding functionality
into a single function but missed the fact that the passed in device may
already be a root port. This causes the kernel to block power management
of PCIe hierarchies in recent systems because ->bridge_d3 started to
return false for such ports after the commit in question.

Fixes: 6ae72bfa656e ("PCI: Unify pcie_find_root_port() and pci_find_pcie_root_port()")
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: stable@vger.kernel.org
---
 include/linux/pci.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/linux/pci.h b/include/linux/pci.h
index c79d83304e52..c17c24f5eeed 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -2169,8 +2169,13 @@ 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);
+	struct pci_dev *bridge;
 
+	/* If dev is already root port */
+	if (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT)
+		return dev;
+
+	bridge = pci_upstream_bridge(dev);
 	while (bridge) {
 		if (pci_pcie_type(bridge) == PCI_EXP_TYPE_ROOT_PORT)
 			return bridge;
-- 
2.27.0


             reply index

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-22 16:12 Mika Westerberg [this message]
2020-06-30 22:01 ` Bjorn Helgaas
2020-07-01  1:53   ` Yicong Yang
2020-07-01 10:15     ` Mika Westerberg
2020-07-01 12:47       ` Yicong Yang
2020-07-01 10:14   ` Mika Westerberg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200622161248.51099-1-mika.westerberg@linux.intel.com \
    --to=mika.westerberg@linux.intel.com \
    --cc=bhelgaas@google.com \
    --cc=kvalo@codeaurora.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=yangyicong@hisilicon.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-PCI Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-pci/0 linux-pci/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-pci linux-pci/ https://lore.kernel.org/linux-pci \
		linux-pci@vger.kernel.org
	public-inbox-index linux-pci

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-pci


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git