UefiCpuPkg/LocalApicLib: Rename GetProcessorLocation()

GetProcessorLocation() is too generic and will conflict with the API defined in
Galileo Board Software Package v1.0.0.

This update is just to rename GetProcessorLocation() to one specific name
GetProcessorLocationByApicId().

Contributed-under: TianoCore Contribution Agreement 1.0
Cc: Leo Duran  <leo.duran@amd.com>
Cc: Michael Kinney <Michael.d.kinney@intel.com>
Cc: Feng Tian <feng.tian@intel.com>
Signed-off-by: Jeff Fan <jeff.fan@intel.com>
Reviewed-by: Michael Kinney <Michael.d.kinney@intel.com>
Reviewed-by: Leo Duran  <leo.duran@amd.com>

diff --git a/UefiCpuPkg/Include/Library/LocalApicLib.h b/UefiCpuPkg/Include/Library/LocalApicLib.h
index fae780d5832a6f8fd01ad576b02ca31011cf2936..a1611f17ddb489abbb8777ccdb95391f07d3706e 100644 (file)
--- a/UefiCpuPkg/Include/Library/LocalApicLib.h
+++ b/UefiCpuPkg/Include/Library/LocalApicLib.h
@@ -424,7 +424,7 @@ GetApicMsiValue (
   @param[out]  Thread        Returns the processor thread ID.\r
 **/\r
 VOID\r
-GetProcessorLocation(\r
+GetProcessorLocationByApicId (\r
   IN  UINT32  InitialApicId,\r
   OUT UINT32  *Package  OPTIONAL,\r
   OUT UINT32  *Core    OPTIONAL,\r

diff --git a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c b/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c
index 5976403456f6d91d335321b58d44ac0821aa4529..8384913bf4f50438d292dff6dcb9f6a2324b5913 100644 (file)
--- a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c
+++ b/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c
@@ -955,7 +955,7 @@ GetApicMsiValue (
   @param[out]  Thread        Returns the processor thread ID.\r
 **/\r
 VOID\r
-GetProcessorLocation(\r
+GetProcessorLocationByApicId (\r
   IN  UINT32  InitialApicId,\r
   OUT UINT32  *Package  OPTIONAL,\r
   OUT UINT32  *Core    OPTIONAL,\r

diff --git a/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c b/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c
index 91ffd24e6e80bc706d28049fa6980cacb3780dca..1e3c03905c71d29d0b01d3929fb69b7010c90f9e 100644 (file)
--- a/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c
+++ b/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c
@@ -1050,7 +1050,7 @@ GetApicMsiValue (
   @param[out]  Thread        Returns the processor thread ID.\r
 **/\r
 VOID\r
-GetProcessorLocation(\r
+GetProcessorLocationByApicId (\r
   IN  UINT32  InitialApicId,\r
   OUT UINT32  *Package  OPTIONAL,\r
   OUT UINT32  *Core    OPTIONAL,\r

diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c
index f205b6bad4ccff9018a593f9d4c78e03d69530c8..56b870e52748b42672b086666f73880df7f8af2d 100644 (file)
--- a/UefiCpuPkg/Library/MpInitLib/MpLib.c
+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c
@@ -1325,7 +1325,7 @@ MpInitLibGetProcessorInfo (
   //\r
   // Get processor location information\r
   //\r
-  GetProcessorLocation (\r
+  GetProcessorLocationByApicId (\r
     CpuMpData->CpuData[ProcessorNumber].ApicId,\r
     &ProcessorInfoBuffer->Location.Package,\r
     &ProcessorInfoBuffer->Location.Core,\r

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c
index 93ebb9ec73e807abdcc7483c2f522e22e78f7d15..29f3a58939222151737e6bdf2b1c36ad754768d9 100644 (file)
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c
@@ -161,7 +161,7 @@ SmmAddProcessor (
         gSmmCpuPrivate->ProcessorInfo[Index].ProcessorId == INVALID_APIC_ID) {\r
       gSmmCpuPrivate->ProcessorInfo[Index].ProcessorId = ProcessorId;\r
       gSmmCpuPrivate->ProcessorInfo[Index].StatusFlag = 0;\r
-      GetProcessorLocation (\r
+      GetProcessorLocationByApicId (\r
         (UINT32)ProcessorId,\r
         &gSmmCpuPrivate->ProcessorInfo[Index].Location.Package,\r
         &gSmmCpuPrivate->ProcessorInfo[Index].Location.Core,\r