ARM: HYP/non-sec: add a barrier after setting SCR.NS==1

A CP15 instruction execution can be reordered, requiring an
isb to be sure it is executed in program order.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
master
Marc Zyngier 11 years ago committed by Albert ARIBAUD
parent c19e0dd741
commit 800c83522c
  1. 1
      arch/arm/cpu/armv7/nonsec_virt.S

@ -46,6 +46,7 @@ _secure_monitor:
#endif #endif
mcr p15, 0, r1, c1, c1, 0 @ write SCR (with NS bit set) mcr p15, 0, r1, c1, c1, 0 @ write SCR (with NS bit set)
isb
#ifdef CONFIG_ARMV7_VIRT #ifdef CONFIG_ARMV7_VIRT
mrceq p15, 0, r0, c12, c0, 1 @ get MVBAR value mrceq p15, 0, r0, c12, c0, 1 @ get MVBAR value

Loading…
Cancel
Save