* [PATCH] PCI: Disable spurious s2idle wake from the NVMe root port on ThinkPad P1 Gen 9
@ 2026-11-13 1:48 Kean Ren
2026-11-16 1:42 ` [PATCH v2] " Kean Ren
0 siblings, 1 reply; 4+ messages in thread
From: Kean Ren @ 2026-11-13 1:48 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: linux-pci, linux-kernel
On Lenovo ThinkPad P1 Gen 9 (21UF, Panther Lake), firmware enables the
ACPI wake capability (_PRW) of PCIe root port 00:1c.4, which is the root
port of the primary NVMe SSD. When the NVMe controller is put into D3
during system suspend, a spurious PME is raised on that root port, which
sets ACPI GPE 0x6F (SCI). The SCI fires during the noirq suspend phase
and aborts s2idle before it reaches the low-power state: every suspend
is followed by a wake within ~2.5 seconds with practically zero s2idle
residency.
The downstream NVMe device is not a wake source (its own ACPI wake is
disabled), so the spurious event comes from the root port's wake/PME
path. Disable the root port's wake capability as well.
No firmware with a fix is available: the issue reproduces with BIOS
N4SET31W (1.10) and N4SET32W (1.11), the latest version at the time of
writing. Match the model only; if a fixed BIOS is released later, this
quirk can be removed or restricted to the affected BIOS versions.
Verified on 21UFZE0PCN:
- gpe6F increments by one per suspend/resume on both BIOS versions;
- masking gpe6F, or disabling RP05 wake via /proc/acpi/wakeup, makes
s2idle stay asleep;
- with this quirk, /proc/acpi/wakeup reports RP05 as disabled and
gpe6F no longer increments across repeated suspends.
Signed-off-by: Kean Ren <rh_king@163.com>
---
drivers/pci/quirks.c | 52 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 52 insertions(+)
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 7f1f47ea2ee4..daccfbbec821 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -6595,3 +6595,55 @@ static void pci_mask_replay_timer_timeout(struct pci_dev *pdev)
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_GLI, 0x9750, pci_mask_replay_timer_timeout);
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_GLI, 0x9755, pci_mask_replay_timer_timeout);
#endif
+
+/*
+ * Lenovo ThinkPad P1 Gen 9 (21UF): the firmware enables the ACPI wake
+ * capability of PCIe root port 00:1c.4, which is the root port of the
+ * primary NVMe SSD. When the NVMe controller is put into D3 during
+ * system suspend, a spurious PME is raised on that root port, which in
+ * turn fires ACPI GPE 0x6F (SCI) and aborts s2idle before the system
+ * reaches the low-power state. The NVMe device itself is not a wake
+ * source (its own ACPI wake is disabled), so disable the root port's
+ * wake capability as well.
+ *
+ * No firmware with a fix is available: the issue reproduces with BIOS
+ * N4SET31W (1.10) and N4SET32W (1.11), the latest version at the time
+ * of writing. Match the model only; if a fixed BIOS is released later,
+ * this quirk can be removed or restricted to the affected BIOS
+ * versions.
+ */
+static const struct dmi_system_id p1g9_rp05_wakeup_dmi[] __initconst = {
+ {
+ .ident = "Lenovo ThinkPad P1 Gen 9 (21UF)",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "21UFZE0PCN"),
+ },
+ },
+ { }
+};
+
+static int __init pci_fixup_p1g9_rp05_wakeup(void)
+{
+ struct pci_dev *rp;
+
+ if (!dmi_check_system(p1g9_rp05_wakeup_dmi))
+ return 0;
+
+ /* Root port of the primary NVMe SSD (05:00.0). */
+ rp = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0x1c, 4));
+ if (!rp)
+ return 0;
+
+ if (device_can_wakeup(&rp->dev)) {
+ device_set_wakeup_enable(&rp->dev, false);
+ pci_info(rp, "disabled spurious s2idle wake (BIOS %s)\n",
+ dmi_get_system_info(DMI_BIOS_VERSION));
+ } else {
+ pci_warn(rp, "wakeup not enabled, cannot disable spurious s2idle wake\n");
+ }
+ pci_dev_put(rp);
+
+ return 0;
+}
+late_initcall(pci_fixup_p1g9_rp05_wakeup);
--
2.43.0
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH v2] PCI: Disable spurious s2idle wake from the NVMe root port on ThinkPad P1 Gen 9
2026-11-13 1:48 [PATCH] PCI: Disable spurious s2idle wake from the NVMe root port on ThinkPad P1 Gen 9 Kean Ren
@ 2026-11-16 1:42 ` Kean Ren
2026-11-16 6:56 ` [PATCH v3] " Kean Ren
0 siblings, 1 reply; 4+ messages in thread
From: Kean Ren @ 2026-11-16 1:42 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: linux-pci, linux-kernel
On Lenovo ThinkPad P1 Gen 9 (21UF, Panther Lake), firmware enables the
ACPI wake capability (_PRW) of PCIe root port 00:1c.4, which is the root
port of the primary NVMe SSD. When the NVMe controller is put into D3
during system suspend, a spurious PME is raised on that root port, which
sets ACPI GPE 0x6F (SCI). The SCI fires during the noirq suspend phase
and aborts s2idle before it reaches the low-power state: every suspend
is followed by a wake within ~2.5 seconds with practically zero s2idle
residency.
The downstream NVMe device is not a wake source (its own ACPI wake is
disabled), so the spurious event comes from the root port's wake/PME
path. Disable the root port's wake capability as well.
No firmware with a fix is available: the issue reproduces with BIOS
N4SET31W (1.10) and N4SET32W (1.11), the latest version at the time of
writing. Match the 21UF model prefix; all 21UF SKUs share the same
platform and firmware, and the remaining MTM characters encode the
factory configuration and region. If a fixed BIOS is released later,
this quirk can be removed or restricted to the affected BIOS versions.
Verified on 21UFZE0PCN:
- gpe6F increments by one per suspend/resume on both BIOS versions;
- masking gpe6F, or disabling RP05 wake via /proc/acpi/wakeup, makes
s2idle stay asleep;
- with this quirk, /proc/acpi/wakeup reports RP05 as disabled and
gpe6F no longer increments across repeated suspends.
Signed-off-by: Kean Ren <rh_king@163.com>
---
Changes in v2:
- Match the 21UF model prefix instead of the full 21UFZE0PCN MTM so the
quirk also covers the other ThinkPad P1 Gen 9 factory configurations
that share the same platform and firmware.
drivers/pci/quirks.c | 54 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 7f1f47ea2ee4..5bf55413a68f 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -6595,3 +6595,57 @@ static void pci_mask_replay_timer_timeout(struct pci_dev *pdev)
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_GLI, 0x9750, pci_mask_replay_timer_timeout);
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_GLI, 0x9755, pci_mask_replay_timer_timeout);
#endif
+
+/*
+ * Lenovo ThinkPad P1 Gen 9 (21UF): the firmware enables the ACPI wake
+ * capability of PCIe root port 00:1c.4, which is the root port of the
+ * primary NVMe SSD. When the NVMe controller is put into D3 during
+ * system suspend, a spurious PME is raised on that root port, which in
+ * turn fires ACPI GPE 0x6F (SCI) and aborts s2idle before the system
+ * reaches the low-power state. The NVMe device itself is not a wake
+ * source (its own ACPI wake is disabled), so disable the root port's
+ * wake capability as well.
+ *
+ * No firmware with a fix is available: the issue reproduces with BIOS
+ * N4SET31W (1.10) and N4SET32W (1.11), the latest version at the time
+ * of writing. Match the 21UF model prefix (the remaining MTM
+ * characters encode the factory configuration and region); if a fixed
+ * BIOS is released later, this quirk can be removed or restricted to
+ * the affected BIOS versions.
+ */
+static const struct dmi_system_id p1g9_rp05_wakeup_dmi[] __initconst = {
+ {
+ .ident = "Lenovo ThinkPad P1 Gen 9 (21UF)",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ /* 21UF = ThinkPad P1 Gen 9 model; suffix is the SKU. */
+ DMI_MATCH(DMI_PRODUCT_NAME, "21UF"),
+ },
+ },
+ { }
+};
+
+static int __init pci_fixup_p1g9_rp05_wakeup(void)
+{
+ struct pci_dev *rp;
+
+ if (!dmi_check_system(p1g9_rp05_wakeup_dmi))
+ return 0;
+
+ /* Root port of the primary NVMe SSD (05:00.0). */
+ rp = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0x1c, 4));
+ if (!rp)
+ return 0;
+
+ if (device_can_wakeup(&rp->dev)) {
+ device_set_wakeup_enable(&rp->dev, false);
+ pci_info(rp, "disabled spurious s2idle wake (BIOS %s)\n",
+ dmi_get_system_info(DMI_BIOS_VERSION));
+ } else {
+ pci_warn(rp, "wakeup not enabled, cannot disable spurious s2idle wake\n");
+ }
+ pci_dev_put(rp);
+
+ return 0;
+}
+late_initcall(pci_fixup_p1g9_rp05_wakeup);
--
2.43.0
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH v3] PCI: Disable spurious s2idle wake from the NVMe root port on ThinkPad P1 Gen 9
2026-11-16 1:42 ` [PATCH v2] " Kean Ren
@ 2026-11-16 6:56 ` Kean Ren
2026-11-16 20:29 ` Bjorn Helgaas
0 siblings, 1 reply; 4+ messages in thread
From: Kean Ren @ 2026-11-16 6:56 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: linux-pci, linux-kernel
On Lenovo ThinkPad P1 Gen 9 (21UF, Panther Lake), firmware enables the
ACPI wake capability (_PRW) of PCIe root port 00:1c.4, which is the root
port of the primary NVMe SSD. When the NVMe controller is put into D3
during system suspend, a spurious PME is raised on that root port, which
sets ACPI GPE 0x6F (SCI). The SCI fires during the noirq suspend phase
and aborts s2idle before it reaches the low-power state: every suspend
is followed by a wake within ~2.5 seconds with practically zero s2idle
residency.
The downstream NVMe device is not a wake source (its own ACPI wake is
disabled), so the spurious event comes from the root port's wake/PME
path. Disable the root port's wake capability as well.
No firmware with a fix is available: the issue reproduces with BIOS
N4SET31W (1.10) and N4SET32W (1.11), the latest version at the time of
writing. Match the 21UF model prefix; all 21UF SKUs share the same
platform and firmware, and the remaining MTM characters encode the
factory configuration and region. If a fixed BIOS is released later,
this quirk can be removed or restricted to the affected BIOS versions.
Verified on 21UFZE0PCN:
- gpe6F increments by one per suspend/resume on both BIOS versions;
- masking gpe6F, or disabling RP05 wake via /proc/acpi/wakeup, makes
s2idle stay asleep;
- with this quirk, /proc/acpi/wakeup reports RP05 as disabled and
gpe6F no longer increments across repeated suspends.
Signed-off-by: Kean Ren <rh_king@163.com>
---
Changes in v3:
- Check device_may_wakeup() instead of device_can_wakeup(): the latter is
set for all PME-capable devices, whether or not wakeup is enabled, so the
quirk could log a disable that did not actually happen. Drop the
corresponding warning; there is nothing to do if wakeup is not enabled.
Changes in v2:
- Match the 21UF model prefix instead of the full 21UFZE0PCN MTM so the
quirk also covers the other ThinkPad P1 Gen 9 factory configurations
that share the same platform and firmware.
drivers/pci/quirks.c | 56 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 7f1f47ea2ee4..6ede2ea49b3a 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -6595,3 +6595,59 @@ static void pci_mask_replay_timer_timeout(struct pci_dev *pdev)
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_GLI, 0x9750, pci_mask_replay_timer_timeout);
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_GLI, 0x9755, pci_mask_replay_timer_timeout);
#endif
+
+/*
+ * Lenovo ThinkPad P1 Gen 9 (21UF): the firmware enables the ACPI wake
+ * capability of PCIe root port 00:1c.4, which is the root port of the
+ * primary NVMe SSD. When the NVMe controller is put into D3 during
+ * system suspend, a spurious PME is raised on that root port, which in
+ * turn fires ACPI GPE 0x6F (SCI) and aborts s2idle before the system
+ * reaches the low-power state. The NVMe device itself is not a wake
+ * source (its own ACPI wake is disabled), so disable the root port's
+ * wake capability as well.
+ *
+ * No firmware with a fix is available: the issue reproduces with BIOS
+ * N4SET31W (1.10) and N4SET32W (1.11), the latest version at the time
+ * of writing. Match the 21UF model prefix (the remaining MTM
+ * characters encode the factory configuration and region); if a fixed
+ * BIOS is released later, this quirk can be removed or restricted to
+ * the affected BIOS versions.
+ */
+static const struct dmi_system_id p1g9_rp05_wakeup_dmi[] __initconst = {
+ {
+ .ident = "Lenovo ThinkPad P1 Gen 9 (21UF)",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ /* 21UF = ThinkPad P1 Gen 9 model; suffix is the SKU. */
+ DMI_MATCH(DMI_PRODUCT_NAME, "21UF"),
+ },
+ },
+ { }
+};
+
+static int __init pci_fixup_p1g9_rp05_wakeup(void)
+{
+ struct pci_dev *rp;
+
+ if (!dmi_check_system(p1g9_rp05_wakeup_dmi))
+ return 0;
+
+ /* Root port of the primary NVMe SSD (05:00.0). */
+ rp = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0x1c, 4));
+ if (!rp)
+ return 0;
+
+ /*
+ * Disable wakeup only if it is enabled: device_can_wakeup() is set
+ * for all PME-capable devices, even when wakeup is disabled.
+ */
+ if (device_may_wakeup(&rp->dev)) {
+ device_set_wakeup_enable(&rp->dev, false);
+ pci_info(rp, "disabled spurious s2idle wake (BIOS %s)\n",
+ dmi_get_system_info(DMI_BIOS_VERSION));
+ }
+ pci_dev_put(rp);
+
+ return 0;
+}
+late_initcall(pci_fixup_p1g9_rp05_wakeup);
--
2.43.0
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v3] PCI: Disable spurious s2idle wake from the NVMe root port on ThinkPad P1 Gen 9
2026-11-16 6:56 ` [PATCH v3] " Kean Ren
@ 2026-11-16 20:29 ` Bjorn Helgaas
0 siblings, 0 replies; 4+ messages in thread
From: Bjorn Helgaas @ 2026-11-16 20:29 UTC (permalink / raw)
To: Kean Ren
Cc: Bjorn Helgaas, linux-pci, linux-kernel, Ryan Brue,
Derek J. Clark, Mark Pearson, Timur Tabi, John Hubbard,
dri-devel, nouveau, Lyude Paul
[+cc others from https://lore.kernel.org/linux-pci/20261110-broken-gpe-legion-v4-1-c672bb1c4d91@gmail.com/;
is this the same issue? That is for GPUs, not NVMe, but sounds similar]
On Mon, Nov 16, 2026 at 02:56:12PM +0800, Kean Ren wrote:
> On Lenovo ThinkPad P1 Gen 9 (21UF, Panther Lake), firmware enables the
> ACPI wake capability (_PRW) of PCIe root port 00:1c.4, which is the root
> port of the primary NVMe SSD. When the NVMe controller is put into D3
> during system suspend, a spurious PME is raised on that root port, which
> sets ACPI GPE 0x6F (SCI). The SCI fires during the noirq suspend phase
> and aborts s2idle before it reaches the low-power state: every suspend
> is followed by a wake within ~2.5 seconds with practically zero s2idle
> residency.
>
> The downstream NVMe device is not a wake source (its own ACPI wake is
> disabled), so the spurious event comes from the root port's wake/PME
> path. Disable the root port's wake capability as well.
>
> No firmware with a fix is available: the issue reproduces with BIOS
> N4SET31W (1.10) and N4SET32W (1.11), the latest version at the time of
> writing. Match the 21UF model prefix; all 21UF SKUs share the same
> platform and firmware, and the remaining MTM characters encode the
> factory configuration and region. If a fixed BIOS is released later,
> this quirk can be removed or restricted to the affected BIOS versions.
>
> Verified on 21UFZE0PCN:
> - gpe6F increments by one per suspend/resume on both BIOS versions;
> - masking gpe6F, or disabling RP05 wake via /proc/acpi/wakeup, makes
> s2idle stay asleep;
> - with this quirk, /proc/acpi/wakeup reports RP05 as disabled and
> gpe6F no longer increments across repeated suspends.
>
> Signed-off-by: Kean Ren <rh_king@163.com>
> ---
> Changes in v3:
> - Check device_may_wakeup() instead of device_can_wakeup(): the latter is
> set for all PME-capable devices, whether or not wakeup is enabled, so the
> quirk could log a disable that did not actually happen. Drop the
> corresponding warning; there is nothing to do if wakeup is not enabled.
>
> Changes in v2:
> - Match the 21UF model prefix instead of the full 21UFZE0PCN MTM so the
> quirk also covers the other ThinkPad P1 Gen 9 factory configurations
> that share the same platform and firmware.
>
> drivers/pci/quirks.c | 56 ++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 56 insertions(+)
>
> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> index 7f1f47ea2ee4..6ede2ea49b3a 100644
> --- a/drivers/pci/quirks.c
> +++ b/drivers/pci/quirks.c
> @@ -6595,3 +6595,59 @@ static void pci_mask_replay_timer_timeout(struct pci_dev *pdev)
> DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_GLI, 0x9750, pci_mask_replay_timer_timeout);
> DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_GLI, 0x9755, pci_mask_replay_timer_timeout);
> #endif
> +
> +/*
> + * Lenovo ThinkPad P1 Gen 9 (21UF): the firmware enables the ACPI wake
> + * capability of PCIe root port 00:1c.4, which is the root port of the
> + * primary NVMe SSD. When the NVMe controller is put into D3 during
> + * system suspend, a spurious PME is raised on that root port, which in
> + * turn fires ACPI GPE 0x6F (SCI) and aborts s2idle before the system
> + * reaches the low-power state. The NVMe device itself is not a wake
> + * source (its own ACPI wake is disabled), so disable the root port's
> + * wake capability as well.
> + *
> + * No firmware with a fix is available: the issue reproduces with BIOS
> + * N4SET31W (1.10) and N4SET32W (1.11), the latest version at the time
> + * of writing. Match the 21UF model prefix (the remaining MTM
> + * characters encode the factory configuration and region); if a fixed
> + * BIOS is released later, this quirk can be removed or restricted to
> + * the affected BIOS versions.
> + */
> +static const struct dmi_system_id p1g9_rp05_wakeup_dmi[] __initconst = {
> + {
> + .ident = "Lenovo ThinkPad P1 Gen 9 (21UF)",
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> + /* 21UF = ThinkPad P1 Gen 9 model; suffix is the SKU. */
> + DMI_MATCH(DMI_PRODUCT_NAME, "21UF"),
> + },
> + },
> + { }
> +};
> +
> +static int __init pci_fixup_p1g9_rp05_wakeup(void)
> +{
> + struct pci_dev *rp;
> +
> + if (!dmi_check_system(p1g9_rp05_wakeup_dmi))
> + return 0;
> +
> + /* Root port of the primary NVMe SSD (05:00.0). */
> + rp = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0x1c, 4));
> + if (!rp)
> + return 0;
> +
> + /*
> + * Disable wakeup only if it is enabled: device_can_wakeup() is set
> + * for all PME-capable devices, even when wakeup is disabled.
> + */
> + if (device_may_wakeup(&rp->dev)) {
> + device_set_wakeup_enable(&rp->dev, false);
> + pci_info(rp, "disabled spurious s2idle wake (BIOS %s)\n",
> + dmi_get_system_info(DMI_BIOS_VERSION));
> + }
> + pci_dev_put(rp);
> +
> + return 0;
> +}
> +late_initcall(pci_fixup_p1g9_rp05_wakeup);
> --
> 2.43.0
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2026-11-16 20:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-13 1:48 [PATCH] PCI: Disable spurious s2idle wake from the NVMe root port on ThinkPad P1 Gen 9 Kean Ren
2026-11-16 1:42 ` [PATCH v2] " Kean Ren
2026-11-16 6:56 ` [PATCH v3] " Kean Ren
2026-11-16 20:29 ` Bjorn Helgaas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®