The ARM_CORE_INFO struct has been updated so the MPIDR is now a single field instead of separate cluster/core fields. Update ArmPlatformLib.
Signed-off-by: Rebecca Cran <rebe...@nuviainc.com> --- Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.c b/Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.c index 5b4be0e55516..f2ec923d6f8d 100644 --- a/Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.c +++ b/Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.c @@ -108,9 +108,8 @@ PrePeiCoreGetMpCoreInfo ( } SocketId = SOCKET_ID (Index); ClusterId = CLUSTER_ID (Index); - mArmPlatformMpCoreInfoTable[mArmPlatformCoreCount].ClusterId = SocketId; - mArmPlatformMpCoreInfoTable[mArmPlatformCoreCount].CoreId = - (ClusterId << 8) | (Index % PLATFORM_CPU_NUM_CORES_PER_CPM); + mArmPlatformMpCoreInfoTable[mArmPlatformCoreCount].Mpidr = GET_MPID ( + SocketId, (ClusterId << 8) | (Index % PLATFORM_CPU_NUM_CORES_PER_CPM)); mArmPlatformMpCoreInfoTable[mArmPlatformCoreCount].MailboxClearAddress = 0; mArmPlatformMpCoreInfoTable[mArmPlatformCoreCount].MailboxClearValue = 0; mArmPlatformMpCoreInfoTable[mArmPlatformCoreCount].MailboxGetAddress = 0; -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#85026): https://edk2.groups.io/g/devel/message/85026 Mute This Topic: https://groups.io/mt/87777839/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-