浏览代码

ARM: pm: some ARMv7 requires a dsb in resume to ensure correctness

Add a dsb after the isb to ensure that the previous writes to the
CP15 registers take effect before we enable the MMU.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King 14 年之前
父节点
当前提交
f35235a315
共有 1 个文件被更改,包括 1 次插入0 次删除
  1. 1 0
      arch/arm/mm/proc-v7.S

+ 1 - 0
arch/arm/mm/proc-v7.S

@@ -255,6 +255,7 @@ ENTRY(cpu_v7_do_resume)
 	mcr	p15, 0, r4, c10, c2, 0	@ write PRRR
 	mcr	p15, 0, r4, c10, c2, 0	@ write PRRR
 	mcr	p15, 0, r5, c10, c2, 1	@ write NMRR
 	mcr	p15, 0, r5, c10, c2, 1	@ write NMRR
 	isb
 	isb
+	dsb
 	mov	r0, r9			@ control register
 	mov	r0, r9			@ control register
 	mov	r2, r7, lsr #14		@ get TTB0 base
 	mov	r2, r7, lsr #14		@ get TTB0 base
 	mov	r2, r2, lsl #14
 	mov	r2, r2, lsl #14