lkml.org 
[lkml]   [2021]   [Mar]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 35/41] powerpc/32: Return directly from power_save_ppc32_restore()
    Date
    transfer_to_handler_cont: is now just a blr.

    Directly perform blr in power_save_ppc32_restore().

    Also remove useless setting of r11 in e500 version of
    power_save_ppc32_restore().

    Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
    ---
    arch/powerpc/kernel/entry_32.S | 3 ---
    arch/powerpc/kernel/idle_6xx.S | 2 +-
    arch/powerpc/kernel/idle_e500.S | 10 +---------
    3 files changed, 2 insertions(+), 13 deletions(-)

    diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
    index 46b3854e7318..b9a2935efec1 100644
    --- a/arch/powerpc/kernel/entry_32.S
    +++ b/arch/powerpc/kernel/entry_32.S
    @@ -67,8 +67,6 @@ prepare_transfer_to_handler:
    bt- 31-TLF_NAPPING,4f
    bt- 31-TLF_SLEEPING,7f
    #endif /* CONFIG_PPC_BOOK3S_32 || CONFIG_E500 */
    - .globl transfer_to_handler_cont
    -transfer_to_handler_cont:
    blr

    #if defined (CONFIG_PPC_BOOK3S_32) || defined(CONFIG_E500)
    @@ -86,7 +84,6 @@ transfer_to_handler_cont:
    b fast_exception_return
    #endif
    _ASM_NOKPROBE_SYMBOL(prepare_transfer_to_handler)
    -_ASM_NOKPROBE_SYMBOL(transfer_to_handler_cont)

    .globl transfer_to_syscall
    transfer_to_syscall:
    diff --git a/arch/powerpc/kernel/idle_6xx.S b/arch/powerpc/kernel/idle_6xx.S
    index 153366e178c4..13cad9297d82 100644
    --- a/arch/powerpc/kernel/idle_6xx.S
    +++ b/arch/powerpc/kernel/idle_6xx.S
    @@ -176,7 +176,7 @@ BEGIN_FTR_SECTION
    lwz r9,nap_save_hid1@l(r9)
    mtspr SPRN_HID1, r9
    END_FTR_SECTION_IFSET(CPU_FTR_DUAL_PLL_750FX)
    - b transfer_to_handler_cont
    + blr
    _ASM_NOKPROBE_SYMBOL(power_save_ppc32_restore)

    .data
    diff --git a/arch/powerpc/kernel/idle_e500.S b/arch/powerpc/kernel/idle_e500.S
    index 7795727e7f08..9e1bc4502c50 100644
    --- a/arch/powerpc/kernel/idle_e500.S
    +++ b/arch/powerpc/kernel/idle_e500.S
    @@ -81,13 +81,5 @@ END_FTR_SECTION_IFSET(CPU_FTR_CAN_NAP)
    _GLOBAL(power_save_ppc32_restore)
    lwz r9,_LINK(r11) /* interrupted in e500_idle */
    stw r9,_NIP(r11) /* make it do a blr */
    -
    -#ifdef CONFIG_SMP
    - lwz r11,TASK_CPU(r2) /* get cpu number * 4 */
    - slwi r11,r11,2
    -#else
    - li r11,0
    -#endif
    -
    - b transfer_to_handler_cont
    + blr
    _ASM_NOKPROBE_SYMBOL(power_save_ppc32_restore)
    --
    2.25.0
    \
     
     \ /
      Last update: 2021-03-12 14:09    [W:4.603 / U:0.244 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site