Skip to contentSkip to conversation

PM: hibernate: Use kernel_can_power_off()

PATCH Applied Dmitry Osipenko 2 participants 2 messages Jun 17, 2022 – Jun 21, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PM: hibernate: Use kernel_can_power_off()

Use new kernel_can_power_off() API instead of legacy pm_power_off global variable to fix regressed hibernation to disk where machine no longer powers off when it should because ACPI power driver transitioned to the new sys-off based API and it doesn't use pm_power_off anymore.

Fixes 98f30d0ecf79 ("ACPI: power: Switch to sys-off handler API")
---
 kernel/power/hibernate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/power/hibernate.c +1 -1
index 20a66bf9f465..89c71fce225d 100644
@@ -665,7 +665,7 @@ static void power_down(void)
 		hibernation_platform_enter();
 		fallthrough;
 	case HIBERNATION_SHUTDOWN:
-		if (pm_power_off)
+		if (kernel_can_power_off())
 			kernel_power_off();
 		break;
 	}
Signature · 1 line
2.35.3
maintainer Applied
#1 lore raw
Quoted 19 lines · Dmitry Osipenko

Use new kernel_can_power_off() API instead of legacy pm_power_off global variable to fix regressed hibernation to disk where machine no longer powers off when it should because ACPI power driver transitioned to the new sys-off based API and it doesn't use pm_power_off anymore.

Fixes 98f30d0ecf79 ("ACPI: power: Switch to sys-off handler API")
---
 kernel/power/hibernate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/power/hibernate.c +0 -0
index 20a66bf9f465..89c71fce225d 100644

kernel/power/hibernate.c static void power_down(void)

Quoted 9 lines
kernel/power/hibernate.c +1 -2
@@ -665,7 +665,7 @@ static void power_down(void)
                hibernation_platform_enter();
                fallthrough;
        case HIBERNATION_SHUTDOWN:
-               if (pm_power_off)
+               if (kernel_can_power_off())
                        kernel_power_off();
                break;
        }
--

Applied as 5.19-rc material, thanks!