From: "Rafael J. Wysocki" Subject: Re: [PATCH 1/4] PCI: Afford direct-complete to devices with nonstandard PM Date: Wed, 14 Sep 2016 02:05:23 +0200 Message-ID: <7994515.8fbP5TR7en@vostro.rjw.lan> References: <885bb1c3a5cebbc2c22e1f77426d54cde2a4867c.1472554278.git.lukas@wunner.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7Bit Return-path: Received: from cloudserver094114.home.net.pl ([79.96.170.134]:54469 "HELO cloudserver094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S932160AbcIMX7Q (ORCPT ); Tue, 13 Sep 2016 19:59:16 -0400 In-Reply-To: <885bb1c3a5cebbc2c22e1f77426d54cde2a4867c.1472554278.git.lukas@wunner.de> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: Lukas Wunner Cc: linux-pci@vger.kernel.org, linux-pm@vger.kernel.org, linux-acpi@vger.kernel.org, Peter Wu , Andreas Noever On Wednesday, August 31, 2016 08:15:18 AM Lukas Wunner wrote: > There are devices not power-manageable by the platform, but still able > to runtime suspend to D3cold with a nonstandard mechanism. One example > is laptop hybrid graphics where the discrete GPU and its built-in HDA > controller are power-managed either with a _DSM (AMD PowerXpress, Nvidia > Optimus) or a separate gmux controller (MacBook Pro). Another example > is Thunderbolt on Macs which is power-managed with custom ACPI methods. > > When putting the system to sleep, we currently handle such devices > improperly by transitioning them from D3cold to D3hot (the default power > state defined at the top of pci_target_state()). This wastes energy and > prolongs the suspend sequence (powering up the Thunderbolt controller > takes 2 seconds). > > Avoid that by assuming that a nonstandard PM mechanism is at work if the > device is not platform-power-manageable but currently in D3cold. > > If the device is wakeup enabled, we might still have to wake it up from > D3cold if PME cannot be signaled from that power state. > > The check for devices without PM capability comes before the check for > D3cold since such devices could in theory also be powered down by > nonstandard means and should then be afforded direct-complete as well. > > Cc: Rafael J. Wysocki > Signed-off-by: Lukas Wunner Acked-by: Rafael J. Wysocki > --- > drivers/pci/pci.c | 17 +++++++++++++++-- > 1 file changed, 15 insertions(+), 2 deletions(-) > > diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c > index aab9d51..72a9d3a 100644 > --- a/drivers/pci/pci.c > +++ b/drivers/pci/pci.c > @@ -1959,9 +1959,22 @@ static pci_power_t pci_target_state(struct pci_dev *dev) > default: > target_state = state; > } > - } else if (!dev->pm_cap) { > + > + return target_state; > + } > + > + if (!dev->pm_cap) > target_state = PCI_D0; > - } else if (device_may_wakeup(&dev->dev)) { > + > + /* > + * If the device is in D3cold even though it's not power-manageable by > + * the platform, it may have been powered down by nonstandard means. > + * Best to let it slumber. > + */ > + if (dev->current_state == PCI_D3cold) > + target_state = PCI_D3cold; > + > + if (device_may_wakeup(&dev->dev)) { > /* > * Find the deepest state from which the device can generate > * wake-up events, make it the target state and enable device >