[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 14/20] x86: Use do_kernel_power_off()
 
- To: Thierry Reding <thierry.reding@xxxxxxxxx>,	Jonathan Hunter <jonathanh@xxxxxxxxxx>,	Russell King <linux@xxxxxxxxxxxxxxx>,	Catalin Marinas <catalin.marinas@xxxxxxx>,	Will Deacon <will@xxxxxxxxxx>,	Guo Ren <guoren@xxxxxxxxxx>,	Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>,	Greg Ungerer <gerg@xxxxxxxxxxxxxx>,	Joshua Thompson <funaho@xxxxxxxxx>,	Thomas Bogendoerfer <tsbogend@xxxxxxxxxxxxxxxx>,	Sebastian Reichel <sre@xxxxxxxxxx>,	Linus Walleij <linus.walleij@xxxxxxxxxx>,	Philipp Zabel <p.zabel@xxxxxxxxxxxxxx>,	Greentime Hu <green.hu@xxxxxxxxx>,	Vincent Chen <deanbo422@xxxxxxxxx>,	"James E.J. Bottomley" <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx>,	Helge Deller <deller@xxxxxx>,	Michael Ellerman <mpe@xxxxxxxxxxxxxx>,	Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>,	Paul Mackerras <paulus@xxxxxxxxx>,	Paul Walmsley <paul.walmsley@xxxxxxxxxx>,	Palmer Dabbelt <palmer@xxxxxxxxxxx>,	Albert Ou <aou@xxxxxxxxxxxxxxxxx>,	Yoshinori Sato <ysato@xxxxxxxxxxxxxxxxxxxx>,	Rich Felker <dalias@xxxxxxxx>,	Thomas Gleixner <tglx@xxxxxxxxxxxxx>,	Ingo Molnar <mingo@xxxxxxxxxx>,	Borislav Petkov <bp@xxxxxxxxx>,	Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>,	x86@xxxxxxxxxx,	"H. Peter Anvin" <hpa@xxxxxxxxx>,	Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>,	Juergen Gross <jgross@xxxxxxxx>,	Stefano Stabellini <sstabellini@xxxxxxxxxx>,	"Rafael J. Wysocki" <rafael@xxxxxxxxxx>,	Len Brown <lenb@xxxxxxxxxx>,	Santosh Shilimkar <ssantosh@xxxxxxxxxx>,	Krzysztof Kozlowski <krzk@xxxxxxxxxx>,	Liam Girdwood <lgirdwood@xxxxxxxxx>,	Mark Brown <broonie@xxxxxxxxxx>,	Pavel Machek <pavel@xxxxxx>,	Lee Jones <lee.jones@xxxxxxxxxx>,	Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>,	Guenter Roeck <linux@xxxxxxxxxxxx>,	Daniel Lezcano <daniel.lezcano@xxxxxxxxxx>,	Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>,	Ulf Hansson <ulf.hansson@xxxxxxxxxx>,	Michał Mirosław <mirq-linux@xxxxxxxxxxxx>
 
- From: Dmitry Osipenko <dmitry.osipenko@xxxxxxxxxxxxx>
 
- Date: Tue, 12 Apr 2022 02:38:26 +0300
 
- Cc: linux-kernel@xxxxxxxxxxxxxxx,	linux-csky@xxxxxxxxxxxxxxx,	linux-ia64@xxxxxxxxxxxxxxx,	linux-m68k@xxxxxxxxxxxxxxxxxxxx,	linux-mips@xxxxxxxxxxxxxxx,	linux-parisc@xxxxxxxxxxxxxxx,	linux-riscv@xxxxxxxxxxxxxxxxxxx,	linux-sh@xxxxxxxxxxxxxxx,	xen-devel@xxxxxxxxxxxxxxxxxxxx,	linux-acpi@xxxxxxxxxxxxxxx,	linux-pm@xxxxxxxxxxxxxxx,	linux-tegra@xxxxxxxxxxxxxxx
 
- Delivery-date: Tue, 12 Apr 2022 05:12:11 +0000
 
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
 
 
 
Kernel now supports chained power-off handlers. Use do_kernel_power_off()
that invokes chained power-off handlers. It also invokes legacy
pm_power_off() for now, which will be removed once all drivers will
be converted to the new power-off API.
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@xxxxxxxxxxxxx>
---
 arch/x86/kernel/reboot.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index fa700b46588e..c3636ea4aa71 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -739,10 +739,10 @@ static void native_machine_halt(void)
 
 static void native_machine_power_off(void)
 {
-       if (pm_power_off) {
+       if (kernel_can_power_off()) {
                if (!reboot_force)
                        machine_shutdown();
-               pm_power_off();
+               do_kernel_power_off();
        }
        /* A fallback in case there is no PM info available */
        tboot_shutdown(TB_SHUTDOWN_HALT);
-- 
2.35.1
 
    
     |