ArmPlatformPkg: remove ArmGetCpuCountPerCluster () from ArmPlatformLib

The only user of ArmPlatformLib's ArmGetCpuCountPerCluster () is itself
an ArmPlatformLib implementation, i.e., ArmVExpressLibRTSM.

Given that we'd prefer to get rid of ArmPlatformLib entirely, let's
remove ArmGetCpuCountPerCluster () from the API as a first step.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c
index d8d1c9ac26dd70cedb2d4b7b14927692a2250e6b..11dd7ff1bfb0e9d6fa89618e7ca45f540cd3cb6f 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c
@@ -21,6 +21,19 @@
 \r
 #include <ArmPlatform.h>\r
 \r
 \r
 #include <ArmPlatform.h>\r
 \r

+/**\r
+  Return the core per cluster. The method may differ per core type\r
+\r
+  This function might be called from assembler before any stack is set.\r
+\r
+  @return   Return the core count per cluster\r
+\r
+**/\r
+UINTN\r
+ArmGetCpuCountPerCluster (\r
+  VOID\r
+  );\r
+\r

 ARM_CORE_INFO mVersatileExpressMpCoreInfoTable[] = {\r
   {\r
     // Cluster 0, Core 0\r
 ARM_CORE_INFO mVersatileExpressMpCoreInfoTable[] = {\r
   {\r
     // Cluster 0, Core 0\r

diff --git a/ArmPlatformPkg/Include/Library/ArmPlatformLib.h b/ArmPlatformPkg/Include/Library/ArmPlatformLib.h
index fe3bc4bb8e6c7c4b99b12927e5db4dfa849f9397..77561a3d05b3dcdafd2e8a27b6cdb87ec057afbf 100644 (file)
--- a/ArmPlatformPkg/Include/Library/ArmPlatformLib.h
+++ b/ArmPlatformPkg/Include/Library/ArmPlatformLib.h
@@ -40,19 +40,6 @@ typedef struct {
   UINT64                       NumberOfBytes;\r
 } ARM_SYSTEM_MEMORY_REGION_DESCRIPTOR;\r
 \r
   UINT64                       NumberOfBytes;\r
 } ARM_SYSTEM_MEMORY_REGION_DESCRIPTOR;\r
 \r

-/**\r
-  Return the core per cluster. The method may differ per core type\r
-\r
-  This function might be called from assembler before any stack is set.\r
-\r
-  @return   Return the core count per cluster\r
-\r
-**/\r
-UINTN\r
-ArmGetCpuCountPerCluster (\r
-  VOID\r
-  );\r
-\r

 /**\r
   Return the core position from the value of its MpId register\r
 \r
 /**\r
   Return the core position from the value of its MpId register\r
 \r