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>

diff --git a/UefiCpuPkg/Library/MpInitLib/Ia32/MpEqu.inc b/UefiCpuPkg/Library/MpInitLib/Ia32/MpEqu.inc
index 62762308e22e792595de77f0d0df43237de186bc..976af1f78e1b9d5f84a5768aed8d3be68cffff0a 100644 (file)
--- a/UefiCpuPkg/Library/MpInitLib/Ia32/MpEqu.inc
+++ b/UefiCpuPkg/Library/MpInitLib/Ia32/MpEqu.inc
@@ -33,7 +33,7 @@ GdtrLocation                  equ        LockLocation + 10h
 IdtrLocation                  equ        LockLocation + 16h\r
 BufferStartLocation           equ        LockLocation + 1Ch\r
 ModeOffsetLocation            equ        LockLocation + 20h\r
-NumApsExecutingLocation       equ        LockLocation + 24h\r
+ApIndexLocation               equ        LockLocation + 24h\r
 CodeSegmentLocation           equ        LockLocation + 28h\r
 DataSegmentLocation           equ        LockLocation + 2Ch\r
 EnableExecuteDisableLocation  equ        LockLocation + 30h\r

diff --git a/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm b/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm
index 52363e6e08df686b76c3296e8c0f7f19449c6d52..1b9c6a62f8fe9320b545b826af94f0eef45cf0b0 100644 (file)
--- a/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm
+++ b/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm
@@ -130,7 +130,7 @@ TestLock:
     jz         TestLock\r
 \r
     mov        ecx, esi\r
-    add        ecx, NumApsExecutingLocation\r
+    add        ecx, ApIndexLocation\r
     inc        dword [ecx]\r
     mov        ebx, [ecx]\r
 \r
@@ -200,7 +200,7 @@ CProcedureInvoke:
     mov        eax, ASM_PFX(InitializeFloatingPointUnits)\r
     call       eax               ; Call assembly function to initialize FPU per UEFI spec\r
 \r
-    push       ebx               ; Push NumApsExecuting\r
+    push       ebx               ; Push ApIndex\r
     mov        eax, esi\r
     add        eax, LockLocation\r
     push       eax               ; push address of exchange info data buffer\r

diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c
index f3ee6d443614598f26d6f98c28f43c9bfba6867c..db923c9917d7be561c96da23a6161c013d2cce7f 100644 (file)
--- a/UefiCpuPkg/Library/MpInitLib/MpLib.c
+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c
@@ -542,7 +542,7 @@ VOID
 EFIAPI\r
 ApWakeupFunction (\r
   IN MP_CPU_EXCHANGE_INFO      *ExchangeInfo,\r
-  IN UINTN                     NumApsExecuting\r
+  IN UINTN                     ApIndex\r
   )\r
 {\r
   CPU_MP_DATA                *CpuMpData;\r
@@ -574,7 +574,7 @@ ApWakeupFunction (
       // Add CPU number\r
       //\r
       InterlockedIncrement ((UINT32 *) &CpuMpData->CpuCount);\r
-      ProcessorNumber = NumApsExecuting;\r
+      ProcessorNumber = ApIndex;\r
       //\r
       // This is first time AP wakeup, get BIST information from AP stack\r
       //\r
@@ -764,7 +764,7 @@ FillExchangeInfoData (
   ExchangeInfo->Cr3             = AsmReadCr3 ();\r
 \r
   ExchangeInfo->CFunction       = (UINTN) ApWakeupFunction;\r
-  ExchangeInfo->NumApsExecuting = 0;\r
+  ExchangeInfo->ApIndex         = 0;\r
   ExchangeInfo->InitFlag        = (UINTN) CpuMpData->InitFlag;\r
   ExchangeInfo->CpuInfo         = (CPU_INFO_IN_HOB *) (UINTN) CpuMpData->CpuInfoInHob;\r
   ExchangeInfo->CpuMpData       = CpuMpData;\r

diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.h b/UefiCpuPkg/Library/MpInitLib/MpLib.h
index 84ae24f88d774537b930a5e54dcaa6e1decbdf67..e41d2db94a9513eb11a5dd45450c06520be4eca3 100644 (file)
--- a/UefiCpuPkg/Library/MpInitLib/MpLib.h
+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.h
@@ -169,7 +169,7 @@ typedef struct {
   IA32_DESCRIPTOR       IdtrProfile;\r
   UINTN                 BufferStart;\r
   UINTN                 ModeOffset;\r
-  UINTN                 NumApsExecuting;\r
+  UINTN                 ApIndex;\r
   UINTN                 CodeSegment;\r
   UINTN                 DataSegment;\r
   UINTN                 EnableExecuteDisable;\r

diff --git a/UefiCpuPkg/Library/MpInitLib/X64/MpEqu.inc b/UefiCpuPkg/Library/MpInitLib/X64/MpEqu.inc
index 5b2529b5cbbebc22dd8a38c17476a539268aa909..114f4e0a7db9308b0e6c27424bbd0696931f7c59 100644 (file)
--- a/UefiCpuPkg/Library/MpInitLib/X64/MpEqu.inc
+++ b/UefiCpuPkg/Library/MpInitLib/X64/MpEqu.inc
@@ -33,7 +33,7 @@ GdtrLocation                  equ        LockLocation + 20h
 IdtrLocation                  equ        LockLocation + 2Ah\r
 BufferStartLocation           equ        LockLocation + 34h\r
 ModeOffsetLocation            equ        LockLocation + 3Ch\r
-NumApsExecutingLocation       equ        LockLocation + 44h\r
+ApIndexLocation               equ        LockLocation + 44h\r
 CodeSegmentLocation           equ        LockLocation + 4Ch\r
 DataSegmentLocation           equ        LockLocation + 54h\r
 EnableExecuteDisableLocation  equ        LockLocation + 5Ch\r

diff --git a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm b/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm
index 0b14a534668bb03557164ae90ec8b9e20d6bb758..4ada6493d475738398b674e4419d9dac3e94e1aa 100644 (file)
--- a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm
+++ b/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm
@@ -134,7 +134,7 @@ TestLock:
     cmp        rax, NotVacantFlag\r
     jz         TestLock\r
 \r
-    lea        ecx, [esi + NumApsExecutingLocation]\r
+    lea        ecx, [esi + ApIndexLocation]\r
     inc        dword [ecx]\r
     mov        ebx, [ecx]\r
 \r
@@ -206,7 +206,7 @@ CProcedureInvoke:
     call       rax               ; Call assembly function to initialize FPU per UEFI spec\r
     add        rsp, 20h\r
 \r
-    mov        edx, ebx          ; edx is NumApsExecuting\r
+    mov        edx, ebx          ; edx is ApIndex\r
     mov        ecx, esi\r
     add        ecx, LockLocation ; rcx is address of exchange info data buffer\r
 \r