From: Bjorn Helgaas <helgaas@kernel.org>
To: Konstantin Kharlamov <Hi-Angel@yandex.ru>
Cc: linux-pci@vger.kernel.org, Lukas Wunner <lukas@wunner.de>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Andreas Noever <andreas.noever@gmail.com>,
linux-pm@vger.kernel.org
Subject: Re: [PATCH] PCI: don't power-off apple thunderbolt controller on s2idle
Date: Mon, 7 Jun 2021 18:17:10 -0500 [thread overview]
Message-ID: <20210607231710.GA2539577@bjorn-Precision-5520> (raw)
In-Reply-To: <20210506173820.21876-1-Hi-Angel@yandex.ru>
[+cc Lukas, Rafael, Andreas, linux-pm]
On Thu, May 06, 2021 at 08:38:20PM +0300, Konstantin Kharlamov wrote:
> On Macbook 2013 resuming from s2idle results in external monitor no
> longer being detected, and dmesg having errors like:
>
> pcieport 0000:06:00.0: can't change power state from D3hot to D0 (config space inaccessible)
>
> and a stacktrace. The reason turned out that the hw that the quirk
> powers off does not get powered on back on resume.
>
> Thus, add a check for s2idle to the quirk, and do nothing if the suspend
> mode is s2idle.
>
> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=212767
> Signed-off-by: Konstantin Kharlamov <Hi-Angel@yandex.ru>
Applied as below to pci/pm for v5.14, thanks!
> ---
> drivers/pci/quirks.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> index 653660e3ba9e..86fedcec37e2 100644
> --- a/drivers/pci/quirks.c
> +++ b/drivers/pci/quirks.c
> @@ -27,6 +27,7 @@
> #include <linux/nvme.h>
> #include <linux/platform_data/x86/apple.h>
> #include <linux/pm_runtime.h>
> +#include <linux/suspend.h>
> #include <linux/switchtec.h>
> #include <asm/dma.h> /* isa_dma_bridge_buggy */
> #include "pci.h"
> @@ -3646,6 +3647,13 @@ static void quirk_apple_poweroff_thunderbolt(struct pci_dev *dev)
> return;
> if (pci_pcie_type(dev) != PCI_EXP_TYPE_UPSTREAM)
> return;
> +
> + /*
> + * If suspend mode is s2idle, power won't get restored on resume.
> + */
> + if (!pm_suspend_via_firmware())
> + return;
> +
> bridge = ACPI_HANDLE(&dev->dev);
> if (!bridge)
> return;
>
commit 4694ae373dc2 ("PCI: Leave Apple Thunderbolt controllers on for s2idle or standby")
Author: Konstantin Kharlamov <Hi-Angel@yandex.ru>
Date: Fri May 21 02:55:01 2021 +0300
PCI: Leave Apple Thunderbolt controllers on for s2idle or standby
On Macbook 2013, resuming from suspend-to-idle or standby resulted in the
external monitor no longer being detected, a stacktrace, and errors like
this in dmesg:
pcieport 0000:06:00.0: can't change power state from D3hot to D0 (config space inaccessible)
The reason is that we know how to turn power to the Thunderbolt controller
*off* via the SXIO/SXFP/SXLF methods, but we don't know how to turn power
back on. We have to rely on firmware to turn the power back on.
When going to the "suspend-to-idle" or "standby" system sleep states,
firmware is not involved either on the suspend side or the resume side, so
we can't use SXIO/SXFP/SXLF to turn the power off.
Skip SXIO/SXFP/SXLF when firmware isn't involved in suspend, e.g., when
we're going to the "suspend-to-idle" or "standby" system sleep states.
Fixes: 1df5172c5c25 ("PCI: Suspend/resume quirks for Apple thunderbolt")
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=212767
Link: https://lore.kernel.org/r/20210520235501.917397-1-Hi-Angel@yandex.ru
Signed-off-by: Konstantin Kharlamov <Hi-Angel@yandex.ru>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Lukas Wunner <lukas@wunner.de>
Cc: stable@vger.kernel.org
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index dcb229de1acb..0dde9c5259f2 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -27,6 +27,7 @@
#include <linux/nvme.h>
#include <linux/platform_data/x86/apple.h>
#include <linux/pm_runtime.h>
+#include <linux/suspend.h>
#include <linux/switchtec.h>
#include <asm/dma.h> /* isa_dma_bridge_buggy */
#include "pci.h"
@@ -3634,6 +3635,16 @@ static void quirk_apple_poweroff_thunderbolt(struct pci_dev *dev)
return;
if (pci_pcie_type(dev) != PCI_EXP_TYPE_UPSTREAM)
return;
+
+ /*
+ * SXIO/SXFP/SXLF turns off power to the Thunderbolt controller.
+ * We don't know how to turn it back on again, but firmware does,
+ * so we can only use SXIO/SXFP/SXLF if we're suspending via
+ * firmware.
+ */
+ if (!pm_suspend_via_firmware())
+ return;
+
bridge = ACPI_HANDLE(&dev->dev);
if (!bridge)
return;
prev parent reply other threads:[~2021-06-07 23:17 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-06 17:38 [PATCH] PCI: don't power-off apple thunderbolt controller on s2idle Konstantin Kharlamov
2021-05-06 21:48 ` Bjorn Helgaas
2021-05-06 22:07 ` Lukas Wunner
2021-05-07 9:51 ` Rafael J. Wysocki
2021-05-08 8:48 ` Lukas Wunner
2021-05-07 13:30 ` Bjorn Helgaas
2021-05-07 14:08 ` Konstantin Kharlamov
2021-05-12 20:36 ` Konstantin Kharlamov
2021-05-17 19:51 ` PING " Konstantin Kharlamov
2021-05-19 17:28 ` Bjorn Helgaas
2021-05-19 19:12 ` Rafael J. Wysocki
2021-05-19 19:48 ` Bjorn Helgaas
2021-05-20 11:27 ` Rafael J. Wysocki
2021-05-20 11:54 ` Rafael J. Wysocki
2021-05-20 19:49 ` Bjorn Helgaas
2021-05-20 23:28 ` Konstantin Kharlamov
2021-05-24 6:59 ` Konstantin Kharlamov
2021-05-20 23:55 ` [PATCH v2] PCI: don't call firmware hooks on suspend unless it's fw-controlled Konstantin Kharlamov
2021-05-28 7:39 ` PING: " Konstantin Kharlamov
2021-06-03 8:36 ` PING: " Konstantin Kharlamov
2021-06-03 17:46 ` Bjorn Helgaas
2021-06-04 8:30 ` Konstantin Kharlamov
2021-05-21 9:47 ` [PATCH] PCI: don't power-off apple thunderbolt controller on s2idle Rafael J. Wysocki
2021-05-07 15:02 ` Rafael J. Wysocki
2021-05-08 8:20 ` Lukas Wunner
2021-05-07 9:32 ` Konstantin Kharlamov
2021-05-07 13:07 ` Bjorn Helgaas
2021-05-07 13:48 ` Konstantin Kharlamov
2021-05-20 11:58 ` Rafael J. Wysocki
2021-06-07 23:17 ` Bjorn Helgaas [this message]
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=20210607231710.GA2539577@bjorn-Precision-5520 \
--to=helgaas@kernel.org \
--cc=Hi-Angel@yandex.ru \
--cc=andreas.noever@gmail.com \
--cc=linux-pci@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=lukas@wunner.de \
--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).