linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 0/3] Improvements to S5 power consumption
@ 2025-05-14 19:34 Mario Limonciello
  2025-05-14 19:34 ` [PATCH v2 1/3] PM: Use hibernate flows for system power off Mario Limonciello
                   ` (2 more replies)
  0 siblings, 3 replies; 8+ messages in thread
From: Mario Limonciello @ 2025-05-14 19:34 UTC (permalink / raw)
  To: Rafael J . Wysocki, Alex Deucher, Bjorn Helgaas
  Cc: open list:RADEON and AMDGPU DRM DRIVERS,
	open list:HIBERNATION (aka Software Suspend, aka swsusp),
	open list:PCI SUBSYSTEM, open list, Mario Limonciello

From: Mario Limonciello <mario.limonciello@amd.com>

A variety of issues both in function and in power consumption have been
raised as a result of devices not being put into a low power state when
the system is powered off.

There have been some localized changes[1] to PCI core to help these issues,
but they have had various downsides.

This series instead tries to use the S4 flow when the system is being
powered off.  This lines up the behavior with what other operating systems
do as well.  If for some reason that fails or is not supported, unwind and
do the previous S5 flow that will wake all devices and run their shutdown()
callbacks.

Previous submissions [1]:
Link: https://lore.kernel.org/linux-pm/CAJZ5v0hrKEJa8Ad7iiAvQ3d_0ysVhzZcXSYc5kkL=6vtseF+bg@mail.gmail.com/T/#m91e4eae868a7405ae579e89b135085f4906225d2
Link: https://lore.kernel.org/linux-pci/20231213182656.6165-1-mario.limonciello@amd.com/
Link: https://lore.kernel.org/linux-pci/20250506041934.1409302-1-superm1@kernel.org/

Mario Limonciello (3):
  PM: Use hibernate flows for system power off
  PCI: Put PCIe ports with downstream devices into D3 at hibernate
  drm/amd: Avoid evicting resources at S5

 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |  4 +++
 drivers/pci/pci-driver.c                   | 39 ++++++++++++++++++++--
 kernel/reboot.c                            | 12 +++++++
 3 files changed, 53 insertions(+), 2 deletions(-)

-- 
2.43.0


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH v2 1/3] PM: Use hibernate flows for system power off
  2025-05-14 19:34 [PATCH v2 0/3] Improvements to S5 power consumption Mario Limonciello
@ 2025-05-14 19:34 ` Mario Limonciello
  2025-05-16 14:58   ` Rafael J. Wysocki
  2025-05-14 19:34 ` [PATCH v2 2/3] PCI: Put PCIe ports with downstream devices into D3 at hibernate Mario Limonciello
  2025-05-14 19:34 ` [PATCH v2 3/3] drm/amd: Avoid evicting resources at S5 Mario Limonciello
  2 siblings, 1 reply; 8+ messages in thread
From: Mario Limonciello @ 2025-05-14 19:34 UTC (permalink / raw)
  To: Rafael J . Wysocki, Alex Deucher, Bjorn Helgaas
  Cc: open list:RADEON and AMDGPU DRM DRIVERS,
	open list:HIBERNATION (aka Software Suspend, aka swsusp),
	open list:PCI SUBSYSTEM, open list, Mario Limonciello, AceLan Kao,
	Kai-Heng Feng, Mark Pearson, Merthan Karakaş, Denis Benato

From: Mario Limonciello <mario.limonciello@amd.com>

When the system is powered off the kernel will call device_shutdown()
which will issue callbacks into PCI core to wake up a device and call
it's shutdown() callback.  This will leave devices in ACPI D0 which can
cause some devices to misbehave with spurious wakeups and also leave some
devices on which will consume power needlessly.

The issue won't happen if the device is in D3 before system shutdown, so
putting device to low power state before shutdown solves the issue.

ACPI Spec 6.5, "7.4.2.5 System \_S4 State" says "Devices states are
compatible with the current Power Resource states. In other words, all
devices are in the D3 state when the system state is S4."

