From: Mika Westerberg <mika.westerberg@linux.intel.com>
To: Bjorn Helgaas <bhelgaas@google.com>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Lukas Wunner <lukas@wunner.de>,
Keith Busch <keith.busch@intel.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Frederick Lawler <fred@fredlawl.com>,
"Gustavo A . R . Silva" <gustavo@embeddedor.com>,
Sinan Kaya <okaya@kernel.org>,
Kai-Heng Feng <kai.heng.feng@canonical.com>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3 1/2] PCI: pciehp: Do not disable interrupt twice on suspend
Date: Tue, 12 Nov 2019 11:32:14 +0200 [thread overview]
Message-ID: <20191112093214.GC2644@lahna.fi.intel.com> (raw)
In-Reply-To: <20191029170022.57528-1-mika.westerberg@linux.intel.com>
Hi Bjorn,
Friendly reminder. If there are no objections it would be nice to get
these two into v5.5 so we would have mostly working native PCIe hotlug
then :)
On Tue, Oct 29, 2019 at 08:00:21PM +0300, Mika Westerberg wrote:
> We try to keep PCIe hotplug ports runtime suspended when entering system
> suspend. Due to the fact that the PCIe portdrv sets NEVER_SKIP driver PM
> flag the PM core always calls system suspend/resume hooks even if the
> device is left runtime suspended. Since PCIe hotplug driver re-uses the
> same function for both it ends up disabling hotplug interrupt twice and
> the second time following is printed:
>
> pciehp 0000:03:01.0:pcie204: pcie_do_write_cmd: no response from device
>
> Prevent this from happening by checking whether the device is already
> runtime suspended when system suspend hook is called.
>
> Fixes: 9c62f0bfb832 ("PCI: pciehp: Implement runtime PM callbacks")
> Reported-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
> Tested-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
> Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> ---
> No changes from previous version.
>
> drivers/pci/hotplug/pciehp_core.c | 25 +++++++++++++++++++++++--
> 1 file changed, 23 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
> index b3122c151b80..56daad828c9e 100644
> --- a/drivers/pci/hotplug/pciehp_core.c
> +++ b/drivers/pci/hotplug/pciehp_core.c
> @@ -253,7 +253,7 @@ static bool pme_is_native(struct pcie_device *dev)
> return pcie_ports_native || host->native_pme;
> }
>
> -static int pciehp_suspend(struct pcie_device *dev)
> +static void pciehp_disable_interrupt(struct pcie_device *dev)
> {
> /*
> * Disable hotplug interrupt so that it does not trigger
> @@ -261,7 +261,19 @@ static int pciehp_suspend(struct pcie_device *dev)
> */
> if (pme_is_native(dev))
> pcie_disable_interrupt(get_service_data(dev));
> +}
>
> +#ifdef CONFIG_PM_SLEEP
> +static int pciehp_suspend(struct pcie_device *dev)
> +{
> + /*
> + * If the port is already runtime suspended we can keep it that
> + * way.
> + */
> + if (dev_pm_smart_suspend_and_suspended(&dev->port->dev))
> + return 0;
> +
> + pciehp_disable_interrupt(dev);
> return 0;
> }
>
> @@ -279,6 +291,7 @@ static int pciehp_resume_noirq(struct pcie_device *dev)
>
> return 0;
> }
> +#endif
>
> static int pciehp_resume(struct pcie_device *dev)
> {
> @@ -292,6 +305,12 @@ static int pciehp_resume(struct pcie_device *dev)
> return 0;
> }
>
> +static int pciehp_runtime_suspend(struct pcie_device *dev)
> +{
> + pciehp_disable_interrupt(dev);
> + return 0;
> +}
> +
> static int pciehp_runtime_resume(struct pcie_device *dev)
> {
> struct controller *ctrl = get_service_data(dev);
> @@ -318,10 +337,12 @@ static struct pcie_port_service_driver hpdriver_portdrv = {
> .remove = pciehp_remove,
>
> #ifdef CONFIG_PM
> +#ifdef CONFIG_PM_SLEEP
> .suspend = pciehp_suspend,
> .resume_noirq = pciehp_resume_noirq,
> .resume = pciehp_resume,
> - .runtime_suspend = pciehp_suspend,
> +#endif
> + .runtime_suspend = pciehp_runtime_suspend,
> .runtime_resume = pciehp_runtime_resume,
> #endif /* PM */
> };
> --
> 2.23.0
next prev parent reply other threads:[~2019-11-12 9:32 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-29 17:00 [PATCH v3 1/2] PCI: pciehp: Do not disable interrupt twice on suspend Mika Westerberg
2019-10-29 17:00 ` [PATCH v3 2/2] PCI: pciehp: Prevent deadlock on disconnect Mika Westerberg
2019-11-13 3:17 ` Bjorn Helgaas
2019-11-13 6:35 ` Lukas Wunner
2019-11-13 11:15 ` Mika Westerberg
2019-11-12 9:32 ` Mika Westerberg [this message]
2019-11-13 23:06 ` [PATCH v3 1/2] PCI: pciehp: Do not disable interrupt twice on suspend Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191112093214.GC2644@lahna.fi.intel.com \
--to=mika.westerberg@linux.intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bhelgaas@google.com \
--cc=fred@fredlawl.com \
--cc=gustavo@embeddedor.com \
--cc=kai.heng.feng@canonical.com \
--cc=keith.busch@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lukas@wunner.de \
--cc=okaya@kernel.org \
--cc=rjw@rjwysocki.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).