summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Martin <olivier.martin@arm.com>2014-08-19 13:36:36 +0000
committeroliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524>2014-08-19 13:36:36 +0000
commit1eb5b4f28b0f0d28ab844b7d444c822f90784978 (patch)
treea37a63eb39842ea232acedd0b5f0ee3559dce4c9
parent743a2a550c9e77419968500216c9383296910ebf (diff)
downloadedk2-1eb5b4f28b0f0d28ab844b7d444c822f90784978.zip
edk2-1eb5b4f28b0f0d28ab844b7d444c822f90784978.tar.gz
edk2-1eb5b4f28b0f0d28ab844b7d444c822f90784978.tar.bz2
ArmPkg/ArmLib: Set again TCR after getting the Translation Table attributes
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Olivier Martin <olivier.martin@arm.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15837 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r--ArmPkg/Library/ArmLib/AArch64/AArch64Mmu.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Mmu.c b/ArmPkg/Library/ArmLib/AArch64/AArch64Mmu.c
index fee4cfc..f0d2bff 100644
--- a/ArmPkg/Library/ArmLib/AArch64/AArch64Mmu.c
+++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Mmu.c
@@ -678,6 +678,9 @@ ArmConfigureMmu (
goto FREE_TRANSLATION_TABLE;
}
+ // Set again TCR after getting the Translation Table attributes
+ ArmSetTCR (TCR);
+
ArmSetMAIR (MAIR_ATTR(TT_ATTR_INDX_DEVICE_MEMORY, MAIR_ATTR_DEVICE_MEMORY) | // mapped to EFI_MEMORY_UC
MAIR_ATTR(TT_ATTR_INDX_MEMORY_NON_CACHEABLE, MAIR_ATTR_NORMAL_MEMORY_NON_CACHEABLE) | // mapped to EFI_MEMORY_WC
MAIR_ATTR(TT_ATTR_INDX_MEMORY_WRITE_THROUGH, MAIR_ATTR_NORMAL_MEMORY_WRITE_THROUGH) | // mapped to EFI_MEMORY_WT