The following "7.4.2.6 System \_S5 State (Soft Off)" states "The S5
state is similar to the S4 state except that OSPM does not save any
context." so it's safe to assume devices should be at D3 for S5.

To accomplish this, modify the PM core to call all the device hibernate
callbacks when turning off the system when the kernel is compiled with
hibernate support. If compiled without hibernate support or hibernate fails
fall back into the previous shutdown flow.

Cc: AceLan Kao <acelan.kao@canonical.com>
Cc: Kai-Heng Feng <kaihengf@nvidia.com>
Cc: Mark Pearson <mpearson-lenovo@squebb.ca>
Cc: Merthan Karakaş <m3rthn.k@gmail.com>
Tested-by: Denis Benato <benato.denis96@gmail.com>
Link: https://lore.kernel.org/linux-pci/20231213182656.6165-1-mario.limonciello@amd.com/
Link: https://lore.kernel.org/linux-pci/20250506041934.1409302-1-superm1@kernel.org/
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
v2:
 * Handle failures to hibernate (fall back to shutdown)
 * Don't use dedicated events
 * Only allow under CONFIG_HIBERNATE_CALLBACKS
---
 kernel/reboot.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/kernel/reboot.c b/kernel/reboot.c
index ec087827c85cd..52f5e6e36a6f8 100644
--- a/kernel/reboot.c
+++ b/kernel/reboot.c
@@ -13,6 +13,7 @@
 #include <linux/kexec.h>
 #include <linux/kmod.h>
 #include <linux/kmsg_dump.h>
+#include <linux/pm.h>
 #include <linux/reboot.h>
 #include <linux/suspend.h>
 #include <linux/syscalls.h>
@@ -305,6 +306,17 @@ static void kernel_shutdown_prepare(enum system_states state)
 		(state == SYSTEM_HALT) ? SYS_HALT : SYS_POWER_OFF, NULL);
 	system_state = state;
 	usermodehelper_disable();
