Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1543984

[PATCH v3 3/7] PCI: Don't block runtime PM for Thunderbolt host hotplug ports

Show all headers | View raw

Hotplug ports generally block their parents from suspending to D3hot as
otherwise their interrupts couldn't be delivered.

An exception are Thunderbolt host controllers:  They have a separate
GPIO pin to side-band signal plug events even if the controller is
powered down or its parent ports are suspended to D3.  They can be told
apart from Thunderbolt controllers in attached devices by checking if
they're situated below a non-Thunderbolt device (typically a root port,
or the downstream port of a PCIe switch in the case of the MacPro6,1).

To enable runtime PM for Thunderbolt on the Mac, the downstream bridges
of a host controller must not block runtime PM on the upstream bridge as
power to the chip is only cut once the upstream bridge has suspended.
Amend the condition in pci_dev_check_d3cold() accordingly.

Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Andreas Noever <andreas.noever@gmail.com>
Cc: Tomas Winkler <tomas.winkler@intel.com>
Cc: Amir Levy <amir.jer.levy@intel.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
---
 drivers/pci/pci.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 8ed098d..0b03fe7 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -2271,6 +2271,7 @@ bool pci_bridge_d3_possible(struct pci_dev *bridge)
 
 static int pci_dev_check_d3cold(struct pci_dev *dev, void *data)
 {
+	struct pci_dev *parent, *grandparent;
 	bool *d3cold_ok = data;
 
 	if (/* The device needs to be allowed to go D3cold ... */
@@ -2284,7 +2285,17 @@ static int pci_dev_check_d3cold(struct pci_dev *dev, void *data)
 	    !pci_power_manageable(dev) ||
 
 	    /* Hotplug interrupts cannot be delivered if the link is down. */
-	    dev->is_hotplug_bridge)
+	    (dev->is_hotplug_bridge &&
+
+		/*
+		 * Exception:  Thunderbolt host controllers have a pin to
+		 * side-band signal plug events.  Their hotplug ports are
+		 * recognizable by having a non-Thunderbolt device as
+		 * grandparent.
+		 */
+		!(dev->is_thunderbolt && (parent = pci_upstream_bridge(dev)) &&
+				 (grandparent = pci_upstream_bridge(parent)) &&
+						!grandparent->is_thunderbolt)))
 
 		*d3cold_ok = false;
 
-- 
2.10.2

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH v3 0/7] Runtime PM for Thunderbolt on Macs Lukas Wunner <lukas@wunner.de> - 2016-12-17 15:40 +0100
  [PATCH v3 5/7] PM: Make requirements of dev_pm_domain_set() more  precise Lukas Wunner <lukas@wunner.de> - 2016-12-17 15:50 +0100
  [PATCH v3 4/7] Revert "PM / Runtime: Remove the exported function  pm_children_suspended()" Lukas Wunner <lukas@wunner.de> - 2016-12-17 15:50 +0100
  [PATCH v3 6/7] thunderbolt: Power down controller when idle Lukas Wunner <lukas@wunner.de> - 2016-12-17 15:50 +0100
    Re: [PATCH v3 6/7] thunderbolt: Power down controller when idle Andy Shevchenko <andy.shevchenko@gmail.com> - 2016-12-19 00:10 +0100
      Re: [PATCH v3 6/7] thunderbolt: Power down controller when idle Lukas Wunner <lukas@wunner.de> - 2016-12-20 12:30 +0100
        Re: [PATCH v3 6/7] thunderbolt: Power down controller when idle Andy Shevchenko <andy.shevchenko@gmail.com> - 2016-12-20 14:50 +0100
          Re: [PATCH v3 6/7] thunderbolt: Power down controller when idle Lukas Wunner <lukas@wunner.de> - 2016-12-21 12:00 +0100
  [PATCH v3 2/7] PCI: Allow runtime PM on Thunderbolt ports Lukas Wunner <lukas@wunner.de> - 2016-12-17 15:50 +0100
  [PATCH v3 7/7] thunderbolt: Runtime suspend NHI when idle Lukas Wunner <lukas@wunner.de> - 2016-12-17 15:50 +0100
  [PATCH v3 1/7] PCI: Recognize Thunderbolt devices Lukas Wunner <lukas@wunner.de> - 2016-12-17 15:50 +0100
  [PATCH v3 3/7] PCI: Don't block runtime PM for Thunderbolt host  hotplug ports Lukas Wunner <lukas@wunner.de> - 2016-12-17 15:50 +0100

csiph-web