tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UefiCpuPkg/MpInitLib: Change AP Index variable name. 

Original AP index variable name not well express the meaning
of the variable. Also this name is better used in later patch.
So change the variable name for better understanding.

Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Jeff Fan <vanjeff_919@hotmail.com>
This commit is contained in:
Eric Dong 2017-10-23 14:45:44 +08:00
parent b5a985ca92
commit 37676b9f82
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UefiCpuPkg/Library/MpInitLib/Ia32/MpEqu.inc
View File

@ -33,7 +33,7 @@ GdtrLocation equ LockLocation + 10h
IdtrLocation equ LockLocation + 16h IdtrLocation equ LockLocation + 16h
BufferStartLocation equ LockLocation + 1Ch BufferStartLocation equ LockLocation + 1Ch
ModeOffsetLocation equ LockLocation + 20h ModeOffsetLocation equ LockLocation + 20h
NumApsExecutingLocation equ LockLocation + 24h ApIndexLocation equ LockLocation + 24h
CodeSegmentLocation equ LockLocation + 28h CodeSegmentLocation equ LockLocation + 28h
DataSegmentLocation equ LockLocation + 2Ch DataSegmentLocation equ LockLocation + 2Ch
EnableExecuteDisableLocation equ LockLocation + 30h EnableExecuteDisableLocation equ LockLocation + 30h

4
UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm
View File

@ -130,7 +130,7 @@ TestLock:
jz TestLock jz TestLock
mov ecx, esi mov ecx, esi
add ecx, NumApsExecutingLocation add ecx, ApIndexLocation
inc dword [ecx] inc dword [ecx]
mov ebx, [ecx] mov ebx, [ecx]
@ -200,7 +200,7 @@ CProcedureInvoke:
mov eax, ASM_PFX(InitializeFloatingPointUnits) mov eax, ASM_PFX(InitializeFloatingPointUnits)
call eax ; Call assembly function to initialize FPU per UEFI spec call eax ; Call assembly function to initialize FPU per UEFI spec
push ebx ; Push NumApsExecuting push ebx ; Push ApIndex
mov eax, esi mov eax, esi
add eax, LockLocation add eax, LockLocation
push eax ; push address of exchange info data buffer push eax ; push address of exchange info data buffer

6
UefiCpuPkg/Library/MpInitLib/MpLib.c
View File

@ -542,7 +542,7 @@ VOID
EFIAPI EFIAPI
ApWakeupFunction ( ApWakeupFunction (
IN MP_CPU_EXCHANGE_INFO *ExchangeInfo, IN MP_CPU_EXCHANGE_INFO *ExchangeInfo,
IN UINTN NumApsExecuting IN UINTN ApIndex
) )
{ {
CPU_MP_DATA *CpuMpData; CPU_MP_DATA *CpuMpData;
@ -574,7 +574,7 @@ ApWakeupFunction (
// Add CPU number // Add CPU number
// //
InterlockedIncrement ((UINT32 *) &CpuMpData->CpuCount); InterlockedIncrement ((UINT32 *) &CpuMpData->CpuCount);
ProcessorNumber = NumApsExecuting; ProcessorNumber = ApIndex;
// //
// This is first time AP wakeup, get BIST information from AP stack // This is first time AP wakeup, get BIST information from AP stack
// //
@ -764,7 +764,7 @@ FillExchangeInfoData (
ExchangeInfo->Cr3 = AsmReadCr3 (); ExchangeInfo->Cr3 = AsmReadCr3 ();
ExchangeInfo->CFunction = (UINTN) ApWakeupFunction; ExchangeInfo->CFunction = (UINTN) ApWakeupFunction;
ExchangeInfo->NumApsExecuting = 0; ExchangeInfo->ApIndex = 0;
ExchangeInfo->InitFlag = (UINTN) CpuMpData->InitFlag; ExchangeInfo->InitFlag = (UINTN) CpuMpData->InitFlag;
ExchangeInfo->CpuInfo = (CPU_INFO_IN_HOB *) (UINTN) CpuMpData->CpuInfoInHob; ExchangeInfo->CpuInfo = (CPU_INFO_IN_HOB *) (UINTN) CpuMpData->CpuInfoInHob;
ExchangeInfo->CpuMpData = CpuMpData; ExchangeInfo->CpuMpData = CpuMpData;

2
UefiCpuPkg/Library/MpInitLib/MpLib.h
View File

@ -169,7 +169,7 @@ typedef struct {
IA32_DESCRIPTOR IdtrProfile; IA32_DESCRIPTOR IdtrProfile;
UINTN BufferStart; UINTN BufferStart;
UINTN ModeOffset; UINTN ModeOffset;
UINTN NumApsExecuting; UINTN ApIndex;
UINTN CodeSegment; UINTN CodeSegment;
UINTN DataSegment; UINTN DataSegment;
UINTN EnableExecuteDisable; UINTN EnableExecuteDisable;

2
UefiCpuPkg/Library/MpInitLib/X64/MpEqu.inc
View File

@ -33,7 +33,7 @@ GdtrLocation equ LockLocation + 20h
IdtrLocation equ LockLocation + 2Ah IdtrLocation equ LockLocation + 2Ah
BufferStartLocation equ LockLocation + 34h BufferStartLocation equ LockLocation + 34h
ModeOffsetLocation equ LockLocation + 3Ch ModeOffsetLocation equ LockLocation + 3Ch
NumApsExecutingLocation equ LockLocation + 44h ApIndexLocation equ LockLocation + 44h
CodeSegmentLocation equ LockLocation + 4Ch CodeSegmentLocation equ LockLocation + 4Ch
DataSegmentLocation equ LockLocation + 54h DataSegmentLocation equ LockLocation + 54h
EnableExecuteDisableLocation equ LockLocation + 5Ch EnableExecuteDisableLocation equ LockLocation + 5Ch

4
UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm
View File

@ -134,7 +134,7 @@ TestLock:
cmp rax, NotVacantFlag cmp rax, NotVacantFlag
jz TestLock jz TestLock
lea ecx, [esi + NumApsExecutingLocation] lea ecx, [esi + ApIndexLocation]
inc dword [ecx] inc dword [ecx]
mov ebx, [ecx] mov ebx, [ecx]
@ -206,7 +206,7 @@ CProcedureInvoke:
call rax ; Call assembly function to initialize FPU per UEFI spec call rax ; Call assembly function to initialize FPU per UEFI spec
add rsp, 20h add rsp, 20h
mov edx, ebx ; edx is NumApsExecuting mov edx, ebx ; edx is ApIndex
mov ecx, esi mov ecx, esi
add ecx, LockLocation ; rcx is address of exchange info data buffer add ecx, LockLocation ; rcx is address of exchange info data buffer