Commit 461d1597 authored by Markos Chandras's avatar Markos Chandras Committed by Ralf Baechle

MIPS: asm: pgtable: Add c0 hazards on HTW start/stop sequences

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: default avatarMarkos Chandras <markos.chandras@imgtec.com>
Cc: <stable@vger.kernel.org> # 3.17+
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/9114/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent d79d853d
...@@ -99,16 +99,20 @@ extern void paging_init(void); ...@@ -99,16 +99,20 @@ extern void paging_init(void);
#define htw_stop() \ #define htw_stop() \
do { \ do { \
if (cpu_has_htw) \ if (cpu_has_htw) { \
write_c0_pwctl(read_c0_pwctl() & \ write_c0_pwctl(read_c0_pwctl() & \
~(1 << MIPS_PWCTL_PWEN_SHIFT)); \ ~(1 << MIPS_PWCTL_PWEN_SHIFT)); \
back_to_back_c0_hazard(); \
} \
} while(0) } while(0)
#define htw_start() \ #define htw_start() \
do { \ do { \
if (cpu_has_htw) \ if (cpu_has_htw) { \
write_c0_pwctl(read_c0_pwctl() | \ write_c0_pwctl(read_c0_pwctl() | \
(1 << MIPS_PWCTL_PWEN_SHIFT)); \ (1 << MIPS_PWCTL_PWEN_SHIFT)); \
back_to_back_c0_hazard(); \
} \
} while(0) } while(0)
...@@ -116,9 +120,7 @@ do { \ ...@@ -116,9 +120,7 @@ do { \
do { \ do { \
if (cpu_has_htw) { \ if (cpu_has_htw) { \
htw_stop(); \ htw_stop(); \
back_to_back_c0_hazard(); \
htw_start(); \ htw_start(); \
back_to_back_c0_hazard(); \
} \ } \
} while(0) } while(0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment