From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Fri, 14 Sep 2018 11:06:21 +0300 From: Mika Westerberg To: "Rafael J. Wysocki" Cc: Bjorn Helgaas , Len Brown , Lukas Wunner , Keith Busch , Ashok Raj , Mario.Limonciello@dell.com, Anthony Wong , Linus Walleij , Sakari Ailus , linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org Subject: Re: [PATCH v2 01/10] PCI: Do not skip power managed bridges in pci_enable_wake() Message-ID: <20180914080621.GT14465@lahna.fi.intel.com> References: <20180913143322.77953-1-mika.westerberg@linux.intel.com> <20180913143322.77953-2-mika.westerberg@linux.intel.com> <153688100.j3IOAyprJL@aspire.rjw.lan> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <153688100.j3IOAyprJL@aspire.rjw.lan> Sender: linux-acpi-owner@vger.kernel.org List-ID: On Thu, Sep 13, 2018 at 04:33:39PM +0200, Rafael J. Wysocki wrote: > On Thursday, September 13, 2018 4:33:13 PM CEST Mika Westerberg wrote: > > Commit baecc470d5fd ("PCI / PM: Skip bridges in pci_enable_wake()") > > changed pci_enable_wake() so that all bridges are skipped when wakeup is > > enabled (or disabled) with the reasoning that bridges can only signal > > wakeup on behalf of their subordinate devices. > > > > However, there are bridges that can signal wakeup itself. For example > > PCIe downstream and root ports supporting hotplug may signal wakeup upon > > hotplug event. > > > > For this reason change pci_enable_wake() so that it skips all bridges > > except those that we power manage (->bridge_d3 is set). Those are the > > ones that can go into low power states and may need to signal wakeup. > > > > Signed-off-by: Mika Westerberg > > --- > > drivers/pci/pci.c | 9 ++++++--- > > 1 file changed, 6 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c > > index 29ff9619b5fa..1af6f1887986 100644 > > --- a/drivers/pci/pci.c > > +++ b/drivers/pci/pci.c > > @@ -2133,10 +2133,13 @@ static int __pci_enable_wake(struct pci_dev *dev, pci_power_t state, bool enable > > int ret = 0; > > > > /* > > - * Bridges can only signal wakeup on behalf of subordinate devices, > > - * but that is set up elsewhere, so skip them. > > + * Bridges that are not power-manageable directly only signal > > + * wakeup on behalf of subordinate devices which is set up > > + * elsewhere, so skip them. However, bridges that are > > + * power-manageable may signal wakeup for themselves (for example, > > + * on a hotplug event) and they need to be covered here. > > */ > > - if (pci_has_subordinate(dev)) > > + if (!pci_power_manageable(dev)) > > return 0; > > > > /* Don't do the same thing twice in a row for one device. */ > > > > Reviewed-by: Rafael J. Wysocki Thanks! For some reason this patch never hit the mailing lists (others did). Since you kept the whole context people should still be able to review it. I can resend this patch as well.