Skip to contentSkip to conversation

PCI: Make pcie_find_root_port() work for PCIe root ports as well

PATCH In review Mika Westerberg 3 participants 6 messages Jun 22, 2020 – Jul 1, 2020 PCI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PCI: Make pcie_find_root_port() work for PCIe root ports as well

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()")
---
 include/linux/pci.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
include/linux/pci.h +6 -1
index c79d83304e52..c17c24f5eeed 100644
@@ -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;
Signature · 1 line
2.27.0
#1 lore raw
Quoted 23 lines · Mika Westerberg

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()")
---
 include/linux/pci.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
include/linux/pci.h +0 -1
index c79d83304e52..c17c24f5eeed 100644
@@ -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);

include/linux/pci.h static inline int pci_pcie_type(const struct pci_dev *dev) · line 2181

Quoted 10 lines
include/linux/pci.h +6 -0
+	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;

I applied the patch below, which is slightly simplified but I think still equivalent, to for-linus for v5.8. Let me know if it's not.

I dropped the stable tag because 6ae72bfa656e was merged for v5.8-rc1, and I assume v5.7 works correctly so it doesn't need any change.

commit 5396956cc7c6 ("PCI: Make pcie_find_root_port() work for Root Ports")

Author: Mika Westerberg <[email protected]>
Date:   Mon Jun 22 19:12:48 2020 +0300

PCI: Make pcie_find_root_port() work for Root Ports

Commit 6ae72bfa656e ("PCI: Unify pcie_find_root_port() and pci_find_pcie_root_port()") broke acpi_pci_bridge_d3() because calling pcie_find_root_port() on a Root Port returned NULL when it should return the Root Port, which in turn broke power management of PCIe hierarchies.

Rework pcie_find_root_port() so it returns its argument when it is already a Root Port.

[bhelgaas: test device only once, test for PCIe]
Fixes 6ae72bfa656e ("PCI: Unify pcie_find_root_port() and pci_find_pcie_root_port()")
include/linux/pci.h +5 -6
index c79d83304e52..34c1c4f45288 100644
@@ -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;
#2 lore raw

Hi Bjorn,

Quoted 72 lines · Bjorn Helgaas
Quoted 23 lines · Mika Westerberg

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()")
---
 include/linux/pci.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
include/linux/pci.h +0 -1
index c79d83304e52..c17c24f5eeed 100644
@@ -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);

include/linux/pci.h static inline int pci_pcie_type(const struct pci_dev *dev) · line 2181

Quoted 10 lines
include/linux/pci.h +6 -0
+	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;

I applied the patch below, which is slightly simplified but I think still equivalent, to for-linus for v5.8. Let me know if it's not.

I dropped the stable tag because 6ae72bfa656e was merged for v5.8-rc1, and I assume v5.7 works correctly so it doesn't need any change.

commit 5396956cc7c6 ("PCI: Make pcie_find_root_port() work for Root Ports")

Author: Mika Westerberg <[email protected]>
Date:   Mon Jun 22 19:12:48 2020 +0300

PCI: Make pcie_find_root_port() work for Root Ports

Commit 6ae72bfa656e ("PCI: Unify pcie_find_root_port() and pci_find_pcie_root_port()") broke acpi_pci_bridge_d3() because calling pcie_find_root_port() on a Root Port returned NULL when it should return the Root Port, which in turn broke power management of PCIe hierarchies.

Rework pcie_find_root_port() so it returns its argument when it is already a Root Port.

[bhelgaas: test device only once, test for PCIe]
Fixes 6ae72bfa656e ("PCI: Unify pcie_find_root_port() and pci_find_pcie_root_port()")
include/linux/pci.h +0 -3
index c79d83304e52..34c1c4f45288 100644
@@ -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) {

include/linux/pci.h static inline int pci_pcie_type(const struct pci_dev *dev) · line 2178

Quoted 10 lines
include/linux/pci.h +5 -3
-		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);
 	}
 

We may have some problems here, as after pcie_find_root_port() called, *dev will be either root port or NULL but users may want it unchanged. One such usage is in acpi_pci_bridge_d3(), drivers/pci/pci-acpi.c, *dev is used as origin after called this.

So we should use a temporary point to *dev rather than directly modify it.

Thanks,
Yicong

Quoted 3 lines
include/linux/pci.h +0 -0
 	return NULL;

.

#3 lore raw
Quoted 21 lines · Yicong Yang
Quoted 5 lines

static inline struct pci_dev *pcie_find_root_port(struct pci_dev *dev) {

include/linux/pci.h +0 -2
-	struct pci_dev *bridge = pci_upstream_bridge(dev);
-

include/linux/pci.h static inline int pci_pcie_type(const struct pci_dev *dev) · line 2177

Quoted 10 lines
include/linux/pci.h +5 -4
-	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);
 	}

We may have some problems here, as after pcie_find_root_port() called, *dev will be either root port or NULL but users may want it unchanged. One such usage is in acpi_pci_bridge_d3(), drivers/pci/pci-acpi.c, *dev is used as origin after called this.

Quoted 1 line

So we should use a temporary point to *dev rather than directly modify it.

dev is already a copy of what is passed by the caller so it does not matter if it gets changed here. You would need to pass it through struct pci_dev **dev in order to modify the passed pointer.

#4 lore raw
Quoted 21 lines · Mika Westerberg
Quoted 20 lines · Yicong Yang
Quoted 5 lines

static inline struct pci_dev *pcie_find_root_port(struct pci_dev *dev) {

include/linux/pci.h +0 -2
-	struct pci_dev *bridge = pci_upstream_bridge(dev);
-

include/linux/pci.h static inline int pci_pcie_type(const struct pci_dev *dev) · line 2177

Quoted 10 lines
include/linux/pci.h +5 -4
-	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);
 	}

We may have some problems here, as after pcie_find_root_port() called, *dev will be either root port or NULL but users may want it unchanged. One such usage is in acpi_pci_bridge_d3(), drivers/pci/pci-acpi.c, *dev is used as origin after called this.

Quoted 4 lines
Quoted 1 line

So we should use a temporary point to *dev rather than directly modify it.

dev is already a copy of what is passed by the caller so it does not matter if it gets changed here. You would need to pass it through struct pci_dev **dev in order to modify the passed pointer.

Ah...I must be fuzzy in mind then. Thanks.

Quoted 2 lines

.

#5 lore raw
In reply to Bjorn Helgaas
Quoted 26 lines · Bjorn Helgaas
Quoted 25 lines · Mika Westerberg

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()")
---
 include/linux/pci.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
include/linux/pci.h +1 -1
index c79d83304e52..c17c24f5eeed 100644
@@ -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;
 
Quoted 11 lines

include/linux/pci.h static inline int pci_pcie_type(const struct pci_dev *dev) · line 2181

Quoted 8 lines
include/linux/pci.h +5 -0
+	/* 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;

I applied the patch below, which is slightly simplified but I think still equivalent, to for-linus for v5.8. Let me know if it's not.

Thanks I just tested and it also works fine.

Quoted 2 lines

I dropped the stable tag because 6ae72bfa656e was merged for v5.8-rc1, and I assume v5.7 works correctly so it doesn't need any change.

Right, makes sense.