+#ifdef CONFIG_HIBERNATE_CALLBACKS
+	if (dpm_suspend_start(PMSG_HIBERNATE))
+		goto resume_devices;
+	if (dpm_suspend_end(PMSG_HIBERNATE))
+		goto resume_devices;
+	return;
+
+resume_devices:
+	pr_emerg("Failed to power off devices, using shutdown instead.\n");
+	dpm_resume_end(PMSG_RESTORE);
+#endif
 	device_shutdown();
 }
 /**
-- 
2.43.0


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH v2 2/3] PCI: Put PCIe ports with downstream devices into D3 at hibernate
  2025-05-14 19:34 [PATCH v2 0/3] Improvements to S5 power consumption Mario Limonciello
  2025-05-14 19:34 ` [PATCH v2 1/3] PM: Use hibernate flows for system power off Mario Limonciello
@ 2025-05-14 19:34 ` Mario Limonciello
  2025-05-18  6:20   ` Lukas Wunner
  2025-05-14 19:34 ` [PATCH v2 3/3] drm/amd: Avoid evicting resources at S5 Mario Limonciello
  2 siblings, 1 reply; 8+ messages in thread
From: Mario Limonciello @ 2025-05-14 19:34 UTC (permalink / raw)
  To: Rafael J . Wysocki, Alex Deucher, Bjorn Helgaas
  Cc: open list:RADEON and AMDGPU DRM DRIVERS,
	open list:HIBERNATION (aka Software Suspend, aka swsusp),
	open list:PCI SUBSYSTEM, open list, Mario Limonciello, AceLan Kao,
	Kai-Heng Feng, Mark Pearson, Denis Benato, Merthan Karakaş

From: Mario Limonciello <mario.limonciello@amd.com>

For the suspend flow PCIe ports that have downstream devices are put into
the appropriate D3 state when children are not in D0. For the hibernate
flow, PCIe ports with downstream devices stay in D0 however. This can
lead to PCIe ports that are remained powered on needlessly during
hibernate.

Adjust the pci_pm_poweroff_noirq() to follow the same flow as
pci_pm_suspend_noirq() in that PCIe ports that are power manageable should
without downstream devices in D0 should be put into their appropriate
sleep state.

Cc: AceLan Kao <acelan.kao@canonical.com>
Cc: Kai-Heng Feng <kaihengf@nvidia.com>
Cc: Mark Pearson <mpearson-lenovo@squebb.ca>
Cc: Denis Benato <benato.denis96@gmail.com>
Cc: Merthan Karakaş <m3rthn.k@gmail.com>
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
 drivers/pci/pci-driver.c | 39 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 0c5bdb8c2c07b..57eb129d57244 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -1141,6 +1141,8 @@ static int pci_pm_poweroff(struct device *dev)
 	struct pci_dev *pci_dev = to_pci_dev(dev);
 	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
 
+	pci_dev->skip_bus_pm = false;
+
 	if (pci_has_legacy_pm_support(pci_dev))
 		return pci_legacy_suspend(dev, PMSG_HIBERNATE);
 
@@ -1204,8 +1206,35 @@ static int pci_pm_poweroff_noirq(struct device *dev)
 			return error;
 	}
 
-	if (!pci_dev->state_saved && !pci_has_subordinate(pci_dev))
-		pci_prepare_to_sleep(pci_dev);
+	if (!pci_dev->state_saved) {
+		pci_save_state(pci_dev);
+
+		/*
+		 * If the device is a bridge with a child in D0 below it,
+		 * it needs to stay in D0, so check skip_bus_pm to avoid
+		 * putting it into a low-power state in that case.
+		 */
+		if (!pci_dev->skip_bus_pm && pci_power_manageable(pci_dev))
+			pci_prepare_to_sleep(pci_dev);
+	}
+
+	if (pci_dev->current_state == PCI_D0) {
+		pci_dev->skip_bus_pm = true;
+		/*
+		 * Per PCI PM r1.2, table 6-1, a bridge must be in D0 if any
+		 * downstream device is in D0, so avoid changing the power state
+		 * of the parent bridge by setting the skip_bus_pm flag for it.
+		 */
+		if (pci_dev->bus->self)
+			pci_dev->bus->self->skip_bus_pm = true;
+	}
+
+	if (pci_dev->skip_bus_pm && pm_suspend_no_platform()) {
+		pci_dbg(pci_dev, "PCI PM: Skipped\n");
+		goto Fixup;
+	}
+
+	pci_pm_set_unknown_state(pci_dev);
 
 	/*
 	 * The reason for doing this here is the same as for the analogous code
@@ -1214,6 +1243,7 @@ static int pci_pm_poweroff_noirq(struct device *dev)
 	if (pci_dev->class == PCI_CLASS_SERIAL_USB_EHCI)
 		pci_write_config_word(pci_dev, PCI_COMMAND, 0);
 
+Fixup:
 	pci_fixup_device(pci_fixup_suspend_late, pci_dev);
 
 	return 0;
@@ -1223,10 +1253,15 @@ static int pci_pm_restore_noirq(struct device *dev)
 {
 	struct pci_dev *pci_dev = to_pci_dev(dev);
 	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
+	pci_power_t prev_state = pci_dev->current_state;
+	bool skip_bus_pm = pci_dev->skip_bus_pm;
 
 	pci_pm_default_resume_early(pci_dev);
 	pci_fixup_device(pci_fixup_resume_early, pci_dev);
 
+	if (!skip_bus_pm && prev_state == PCI_D3cold)
+		pci_pm_bridge_power_up_actions(pci_dev);
+
 	if (pci_has_legacy_pm_support(pci_dev))
 		return 0;
 
-- 
2.43.0


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH v2 3/3] drm/amd: Avoid evicting resources at S5
  2025-05-14 19:34 [PATCH v2 0/3] Improvements to S5 power consumption Mario Limonciello
  2025-05-14 19:34 ` [PATCH v2 1/3] PM: Use hibernate flows for system power off Mario Limonciello
  2025-05-14 19:34 ` [PATCH v2 2/3] PCI: Put PCIe ports with downstream devices into D3 at hibernate Mario Limonciello
@ 2025-05-14 19:34 ` Mario Limonciello
  2 siblings, 0 replies; 8+ messages in thread
From: Mario Limonciello @ 2025-05-14 19:34 UTC (permalink / raw)
  To: Rafael J . Wysocki, Alex Deucher, Bjorn Helgaas
  Cc: open list:RADEON and AMDGPU DRM DRIVERS,
	open list:HIBERNATION (aka Software Suspend, aka swsusp),
	open list:PCI SUBSYSTEM, open list, Mario Limonciello, AceLan Kao,
	Kai-Heng Feng, Mark Pearson, Denis Benato, Merthan Karakaş

From: Mario Limonciello <mario.limonciello@amd.com>

Normally resources are evicted on dGPUs at suspend or hibernate and
on APUs at hibernate.  These steps are unnecessary when using the S4
callbacks to put the system into S5.

Cc: AceLan Kao <acelan.kao@canonical.com>
Cc: Kai-Heng Feng <kaihengf@nvidia.com>
Cc: Mark Pearson <mpearson-lenovo@squebb.ca>
Cc: Denis Benato <benato.denis96@gmail.com>
Cc: Merthan Karakaş <m3rthn.k@gmail.com>
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 4d1b54f58495a..ea1385b6d894f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -4960,6 +4960,10 @@ static int amdgpu_device_evict_resources(struct amdgpu_device *adev)
 	if (!adev->in_s4 && (adev->flags & AMD_IS_APU))
 		return 0;
 
+	/* No need to evict when going to S5 through S4 callbacks */
+	if (system_state == SYSTEM_HALT || system_state == SYSTEM_POWER_OFF)
+		return 0;
+
 	ret = amdgpu_ttm_evict_resources(adev, TTM_PL_VRAM);
 	if (ret)
 		DRM_WARN("evicting device resources failed\n");
