lkml.org 
[lkml]   [2020]   [Mar]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 08/12] powerpc/rtas: Remove machine_check_in_rtas()
    Date
    machine_check_in_rtas() is just a trap.

    Do the trap directly in the machine check exception handler.

    Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
    Acked-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
    ---
    arch/powerpc/kernel/entry_32.S | 6 ------
    arch/powerpc/kernel/head_32.S | 2 +-
    2 files changed, 1 insertion(+), 7 deletions(-)

    diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
    index a6371fb8f761..e652f6506888 100644
    --- a/arch/powerpc/kernel/entry_32.S
    +++ b/arch/powerpc/kernel/entry_32.S
    @@ -1391,10 +1391,4 @@ _GLOBAL(enter_rtas)
    mtspr SPRN_SRR0,r8
    mtspr SPRN_SRR1,r9
    RFI /* return to caller */
    -
    - .globl machine_check_in_rtas
    -machine_check_in_rtas:
    - twi 31,0,0
    - /* XXX load up BATs and panic */
    -
    #endif /* CONFIG_PPC_RTAS */
    diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
    index daaa153950c2..cbd30cac2496 100644
    --- a/arch/powerpc/kernel/head_32.S
    +++ b/arch/powerpc/kernel/head_32.S
    @@ -297,7 +297,7 @@ MachineCheck:
    cmpwi cr1, r4, 0
    #endif
    beq cr1, machine_check_tramp
    - b machine_check_in_rtas
    + twi 31, 0, 0
    #else
    b machine_check_tramp
    #endif
    --
    2.25.0
    \
     
     \ /
      Last update: 2020-03-31 18:05    [W:4.857 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site