Revision: 14509
http://sourceforge.net/p/edk2/code/14509
Author: oliviermartin
Date: 2013-07-26 17:14:07 +0000 (Fri, 26 Jul 2013)
Log Message:
-----------
ArmPkg/ArmLib: Fixed TBLs invalidation in EL1
'tlb alle1' was used to invalidate the TLBs in EL1. Expect this instruction can
only
be invoked from EL2.
The correct instruction to invalidate TLBs in EL1 is 'tlbi vmalle1' - it
invalidates
the TLBs of the current VMID.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <[email protected]>
Modified Paths:
--------------
trunk/edk2/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S
trunk/edk2/ArmPkg/Library/ArmLib/Common/AArch64/ArmLibSupport.S
Modified: trunk/edk2/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S
===================================================================
--- trunk/edk2/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S 2013-07-26
17:13:08 UTC (rev 14508)
+++ trunk/edk2/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S 2013-07-26
17:14:07 UTC (rev 14509)
@@ -123,7 +123,7 @@
3: mrs x0, sctlr_el3 // Read System control register EL3
4: orr x0, x0, #CTRL_M_BIT // Set MMU enable bit
EL1_OR_EL2_OR_EL3(x1)
-1: tlbi alle1
+1: tlbi vmalle1
isb
msr sctlr_el1, x0 // Write back
b 4f
@@ -149,7 +149,7 @@
4: bic x0, x0, #CTRL_M_BIT // Clear MMU enable bit
EL1_OR_EL2_OR_EL3(x1)
1: msr sctlr_el1, x0 // Write back
- tlbi alle1
+ tlbi vmalle1
b 4f
2: msr sctlr_el2, x0 // Write back
tlbi alle2
@@ -441,7 +441,7 @@
ASM_PFX(ArmInvalidateInstructionAndDataTlb):
EL1_OR_EL2_OR_EL3(x0)
-1: tlbi alle1
+1: tlbi vmalle1
b 4f
2: tlbi alle2
b 4f
Modified: trunk/edk2/ArmPkg/Library/ArmLib/Common/AArch64/ArmLibSupport.S
===================================================================
--- trunk/edk2/ArmPkg/Library/ArmLib/Common/AArch64/ArmLibSupport.S
2013-07-26 17:13:08 UTC (rev 14508)
+++ trunk/edk2/ArmPkg/Library/ArmLib/Common/AArch64/ArmLibSupport.S
2013-07-26 17:14:07 UTC (rev 14509)
@@ -167,7 +167,7 @@
ASM_PFX(ArmInvalidateTlb):
EL1_OR_EL2_OR_EL3(x0)
-1: tlbi alle1
+1: tlbi vmalle1
b 4f
2: tlbi alle2
b 4f
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
