1 files changed, 3 insertions, 2 deletions
diff --git a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Lib.c b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Lib.c
index 324ddb5850..8d9530cee2 100644
--- a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Lib.c
+++ b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Lib.c
@@ -48,6 +48,9 @@ ArmCpuSetup (
 
   // If MPCore then Enable the SCU
   if (ArmIsMpCore()) {
+    // Signals the Cortex-A9 processor is taking part in coherency
+    ArmSetAuxCrBit (A9_FEATURE_SMP);
+
     ArmEnableScu ();
   }
 }
@@ -60,8 +63,6 @@ ArmCpuSetupSmpNonSecure (
 {
   INTN          ScuBase;
 
-  ArmSetAuxCrBit (A9_FEATURE_SMP);
-
   // Make the SCU accessible in Non Secure world
   if (IS_PRIMARY_CORE(MpId)) {
     ScuBase = ArmGetScuBaseAddress();