-- 
2.43.0


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH v2 1/3] PM: Use hibernate flows for system power off
  2025-05-14 19:34 ` [PATCH v2 1/3] PM: Use hibernate flows for system power off Mario Limonciello
@ 2025-05-16 14:58   ` Rafael J. Wysocki
  2025-05-16 19:33     ` Mario Limonciello
  0 siblings, 1 reply; 8+ messages in thread
From: Rafael J. Wysocki @ 2025-05-16 14:58 UTC (permalink / raw)
  To: Mario Limonciello
  Cc: Rafael J . Wysocki, Alex Deucher, Bjorn Helgaas,
	open list:RADEON and AMDGPU DRM DRIVERS,
	open list:HIBERNATION (aka Software Suspend, aka swsusp),
	open list:PCI SUBSYSTEM, open list, Mario Limonciello, AceLan Kao,
	Kai-Heng Feng, Mark Pearson, Merthan Karakaş, Denis Benato

On Wed, May 14, 2025 at 9:34 PM Mario Limonciello <superm1@kernel.org> wrote:
>
> From: Mario Limonciello <mario.limonciello@amd.com>
>
> When the system is powered off the kernel will call device_shutdown()
> which will issue callbacks into PCI core to wake up a device and call
> it's shutdown() callback.  This will leave devices in ACPI D0 which can
> cause some devices to misbehave with spurious wakeups and also leave some
> devices on which will consume power needlessly.
>
> The issue won't happen if the device is in D3 before system shutdown, so
> putting device to low power state before shutdown solves the issue.
>
> ACPI Spec 6.5, "7.4.2.5 System \_S4 State" says "Devices states are
> compatible with the current Power Resource states. In other words, all
> devices are in the D3 state when the system state is S4."
>
> The following "7.4.2.6 System \_S5 State (Soft Off)" states "The S5
> state is similar to the S4 state except that OSPM does not save any
> context." so it's safe to assume devices should be at D3 for S5.
>
> To accomplish this, modify the PM core to call all the device hibernate
> callbacks when turning off the system when the kernel is compiled with
> hibernate support. If compiled without hibernate support or hibernate fails
> fall back into the previous shutdown flow.
>
> Cc: AceLan Kao <acelan.kao@canonical.com>
> Cc: Kai-Heng Feng <kaihengf@nvidia.com>
> Cc: Mark Pearson <mpearson-lenovo@squebb.ca>
> Cc: Merthan Karakaş <m3rthn.k@gmail.com>
> Tested-by: Denis Benato <benato.denis96@gmail.com>
> Link: https://lore.kernel.org/linux-pci/20231213182656.6165-1-mario.limonciello@amd.com/
> Link: https://lore.kernel.org/linux-pci/20250506041934.1409302-1-superm1@kernel.org/
> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
> ---
> v2:
>  * Handle failures to hibernate (fall back to shutdown)
>  * Don't use dedicated events
>  * Only allow under CONFIG_HIBERNATE_CALLBACKS
> ---
>  kernel/reboot.c | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
>
> diff --git a/kernel/reboot.c b/kernel/reboot.c
> index ec087827c85cd..52f5e6e36a6f8 100644
> --- a/kernel/reboot.c
> +++ b/kernel/reboot.c
> @@ -13,6 +13,7 @@
>  #include <linux/kexec.h>
>  #include <linux/kmod.h>
>  #include <linux/kmsg_dump.h>
> +#include <linux/pm.h>
>  #include <linux/reboot.h>
>  #include <linux/suspend.h>
>  #include <linux/syscalls.h>
> @@ -305,6 +306,17 @@ static void kernel_shutdown_prepare(enum system_states state)
>                 (state == SYSTEM_HALT) ? SYS_HALT : SYS_POWER_OFF, NULL);
>         system_state = state;
>         usermodehelper_disable();
> +#ifdef CONFIG_HIBERNATE_CALLBACKS
> +       if (dpm_suspend_start(PMSG_HIBERNATE))
> +               goto resume_devices;

A failure of one device may trigger a cascade of failures when trying
to resume devices and it is not even necessary to resume the ones that
have been powered off successfully.

IMV this should just ignore errors during the processing of devices,
so maybe introduce PMSG_POWEROFF for it?

It should also ignore wakeup events that occur while devices are powered off.

> +       if (dpm_suspend_end(PMSG_HIBERNATE))
> +               goto resume_devices;
> +       return;
> +
> +resume_devices:
> +       pr_emerg("Failed to power off devices, using shutdown instead.\n");
> +       dpm_resume_end(PMSG_RESTORE);

Unfortunately, PMSG_RESTORE is not the right resume action for
PMSG_HIBERNATE because it may not power-up things (some drivers assume
that the restore kernel will power-up devices and so they don't do it
in "restore" callbacks).

I do realize that hibernation uses it to reverse PMSG_HIBERNATE, but
it should not do that either.  That may be fixed later, though.

> +#endif
>         device_shutdown();
>  }
>  /**
> --

I'd prefer to get back to this series after the 6.16 merge window
starts.  It is sort of last minute for 6.16 and it is far from ready
IMV.

Thanks!

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v2 1/3] PM: Use hibernate flows for system power off
  2025-05-16 14:58   ` Rafael J. Wysocki
