On Fri, Jul 21, 2017 at 02:38:08PM +0200, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
>
> PCI bridges only have a reason to generate wakeup signals on behalf
> of devices below them, so avoid preparing bridges for wakeup directly
> in pci_enable_wake().
>
> Also drop the pci_has_subordinate() check from pci_pm_default_resume()
> as this will be done by pci_enable_wake() itself now.
>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
Acked-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
> ---
> drivers/pci/pci-driver.c | 4 +---
> drivers/pci/pci.c | 7 +++++++
> 2 files changed, 8 insertions(+), 3 deletions(-)
>
> Index: linux-pm/drivers/pci/pci.c
> ===================================================================
> --- linux-pm.orig/drivers/pci/pci.c
> +++ linux-pm/drivers/pci/pci.c
> @@ -1909,6 +1909,13 @@ int pci_enable_wake(struct pci_dev *dev,
> {
> int ret = 0;
>
> + /*
> + * Bridges can only signal wakeup on behalf of subordinate devices,
> + * but that is set up elsewhere, so skip them.
A specific pointer to this "elsewhere" would be useful here.
> + */
> + if (pci_has_subordinate(dev))
> + return 0;
> +
> /* Don't do the same thing twice in a row for one device. */
> if (!!enable == !!dev->wakeup_prepared)
> return 0;
> Index: linux-pm/drivers/pci/pci-driver.c
> ===================================================================
> --- linux-pm.orig/drivers/pci/pci-driver.c
> +++ linux-pm/drivers/pci/pci-driver.c
> @@ -642,9 +642,7 @@ static int pci_legacy_resume(struct devi
> static void pci_pm_default_resume(struct pci_dev *pci_dev)
> {
> pci_fixup_device(pci_fixup_resume, pci_dev);
> -
> - if (!pci_has_subordinate(pci_dev))
> - pci_enable_wake(pci_dev, PCI_D0, false);
> + pci_enable_wake(pci_dev, PCI_D0, false);
> }
>
> static void pci_pm_default_suspend(struct pci_dev *pci_dev)
>
