The ARM_CORE_INFO struct has been updated so the MPIDR is now a single field instead of separate cluster/core fields. Update the initializer.
Signed-off-by: Rebecca Cran <rebe...@nuviainc.com> --- Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJuno.c | 12 ++++++------ Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7.c | 16 ++++++++-------- Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c | 16 ++++++++-------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJuno.c b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJuno.c index c5d4f70fc0f5..a5d5f3fd9b79 100644 --- a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJuno.c +++ b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJuno.c @@ -19,7 +19,7 @@ ARM_CORE_INFO mJunoInfoTable[] = { { // Cluster 0, Core 0 - 0x0, 0x0, + 0x000, // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_VE_SYS_FLAGS_REG, @@ -29,7 +29,7 @@ ARM_CORE_INFO mJunoInfoTable[] = { }, { // Cluster 0, Core 1 - 0x0, 0x1, + 0x001, // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_VE_SYS_FLAGS_REG, @@ -39,7 +39,7 @@ ARM_CORE_INFO mJunoInfoTable[] = { }, { // Cluster 1, Core 0 - 0x1, 0x0, + 0x100, // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_VE_SYS_FLAGS_REG, @@ -49,7 +49,7 @@ ARM_CORE_INFO mJunoInfoTable[] = { }, { // Cluster 1, Core 1 - 0x1, 0x1, + 0x101, // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_VE_SYS_FLAGS_REG, @@ -59,7 +59,7 @@ ARM_CORE_INFO mJunoInfoTable[] = { }, { // Cluster 1, Core 2 - 0x1, 0x2, + 0x102, // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_VE_SYS_FLAGS_REG, @@ -69,7 +69,7 @@ ARM_CORE_INFO mJunoInfoTable[] = { }, { // Cluster 1, Core 3 - 0x1, 0x3, + 0x103, // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_VE_SYS_FLAGS_REG, diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7.c b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7.c index 09521bdf003a..d51784a47c0e 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7.c +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7.c @@ -18,7 +18,7 @@ ARM_CORE_INFO mVersatileExpressCTA15A7InfoTable[] = { { // Cluster 0, Core 0 - 0x0, 0x0, + 0x000, // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_CTA15A7_SPC_A15_BX_ADDR0, @@ -28,7 +28,7 @@ ARM_CORE_INFO mVersatileExpressCTA15A7InfoTable[] = { }, { // Cluster 0, Core 1 - 0x0, 0x1, + 0x001, // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_CTA15A7_SPC_A15_BX_ADDR1, @@ -39,7 +39,7 @@ ARM_CORE_INFO mVersatileExpressCTA15A7InfoTable[] = { #ifndef ARM_BIGLITTLE_TC2 { // Cluster 0, Core 2 - 0x0, 0x2, + 0x002, // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_CTA15A7_SPC_A15_BX_ADDR2, @@ -49,7 +49,7 @@ ARM_CORE_INFO mVersatileExpressCTA15A7InfoTable[] = { }, { // Cluster 0, Core 3 - 0x0, 0x3, + 0x003, // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_CTA15A7_SPC_A15_BX_ADDR3, @@ -60,7 +60,7 @@ ARM_CORE_INFO mVersatileExpressCTA15A7InfoTable[] = { #endif { // Cluster 1, Core 0 - 0x1, 0x0, + 0x100, // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_CTA15A7_SPC_A7_BX_ADDR0, @@ -70,7 +70,7 @@ ARM_CORE_INFO mVersatileExpressCTA15A7InfoTable[] = { }, { // Cluster 1, Core 1 - 0x1, 0x1, + 0x101, // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_CTA15A7_SPC_A7_BX_ADDR1, @@ -80,7 +80,7 @@ ARM_CORE_INFO mVersatileExpressCTA15A7InfoTable[] = { }, { // Cluster 1, Core 2 - 0x1, 0x2, + 0x102, // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_CTA15A7_SPC_A7_BX_ADDR2, @@ -91,7 +91,7 @@ ARM_CORE_INFO mVersatileExpressCTA15A7InfoTable[] = { #ifndef ARM_BIGLITTLE_TC2 ,{ // Cluster 1, Core 3 - 0x1, 0x3, + 0x103, // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_CTA15A7_SPC_A7_BX_ADDR3, diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c index e7a8c1dbbde8..eed1a98324b5 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c @@ -31,7 +31,7 @@ ArmGetCpuCountPerCluster ( ARM_CORE_INFO mVersatileExpressMpCoreInfoTable[] = { { // Cluster 0, Core 0 - 0x0, 0x0, + 0x000, // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_VE_SYS_FLAGS_REG, @@ -41,7 +41,7 @@ ARM_CORE_INFO mVersatileExpressMpCoreInfoTable[] = { }, { // Cluster 0, Core 1 - 0x0, 0x1, + 0x001, // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_VE_SYS_FLAGS_REG, @@ -51,7 +51,7 @@ ARM_CORE_INFO mVersatileExpressMpCoreInfoTable[] = { }, { // Cluster 0, Core 2 - 0x0, 0x2, + 0x002, // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_VE_SYS_FLAGS_REG, @@ -61,7 +61,7 @@ ARM_CORE_INFO mVersatileExpressMpCoreInfoTable[] = { }, { // Cluster 0, Core 3 - 0x0, 0x3, + 0x003, // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_VE_SYS_FLAGS_REG, @@ -71,7 +71,7 @@ ARM_CORE_INFO mVersatileExpressMpCoreInfoTable[] = { }, { // Cluster 1, Core 0 - 0x1, 0x0, + 0x100, // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_VE_SYS_FLAGS_REG, @@ -81,7 +81,7 @@ ARM_CORE_INFO mVersatileExpressMpCoreInfoTable[] = { }, { // Cluster 1, Core 1 - 0x1, 0x1, + 0x101, // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_VE_SYS_FLAGS_REG, @@ -91,7 +91,7 @@ ARM_CORE_INFO mVersatileExpressMpCoreInfoTable[] = { }, { // Cluster 1, Core 2 - 0x1, 0x2, + 0x102, // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_VE_SYS_FLAGS_REG, @@ -101,7 +101,7 @@ ARM_CORE_INFO mVersatileExpressMpCoreInfoTable[] = { }, { // Cluster 1, Core 3 - 0x1, 0x3, + 0x103, // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_VE_SYS_FLAGS_REG, -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#85017): https://edk2.groups.io/g/devel/message/85017 Mute This Topic: https://groups.io/mt/87777822/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-