Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1700389
| From | Bjorn Helgaas <helgaas@kernel.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH 1/3] PCI / PM: Skip bridges in pci_enable_wake() |
| Date | 2017-07-31 23:00 +0200 |
| Message-ID | <u9pXc-2wz-23@gated-at.bofh.it> (permalink) |
| References | <u5FHc-4X6-3@gated-at.bofh.it> <u5FHd-4X6-33@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On Fri, Jul 21, 2017 at 02:38:08PM +0200, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> 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@intel.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
> ---
> 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)
>
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 0/3] PCI / ACPI / PM: Fix propagation of wakeup settings to bridges "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2017-07-21 15:00 +0200
[PATCH 3/3] ACPI / PCI / PM: Rework acpi_pci_propagate_wakeup() "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2017-07-21 15:00 +0200
Re: [PATCH 3/3] ACPI / PCI / PM: Rework acpi_pci_propagate_wakeup() Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-07-21 17:50 +0200
Re: [PATCH 3/3] ACPI / PCI / PM: Rework acpi_pci_propagate_wakeup() "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2017-07-21 23:00 +0200
Re: [PATCH 3/3] ACPI / PCI / PM: Rework acpi_pci_propagate_wakeup() "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2017-07-21 23:20 +0200
[PATCH v2 3/3] ACPI / PCI / PM: Rework acpi_pci_propagate_wakeup() "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2017-07-21 23:40 +0200
Re: [PATCH v2 3/3] ACPI / PCI / PM: Rework acpi_pci_propagate_wakeup() Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-07-21 23:50 +0200
Re: [PATCH v2 3/3] ACPI / PCI / PM: Rework acpi_pci_propagate_wakeup() Mika Westerberg <mika.westerberg@linux.intel.com> - 2017-07-25 14:50 +0200
Re: [PATCH v2 3/3] ACPI / PCI / PM: Rework acpi_pci_propagate_wakeup() Bjorn Helgaas <helgaas@kernel.org> - 2017-08-01 00:10 +0200
Re: [PATCH v2 3/3] ACPI / PCI / PM: Rework acpi_pci_propagate_wakeup() "Rafael J. Wysocki" <rafael@kernel.org> - 2017-08-01 02:40 +0200
[PATCH v3 3/3] ACPI / PCI / PM: Rework acpi_pci_propagate_wakeup() "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2017-08-01 03:10 +0200
[PATCH 1/3] PCI / PM: Skip bridges in pci_enable_wake() "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2017-07-21 15:00 +0200
Re: [PATCH 1/3] PCI / PM: Skip bridges in pci_enable_wake() Mika Westerberg <mika.westerberg@linux.intel.com> - 2017-07-25 14:50 +0200
Re: [PATCH 1/3] PCI / PM: Skip bridges in pci_enable_wake() Bjorn Helgaas <helgaas@kernel.org> - 2017-07-31 23:00 +0200
Re: [PATCH 1/3] PCI / PM: Skip bridges in pci_enable_wake() "Rafael J. Wysocki" <rafael@kernel.org> - 2017-07-31 23:00 +0200
Re: [PATCH 0/3] PCI / ACPI / PM: Fix propagation of wakeup settings to bridges "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2017-07-28 02:50 +0200
csiph-web