lkml.org 
[lkml]   [2021]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 12/21] m68k: Switch to new sys-off handler API
    Date
    Kernel now supports chained power-off handlers. Use
    register_power_off_handler() that registers power-off handlers and
    do_kernel_power_off() that invokes chained power-off handlers. Legacy
    pm_power_off() will be removed once all drivers will be converted to
    the new power-off API.

    Normally arch code should adopt only the do_kernel_power_off() at first,
    but m68k is a special case because it uses pm_power_off() "inside out",
    i.e. pm_power_off() invokes machine_power_off() [in fact it does nothing],
    while it's machine_power_off() that should invoke the pm_power_off(), and
    thus, we can't convert platforms to the new API separately. There are only
    two platforms changed here, so it's not a big deal.

    Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
    ---
    arch/m68k/emu/natfeat.c | 3 ++-
    arch/m68k/include/asm/machdep.h | 1 -
    arch/m68k/kernel/process.c | 5 ++---
    arch/m68k/kernel/setup_mm.c | 1 -
    arch/m68k/kernel/setup_no.c | 1 -
    arch/m68k/mac/config.c | 4 +++-
    6 files changed, 7 insertions(+), 8 deletions(-)

    diff --git a/arch/m68k/emu/natfeat.c b/arch/m68k/emu/natfeat.c
    index 71b78ecee75c..b19dc00026d9 100644
    --- a/arch/m68k/emu/natfeat.c
    +++ b/arch/m68k/emu/natfeat.c
    @@ -15,6 +15,7 @@
    #include <linux/string.h>
    #include <linux/kernel.h>
    #include <linux/module.h>
    +#include <linux/reboot.h>
    #include <linux/io.h>
    #include <asm/machdep.h>
    #include <asm/natfeat.h>
    @@ -90,5 +91,5 @@ void __init nf_init(void)
    pr_info("NatFeats found (%s, %lu.%lu)\n", buf, version >> 16,
    version & 0xffff);

    - mach_power_off = nf_poweroff;
    + register_platform_power_off(nf_poweroff);
    }
    diff --git a/arch/m68k/include/asm/machdep.h b/arch/m68k/include/asm/machdep.h
    index 8fd80ef1b77e..8d8c3ee2069f 100644
    --- a/arch/m68k/include/asm/machdep.h
    +++ b/arch/m68k/include/asm/machdep.h
    @@ -24,7 +24,6 @@ extern int (*mach_get_rtc_pll)(struct rtc_pll_info *);
    extern int (*mach_set_rtc_pll)(struct rtc_pll_info *);
    extern void (*mach_reset)( void );
    extern void (*mach_halt)( void );
    -extern void (*mach_power_off)( void );
    extern unsigned long (*mach_hd_init) (unsigned long, unsigned long);
    extern void (*mach_hd_setup)(char *, int *);
    extern void (*mach_heartbeat) (int);
    diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c
    index a6030dbaa089..e160a7c57bd3 100644
    --- a/arch/m68k/kernel/process.c
    +++ b/arch/m68k/kernel/process.c
    @@ -67,12 +67,11 @@ void machine_halt(void)

    void machine_power_off(void)
    {
    - if (mach_power_off)
    - mach_power_off();
    + do_kernel_power_off();
    for (;;);
    }

    -void (*pm_power_off)(void) = machine_power_off;
    +void (*pm_power_off)(void);
    EXPORT_SYMBOL(pm_power_off);

    void show_regs(struct pt_regs * regs)
    diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c
    index 49e573b94326..a3ff1342ced7 100644
    --- a/arch/m68k/kernel/setup_mm.c
    +++ b/arch/m68k/kernel/setup_mm.c
    @@ -98,7 +98,6 @@ EXPORT_SYMBOL(mach_get_rtc_pll);
    EXPORT_SYMBOL(mach_set_rtc_pll);
    void (*mach_reset)( void );
    void (*mach_halt)( void );
    -void (*mach_power_off)( void );
    #ifdef CONFIG_HEARTBEAT
    void (*mach_heartbeat) (int);
    EXPORT_SYMBOL(mach_heartbeat);
    diff --git a/arch/m68k/kernel/setup_no.c b/arch/m68k/kernel/setup_no.c
    index 5e4104f07a44..00bf82258233 100644
    --- a/arch/m68k/kernel/setup_no.c
    +++ b/arch/m68k/kernel/setup_no.c
    @@ -55,7 +55,6 @@ int (*mach_hwclk) (int, struct rtc_time*);
    /* machine dependent reboot functions */
    void (*mach_reset)(void);
    void (*mach_halt)(void);
    -void (*mach_power_off)(void);

    #ifdef CONFIG_M68000
    #if defined(CONFIG_M68328)
    diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
    index 5d16f9b47aa9..727320dedf08 100644
    --- a/arch/m68k/mac/config.c
    +++ b/arch/m68k/mac/config.c
    @@ -12,6 +12,7 @@

    #include <linux/errno.h>
    #include <linux/module.h>
    +#include <linux/reboot.h>
    #include <linux/types.h>
    #include <linux/mm.h>
    #include <linux/tty.h>
    @@ -139,7 +140,6 @@ void __init config_mac(void)
    mach_hwclk = mac_hwclk;
    mach_reset = mac_reset;
    mach_halt = mac_poweroff;
    - mach_power_off = mac_poweroff;
    #if IS_ENABLED(CONFIG_INPUT_M68K_BEEP)
    mach_beep = mac_mksound;
    #endif
    @@ -159,6 +159,8 @@ void __init config_mac(void)

    if (macintosh_config->ident == MAC_MODEL_IICI)
    mach_l2_flush = via_l2_flush;
    +
    + register_platform_power_off(mac_poweroff);
    }


    --
    2.33.1
    \
     
     \ /
      Last update: 2021-12-12 22:23    [W:7.150 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site