lkml.org 
[lkml]   [2017]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 05/20] arm64: mm: Rename post_ttbr0_update_workaround
    Date
    The post_ttbr0_update_workaround hook applies to any change to TTBRx_EL1.
    Since we're using TTBR1 for the ASID, rename the hook to make it clearer
    as to what it's doing.

    Reviewed-by: Mark Rutland <mark.rutland@arm.com>
    Signed-off-by: Will Deacon <will.deacon@arm.com>
    ---
    arch/arm64/include/asm/assembler.h | 5 ++---
    arch/arm64/kernel/entry.S | 2 +-
    arch/arm64/mm/proc.S | 2 +-
    3 files changed, 4 insertions(+), 5 deletions(-)

    diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h
    index e1fa5db858b7..c45bc94f15d0 100644
    --- a/arch/arm64/include/asm/assembler.h
    +++ b/arch/arm64/include/asm/assembler.h
    @@ -477,10 +477,9 @@ alternative_endif
    .endm

    /*
    -/*
    - * Errata workaround post TTBR0_EL1 update.
    + * Errata workaround post TTBRx_EL1 update.
    */
    - .macro post_ttbr0_update_workaround
    + .macro post_ttbr_update_workaround
    #ifdef CONFIG_CAVIUM_ERRATUM_27456
    alternative_if ARM64_WORKAROUND_CAVIUM_27456
    ic iallu
    diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
    index 6d14b8f29b5f..804e43c9cb0b 100644
    --- a/arch/arm64/kernel/entry.S
    +++ b/arch/arm64/kernel/entry.S
    @@ -257,7 +257,7 @@ alternative_else_nop_endif
    * Cavium erratum 27456 (broadcast TLBI instructions may cause I-cache
    * corruption).
    */
    - post_ttbr0_update_workaround
    + post_ttbr_update_workaround
    .endif
    1:
    .if \el != 0
    diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
    index f2ff0837577c..3146dc96f05b 100644
    --- a/arch/arm64/mm/proc.S
    +++ b/arch/arm64/mm/proc.S
    @@ -145,7 +145,7 @@ ENTRY(cpu_do_switch_mm)
    isb
    msr ttbr0_el1, x0 // now update TTBR0
    isb
    - post_ttbr0_update_workaround
    + post_ttbr_update_workaround
    ret
    ENDPROC(cpu_do_switch_mm)

    --
    2.1.4
    \
     
     \ /
      Last update: 2017-12-06 13:41    [W:4.113 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site