@ 2025-05-16 19:33     ` Mario Limonciello
  2025-05-16 19:53       ` Rafael J. Wysocki
  0 siblings, 1 reply; 8+ messages in thread
From: Mario Limonciello @ 2025-05-16 19:33 UTC (permalink / raw)
  To: Rafael J. Wysocki
  Cc: Alex Deucher, Bjorn Helgaas,
	open list:RADEON and AMDGPU DRM DRIVERS,
	open list:HIBERNATION (aka Software Suspend, aka swsusp),
	open list:PCI SUBSYSTEM, open list, Mario Limonciello, AceLan Kao,
	Kai-Heng Feng, Mark Pearson, Merthan Karakaş, Denis Benato

On 5/16/2025 9:58 AM, Rafael J. Wysocki wrote:
> On Wed, May 14, 2025 at 9:34 PM Mario Limonciello <superm1@kernel.org> wrote:
>>
>> From: Mario Limonciello <mario.limonciello@amd.com>
>>
>> When the system is powered off the kernel will call device_shutdown()
>> which will issue callbacks into PCI core to wake up a device and call
>> it's shutdown() callback.  This will leave devices in ACPI D0 which can
>> cause some devices to misbehave with spurious wakeups and also leave some
>> devices on which will consume power needlessly.
>>
>> The issue won't happen if the device is in D3 before system shutdown, so
>> putting device to low power state before shutdown solves the issue.
>>
>> ACPI Spec 6.5, "7.4.2.5 System \_S4 State" says "Devices states are
>> compatible with the current Power Resource states. In other words, all
>> devices are in the D3 state when the system state is S4."
>>
>> The following "7.4.2.6 System \_S5 State (Soft Off)" states "The S5
>> state is similar to the S4 state except that OSPM does not save any
>> context." so it's safe to assume devices should be at D3 for S5.
>>
>> To accomplish this, modify the PM core to call all the device hibernate
>> callbacks when turning off the system when the kernel is compiled with
>> hibernate support. If compiled without hibernate support or hibernate fails
>> fall back into the previous shutdown flow.
>>
>> Cc: AceLan Kao <acelan.kao@canonical.com>
>> Cc: Kai-Heng Feng <kaihengf@nvidia.com>
>> Cc: Mark Pearson <mpearson-lenovo@squebb.ca>
>> Cc: Merthan Karakaş <m3rthn.k@gmail.com>
>> Tested-by: Denis Benato <benato.denis96@gmail.com>
>> Link: https://lore.kernel.org/linux-pci/20231213182656.6165-1-mario.limonciello@amd.com/
>> Link: https://lore.kernel.org/linux-pci/20250506041934.1409302-1-superm1@kernel.org/
>> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
>> ---
>> v2:
>>   * Handle failures to hibernate (fall back to shutdown)
>>   * Don't use dedicated events
>>   * Only allow under CONFIG_HIBERNATE_CALLBACKS
>> ---
>>   kernel/reboot.c | 12 ++++++++++++
>>   1 file changed, 12 insertions(+)
>>
>> diff --git a/kernel/reboot.c b/kernel/reboot.c
>> index ec087827c85cd..52f5e6e36a6f8 100644
>> --- a/kernel/reboot.c
>> +++ b/kernel/reboot.c
>> @@ -13,6 +13,7 @@
>>   #include <linux/kexec.h>
>>   #include <linux/kmod.h>
>>   #include <linux/kmsg_dump.h>
>> +#include <linux/pm.h>
>>   #include <linux/reboot.h>
>>   #include <linux/suspend.h>
>>   #include <linux/syscalls.h>
>> @@ -305,6 +306,17 @@ static void kernel_shutdown_prepare(enum system_states state)
>>                  (state == SYSTEM_HALT) ? SYS_HALT : SYS_POWER_OFF, NULL);
>>          system_state = state;
>>          usermodehelper_disable();
>> +#ifdef CONFIG_HIBERNATE_CALLBACKS
>> +       if (dpm_suspend_start(PMSG_HIBERNATE))
>> +               goto resume_devices;
> 
> A failure of one device may trigger a cascade of failures when trying
> to resume devices and it is not even necessary to resume the ones that
> have been powered off successfully.

