From 103fa647d159e3d76be2634d2653c2d215dd0d46 Mon Sep 17 00:00:00 2001 From: Rebecca Cran Date: Wed, 15 Dec 2021 20:46:31 -0700 Subject: ArmPkg: Replace CoreId and ClusterId with Mpidr in ARM_CORE_INFO struct Remove the ClusterId and CoreId fields in the ARM_CORE_INFO structure in favor of a new Mpidr field. Update code in ArmPlatformPkg/PrePeiCore/MainMPCore and ArmPlatformPkg/PrePi/MainMPCore.c to use the new field and call new macros GET_MPIDR_AFF0 and GET_MPIDR_AFF1 instead. Signed-off-by: Rebecca Cran Reviewed-by: Ard Biesheuvel --- ArmPlatformPkg/PrePeiCore/MainMPCore.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ArmPlatformPkg/PrePeiCore') diff --git a/ArmPlatformPkg/PrePeiCore/MainMPCore.c b/ArmPlatformPkg/PrePeiCore/MainMPCore.c index 0b8e5dfb3f..b5d0d3a644 100644 --- a/ArmPlatformPkg/PrePeiCore/MainMPCore.c +++ b/ArmPlatformPkg/PrePeiCore/MainMPCore.c @@ -68,7 +68,9 @@ SecondaryMain ( // Find the core in the ArmCoreTable for (Index = 0; Index < ArmCoreCount; Index++) { - if ((ArmCoreInfoTable[Index].ClusterId == ClusterId) && (ArmCoreInfoTable[Index].CoreId == CoreId)) { + if ((GET_MPIDR_AFF1 (ArmCoreInfoTable[Index].Mpidr) == ClusterId) && + (GET_MPIDR_AFF0 (ArmCoreInfoTable[Index].Mpidr) == CoreId)) + { break; } } -- cgit v1.2.3