ArmPkg: Replace CoreId and ClusterId with Mpidr in ARM_CORE_INFO struct

[mirror_edk2.git] / ArmPlatformPkg / PrePi / MainMPCore.c

diff --git a/ArmPlatformPkg/PrePi/MainMPCore.c b/ArmPlatformPkg/PrePi/MainMPCore.c
index ce53cea6367cd75c760ae2eab51bc0bbb1c94d2e..68a7c13298d0d17bd4ff4c2a4dfaf6928ffe4083 100644 (file)
--- a/ArmPlatformPkg/PrePi/MainMPCore.c
+++ b/ArmPlatformPkg/PrePi/MainMPCore.c
@@ -67,7 +67,9 @@ SecondaryMain (
 \r
   // Find the core in the ArmCoreTable\r
   for (Index = 0; Index < ArmCoreCount; Index++) {\r
-    if ((ArmCoreInfoTable[Index].ClusterId == ClusterId) && (ArmCoreInfoTable[Index].CoreId == CoreId)) {\r
+    if ((GET_MPIDR_AFF1 (ArmCoreInfoTable[Index].Mpidr) == ClusterId) &&\r
+        (GET_MPIDR_AFF0 (ArmCoreInfoTable[Index].Mpidr) == CoreId))\r
+    {\r
       break;\r
     }\r
   }\r