lkml.org 
[lkml]   [2015]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.18 071/151] MIPS: asm: pgtable: Add c0 hazards on HTW start/stop sequences
    Date
    3.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Markos Chandras <markos.chandras@imgtec.com>

    commit 461d1597ffad7a826f8aaa63ab0727c37b632e34 upstream.

    When we use htw_{start,stop}() outside of htw_reset(), we need
    to ensure that c0 changes have been propagated properly before
    we attempt to continue with subsequence memory operations.

    Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/9114/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/mips/include/asm/pgtable.h | 10 ++++++----
    1 file changed, 6 insertions(+), 4 deletions(-)

    --- a/arch/mips/include/asm/pgtable.h
    +++ b/arch/mips/include/asm/pgtable.h
    @@ -99,16 +99,20 @@ extern void paging_init(void);

    #define htw_stop() \
    do { \
    - if (cpu_has_htw) \
    + if (cpu_has_htw) { \
    write_c0_pwctl(read_c0_pwctl() & \
    ~(1 << MIPS_PWCTL_PWEN_SHIFT)); \
    + back_to_back_c0_hazard(); \
    + } \
    } while(0)

    #define htw_start() \
    do { \
    - if (cpu_has_htw) \
    + if (cpu_has_htw) { \
    write_c0_pwctl(read_c0_pwctl() | \
    (1 << MIPS_PWCTL_PWEN_SHIFT)); \
    + back_to_back_c0_hazard(); \
    + } \
    } while(0)


    @@ -116,9 +120,7 @@ do { \
    do { \
    if (cpu_has_htw) { \
    htw_stop(); \
    - back_to_back_c0_hazard(); \
    htw_start(); \
    - back_to_back_c0_hazard(); \
    } \
    } while(0)




    \
     
     \ /
      Last update: 2015-03-04 07:41    [W:2.856 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site