From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id B37C681D27 for ; Mon, 31 Oct 2016 19:57:06 -0700 (PDT) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga102.jf.intel.com with ESMTP; 31 Oct 2016 19:57:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,577,1473145200"; d="scan'208";a="25932736" Received: from jfan12-desk.ccr.corp.intel.com ([10.239.9.5]) by fmsmga006.fm.intel.com with ESMTP; 31 Oct 2016 19:57:06 -0700 From: Jeff Fan To: edk2-devel@lists.01.org Cc: Leo Duran , Michael Kinney , Feng Tian Date: Tue, 1 Nov 2016 10:56:59 +0800 Message-Id: <20161101025700.7108-2-jeff.fan@intel.com> X-Mailer: git-send-email 2.9.3.windows.2 In-Reply-To: <20161101025700.7108-1-jeff.fan@intel.com> References: <20161101025700.7108-1-jeff.fan@intel.com> Subject: [[POC2] 1/2] UefiCpuPkg/LocalApicLib: Rename GetProcessorLocation() X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Nov 2016 02:57:06 -0000 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 Cc: Michael Kinney Cc: Feng Tian Signed-off-by: Jeff Fan --- UefiCpuPkg/Include/Library/LocalApicLib.h | 2 +- UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c | 2 +- UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c | 2 +- UefiCpuPkg/Library/MpInitLib/MpLib.c | 2 +- UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/UefiCpuPkg/Include/Library/LocalApicLib.h b/UefiCpuPkg/Include/Library/LocalApicLib.h index fae780d..a1611f1 100644 --- 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. **/ VOID -GetProcessorLocation( +GetProcessorLocationByApicId ( IN UINT32 InitialApicId, OUT UINT32 *Package OPTIONAL, OUT UINT32 *Core OPTIONAL, diff --git a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c b/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c index 5976403..8384913 100644 --- 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. **/ VOID -GetProcessorLocation( +GetProcessorLocationByApicId ( IN UINT32 InitialApicId, OUT UINT32 *Package OPTIONAL, OUT UINT32 *Core OPTIONAL, diff --git a/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c b/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c index 91ffd24..1e3c039 100644 --- 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. **/ VOID -GetProcessorLocation( +GetProcessorLocationByApicId ( IN UINT32 InitialApicId, OUT UINT32 *Package OPTIONAL, OUT UINT32 *Core OPTIONAL, diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c index f205b6b..56b870e 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c @@ -1325,7 +1325,7 @@ MpInitLibGetProcessorInfo ( // // Get processor location information // - GetProcessorLocation ( + GetProcessorLocationByApicId ( CpuMpData->CpuData[ProcessorNumber].ApicId, &ProcessorInfoBuffer->Location.Package, &ProcessorInfoBuffer->Location.Core, diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c index 93ebb9e..29f3a58 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c @@ -161,7 +161,7 @@ SmmAddProcessor ( gSmmCpuPrivate->ProcessorInfo[Index].ProcessorId == INVALID_APIC_ID) { gSmmCpuPrivate->ProcessorInfo[Index].ProcessorId = ProcessorId; gSmmCpuPrivate->ProcessorInfo[Index].StatusFlag = 0; - GetProcessorLocation ( + GetProcessorLocationByApicId ( (UINT32)ProcessorId, &gSmmCpuPrivate->ProcessorInfo[Index].Location.Package, &gSmmCpuPrivate->ProcessorInfo[Index].Location.Core, -- 2.9.3.windows.2