Right it "shouldn't" be necessary, but I wanted to make sure that we had 
a clean (expected) slate going into device_shutdown().

Otherwise drivers might not have been prepared to go right from 
poweroff() to shutdown() callbacks.

> 
> IMV this should just ignore errors during the processing of devices,
> so maybe introduce PMSG_POWEROFF for it?

Hmm - I guess it depends upon the failures that occurred.  I'll start 
plumbing a new message and see how it looks.

I don't "think" we can safely call dpm_suspend_end() if 
dpm_suspend_start() failed though.

> 
> It should also ignore wakeup events that occur while devices are powered off.
> 
>> +       if (dpm_suspend_end(PMSG_HIBERNATE))
>> +               goto resume_devices;
>> +       return;
>> +
>> +resume_devices:
>> +       pr_emerg("Failed to power off devices, using shutdown instead.\n");
>> +       dpm_resume_end(PMSG_RESTORE);
> 
> Unfortunately, PMSG_RESTORE is not the right resume action for
> PMSG_HIBERNATE because it may not power-up things (some drivers assume
> that the restore kernel will power-up devices and so they don't do it
> in "restore" callbacks).
> 
> I do realize that hibernation uses it to reverse PMSG_HIBERNATE, but
> it should not do that either.  That may be fixed later, though.
> 
>> +#endif
>>          device_shutdown();
>>   }
>>   /**
>> --
> 
> I'd prefer to get back to this series after the 6.16 merge window
> starts.  It is sort of last minute for 6.16 and it is far from ready
> IMV.

Sure, I'll get a start on your feedback above and submit a fixed up 
version after the merge window.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v2 1/3] PM: Use hibernate flows for system power off
  2025-05-16 19:33     ` Mario Limonciello
@ 2025-05-16 19:53       ` Rafael J. Wysocki
  0 siblings, 0 replies; 8+ messages in thread
From: Rafael J. Wysocki @ 2025-05-16 19:53 UTC (permalink / raw)
  To: Mario Limonciello
  Cc: Rafael J. Wysocki, Alex Deucher, Bjorn Helgaas,
	open list:RADEON and AMDGPU DRM DRIVERS,
	open list:HIBERNATION (aka Software Suspend, aka swsusp),
	open list:PCI SUBSYSTEM, open list, Mario Limonciello, AceLan Kao,
	Kai-Heng Feng, Mark Pearson, Merthan Karakaş, Denis Benato

On Fri, May 16, 2025 at 9:33 PM Mario Limonciello <superm1@kernel.org> wrote:
>
> On 5/16/2025 9:58 AM, Rafael J. Wysocki wrote:
> > On Wed, May 14, 2025 at 9:34 PM Mario Limonciello <superm1@kernel.org> wrote:
> >>
> >> From: Mario Limonciello <mario.limonciello@amd.com>
> >>
> >> When the system is powered off the kernel will call device_shutdown()
> >> which will issue callbacks into PCI core to wake up a device and call
> >> it's shutdown() callback.  This will leave devices in ACPI D0 which can
> >> cause some devices to misbehave with spurious wakeups and also leave some
> >> devices on which will consume power needlessly.
> >>
> >> The issue won't happen if the device is in D3 before system shutdown, so
> >> putting device to low power state before shutdown solves the issue.
> >>
> >> ACPI Spec 6.5, "7.4.2.5 System \_S4 State" says "Devices states are
> >> compatible with the current Power Resource states. In other words, all
> >> devices are in the D3 state when the system state is S4."
> >>
> >> The following "7.4.2.6 System \_S5 State (Soft Off)" states "The S5
> >> state is similar to the S4 state except that OSPM does not save any
> >> context." so it's safe to assume devices should be at D3 for S5.
> >>
> >> To accomplish this, modify the PM core to call all the device hibernate
> >> callbacks when turning off the system when the kernel is compiled with
> >> hibernate support. If compiled without hibernate support or hibernate fails
> >> fall back into the previous shutdown flow.
> >>
> >> Cc: AceLan Kao <acelan.kao@canonical.com>
> >> Cc: Kai-Heng Feng <kaihengf@nvidia.com>
> >> Cc: Mark Pearson <mpearson-lenovo@squebb.ca>
> >> Cc: Merthan Karakaş <m3rthn.k@gmail.com>
> >> Tested-by: Denis Benato <benato.denis96@gmail.com>
> >> Link: https://lore.kernel.org/linux-pci/20231213182656.6165-1-mario.limonciello@amd.com/
> >> Link: https://lore.kernel.org/linux-pci/20250506041934.1409302-1-superm1@kernel.org/
> >> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
> >> ---
> >> v2:
> >>   * Handle failures to hibernate (fall back to shutdown)
> >>   * Don't use dedicated events
> >>   * Only allow under CONFIG_HIBERNATE_CALLBACKS
> >> ---
> >>   kernel/reboot.c | 12 ++++++++++++
> >>   1 file changed, 12 insertions(+)
> >>
> >> diff --git a/kernel/reboot.c b/kernel/reboot.c
> >> index ec087827c85cd..52f5e6e36a6f8 100644
> >> --- a/kernel/reboot.c
> >> +++ b/kernel/reboot.c
> >> @@ -13,6 +13,7 @@
> >>   #include <linux/kexec.h>
> >>   #include <linux/kmod.h>
> >>   #include <linux/kmsg_dump.h>
> >> +#include <linux/pm.h>
> >>   #include <linux/reboot.h>
> >>   #include <linux/suspend.h>
> >>   #include <linux/syscalls.h>
> >> @@ -305,6 +306,17 @@ static void kernel_shutdown_prepare(enum system_states state)
> >>                  (state == SYSTEM_HALT) ? SYS_HALT : SYS_POWER_OFF, NULL);
> >>          system_state = state;
> >>          usermodehelper_disable();
> >> +#ifdef CONFIG_HIBERNATE_CALLBACKS
> >> +       if (dpm_suspend_start(PMSG_HIBERNATE))
> >> +               goto resume_devices;
> >
> > A failure of one device may trigger a cascade of failures when trying
> > to resume devices and it is not even necessary to resume the ones that
> > have been powered off successfully.
>
> Right it "shouldn't" be necessary, but I wanted to make sure that we had
> a clean (expected) slate going into device_shutdown().
>
> Otherwise drivers might not have been prepared to go right from
> poweroff() to shutdown() callbacks.
>
> >
> > IMV this should just ignore errors during the processing of devices,
> > so maybe introduce PMSG_POWEROFF for it?
>
> Hmm - I guess it depends upon the failures that occurred.  I'll start
> plumbing a new message and see how it looks.
>
> I don't "think" we can safely call dpm_suspend_end() if
> dpm_suspend_start() failed though.

Nothing is safe at this point when dpm_suspend_start() fails, so why
not just continue.  Hopefully, it'll get to the point when power can
be turned off and then it won't matter too much anyway.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v2 2/3] PCI: Put PCIe ports with downstream devices into D3 at hibernate
  2025-05-14 19:34 ` [PATCH v2 2/3] PCI: Put PCIe ports with downstream devices into D3 at hibernate Mario Limonciello
@ 2025-05-18  6:20   ` Lukas Wunner
  0 siblings, 0 replies; 8+ messages in thread
From: Lukas Wunner @ 2025-05-18  6:20 UTC (permalink / raw)
  To: Mario Limonciello
  Cc: Rafael J . Wysocki, Alex Deucher, Bjorn Helgaas,
	open list:RADEON and AMDGPU DRM DRIVERS,
	open list:HIBERNATION (aka Software Suspend, aka swsusp),
	open list:PCI SUBSYSTEM, open list, Mario Limonciello, AceLan Kao,
	Kai-Heng Feng, Mark Pearson, Denis Benato, Merthan Karaka??

On Wed, May 14, 2025 at 02:34:05PM -0500, Mario Limonciello wrote:
> Adjust the pci_pm_poweroff_noirq() to follow the same flow as
> pci_pm_suspend_noirq() in that PCIe ports that are power manageable should

Nit: s/should//

> without downstream devices in D0 should be put into their appropriate
> sleep state.

This leads to a lot of code duplication between pci_pm_suspend_noirq()
and pci_pm_poweroff_noirq().  Can the common portion of the code be moved
to a helper invoked by both functions so that it's easier to follow the
logic and understand common and differing parts of the suspend flow?

Thanks,

Lukas

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2025-05-18  6:20 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-14 19:34 [PATCH v2 0/3] Improvements to S5 power consumption Mario Limonciello
2025-05-14 19:34 ` [PATCH v2 1/3] PM: Use hibernate flows for system power off Mario Limonciello
2025-05-16 14:58   ` Rafael J. Wysocki
2025-05-16 19:33     ` Mario Limonciello
2025-05-16 19:53       ` Rafael J. Wysocki
2025-05-14 19:34 ` [PATCH v2 2/3] PCI: Put PCIe ports with downstream devices into D3 at hibernate Mario Limonciello
2025-05-18  6:20   ` Lukas Wunner
2025-05-14 19:34 ` [PATCH v2 3/3] drm/amd: Avoid evicting resources at S5 Mario Limonciello

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).