[edk2-devel] [PATCH edk2-platforms 1/1] Platform/VExpress: Replace missing ArmGetCpuCountPerCluster()

["Ard Biesheuvel via groups.io" <ardb+git=google.com@groups.io>]

From: Ard Biesheuvel <ardb@kernel.org>

Commit

  8676e88233d4 ("Platform/ ARM AARCH64: Remove ArmPlatformLib MPCore boilerplate")

inadvertently removed the implementation of ArmGetCpuCountPerCluster(),
which was hiding in the RTSM ArmPlatformLib implementation, even though
it was not part of that library class interface.

Given that the implementation just returned PcdCoreCount, fix up the
code that got broken by using that value directly.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
 Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c
index 24275254815a..b564db2693be 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c
@@ -15,19 +15,6 @@
 
 #include <ArmPlatform.h>
 
-/**
-  Return the core per cluster. The method may differ per core type
-
-  This function might be called from assembler before any stack is set.
-
-  @return   Return the core count per cluster
-
-**/
-UINTN
-ArmGetCpuCountPerCluster (
-  VOID
-  );
-
 ARM_CORE_INFO mVersatileExpressMpCoreInfoTable[] = {
   {
     // Cluster 0, Core 0
@@ -156,7 +143,7 @@ PrePeiCoreGetMpCoreInfo (
   ProcType = MmioRead32 (ARM_VE_SYS_PROCID0_REG) & ARM_VE_SYS_PROC_ID_MASK;
   if ((ProcType == ARM_VE_SYS_PROC_ID_CORTEX_A9) || (ProcType == ARM_VE_SYS_PROC_ID_CORTEX_A15)) {
     // Only support one cluster on all but ARMv8 FVP platform. FVP still uses CortexA9 ID.
-    *CoreCount    = ArmGetCpuCountPerCluster ();
+    *CoreCount    = FixedPcdGet32 (PcdCoreCount);
     *ArmCoreTable = mVersatileExpressMpCoreInfoTable;
     return EFI_SUCCESS;
   } else {
-- 
2.46.0.295.g3b9ea8a38a-goog



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#120418): https://edk2.groups.io/g/devel/message/120418
Mute This Topic: https://groups.io/mt/108128468/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-