From: Olivier Martin <olivier.martin@arm.com>
Date: Wed, 26 Mar 2014 19:35:17 +0000 (+0000)
Subject: ArmPkg/ArmCpuLib: Added A57 Errata 806969
X-Git-Tag: edk2-stable201903~11578
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=44372159a2312201b04f48418f391d6823807e01

ArmPkg/ArmCpuLib: Added A57 Errata 806969

This rare errata only affects r0p0

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@15400 6f19259b-4bc3-4df7-8a09-765794883524
---

diff --git a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/ArmCortexA5xLib.c b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/ArmCortexA5xLib.c
index 7cae9f17f3..99ee51fb6e 100644
--- a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/ArmCortexA5xLib.c
+++ b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/ArmCortexA5xLib.c
@@ -40,6 +40,14 @@ ArmCpuSetup (
     ArmSetCpuExCrBit (A5X_FEATURE_SMP);
   }
 
+  //
+  // If CPU is CortexA57 r0p0 apply Errata: 806969
+  //
+  if ((ArmReadMidr () & ((ARM_CPU_TYPE_MASK << 4) | ARM_CPU_REV_MASK)) ==
+                         ((ARM_CPU_TYPE_A57 << 4) | ARM_CPU_REV(0,0))) {
+    // DisableLoadStoreWB
+    ArmSetCpuActlrBit (1ULL << 49);
+  }
 }
 
 VOID