public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Ni, Ruiyu" <ruiyu.ni@intel.com>
To: "Dong, Eric" <eric.dong@intel.com>,
	"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Subject: Re: [Patch 1/2] UefiCpuPkg/MpInitLib: Change AP Index variable name.
Date: Tue, 24 Oct 2017 06:00:54 +0000	[thread overview]
Message-ID: <734D49CCEBEEF84792F5B80ED585239D5BAA3592@SHSMSX104.ccr.corp.intel.com> (raw)
In-Reply-To: <1508743358-3640-2-git-send-email-eric.dong@intel.com>

Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>

Thanks/Ray

> -----Original Message-----
> From: Dong, Eric
> Sent: Monday, October 23, 2017 3:23 PM
> To: edk2-devel@lists.01.org
> Cc: Ni, Ruiyu <ruiyu.ni@intel.com>
> Subject: [Patch 1/2] 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>
> ---
>  UefiCpuPkg/Library/MpInitLib/Ia32/MpEqu.inc    | 2 +-
>  UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm | 4 ++--
>  UefiCpuPkg/Library/MpInitLib/MpLib.c           | 6 +++---
>  UefiCpuPkg/Library/MpInitLib/MpLib.h           | 2 +-
>  UefiCpuPkg/Library/MpInitLib/X64/MpEqu.inc     | 2 +-
>  UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm  | 4 ++--
>  6 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/UefiCpuPkg/Library/MpInitLib/Ia32/MpEqu.inc
> b/UefiCpuPkg/Library/MpInitLib/Ia32/MpEqu.inc
> index 6276230..976af1f 100644
> --- 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
>  BufferStartLocation           equ        LockLocation + 1Ch
>  ModeOffsetLocation            equ        LockLocation + 20h
> -NumApsExecutingLocation       equ        LockLocation + 24h
> +ApIndexLocation               equ        LockLocation + 24h
>  CodeSegmentLocation           equ        LockLocation + 28h
>  DataSegmentLocation           equ        LockLocation + 2Ch
>  EnableExecuteDisableLocation  equ        LockLocation + 30h
> diff --git a/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm
> b/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm
> index 52363e6..1b9c6a6 100644
> --- a/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm
> +++ b/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm
> @@ -130,7 +130,7 @@ TestLock:
>      jz         TestLock
> 
>      mov        ecx, esi
> -    add        ecx, NumApsExecutingLocation
> +    add        ecx, ApIndexLocation
>      inc        dword [ecx]
>      mov        ebx, [ecx]
> 
> @@ -200,7 +200,7 @@ CProcedureInvoke:
>      mov        eax, ASM_PFX(InitializeFloatingPointUnits)
>      call       eax               ; Call assembly function to initialize FPU per UEFI spec
> 
> -    push       ebx               ; Push NumApsExecuting
> +    push       ebx               ; Push ApIndex
>      mov        eax, esi
>      add        eax, LockLocation
>      push       eax               ; push address of exchange info data buffer
> diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c
> b/UefiCpuPkg/Library/MpInitLib/MpLib.c
> index f3ee6d4..db923c9 100644
> --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c
> +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c
> @@ -542,7 +542,7 @@ VOID
>  EFIAPI
>  ApWakeupFunction (
>    IN MP_CPU_EXCHANGE_INFO      *ExchangeInfo,
> -  IN UINTN                     NumApsExecuting
> +  IN UINTN                     ApIndex
>    )
>  {
>    CPU_MP_DATA                *CpuMpData;
> @@ -574,7 +574,7 @@ ApWakeupFunction (
>        // Add CPU number
>        //
>        InterlockedIncrement ((UINT32 *) &CpuMpData->CpuCount);
> -      ProcessorNumber = NumApsExecuting;
> +      ProcessorNumber = ApIndex;
>        //
>        // This is first time AP wakeup, get BIST information from AP stack
>        //
> @@ -764,7 +764,7 @@ FillExchangeInfoData (
>    ExchangeInfo->Cr3             = AsmReadCr3 ();
> 
>    ExchangeInfo->CFunction       = (UINTN) ApWakeupFunction;
> -  ExchangeInfo->NumApsExecuting = 0;
> +  ExchangeInfo->ApIndex         = 0;
>    ExchangeInfo->InitFlag        = (UINTN) CpuMpData->InitFlag;
>    ExchangeInfo->CpuInfo         = (CPU_INFO_IN_HOB *) (UINTN) CpuMpData-
> >CpuInfoInHob;
>    ExchangeInfo->CpuMpData       = CpuMpData;
> diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.h
> b/UefiCpuPkg/Library/MpInitLib/MpLib.h
> index 84ae24f..e41d2db 100644
> --- a/UefiCpuPkg/Library/MpInitLib/MpLib.h
> +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.h
> @@ -169,7 +169,7 @@ typedef struct {
>    IA32_DESCRIPTOR       IdtrProfile;
>    UINTN                 BufferStart;
>    UINTN                 ModeOffset;
> -  UINTN                 NumApsExecuting;
> +  UINTN                 ApIndex;
>    UINTN                 CodeSegment;
>    UINTN                 DataSegment;
>    UINTN                 EnableExecuteDisable;
> diff --git a/UefiCpuPkg/Library/MpInitLib/X64/MpEqu.inc
> b/UefiCpuPkg/Library/MpInitLib/X64/MpEqu.inc
> index 5b2529b..114f4e0 100644
> --- 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
>  BufferStartLocation           equ        LockLocation + 34h
>  ModeOffsetLocation            equ        LockLocation + 3Ch
> -NumApsExecutingLocation       equ        LockLocation + 44h
> +ApIndexLocation               equ        LockLocation + 44h
>  CodeSegmentLocation           equ        LockLocation + 4Ch
>  DataSegmentLocation           equ        LockLocation + 54h
>  EnableExecuteDisableLocation  equ        LockLocation + 5Ch
> diff --git a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm
> b/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm
> index 0b14a53..4ada649 100644
> --- a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm
> +++ b/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm
> @@ -134,7 +134,7 @@ TestLock:
>      cmp        rax, NotVacantFlag
>      jz         TestLock
> 
> -    lea        ecx, [esi + NumApsExecutingLocation]
> +    lea        ecx, [esi + ApIndexLocation]
>      inc        dword [ecx]
>      mov        ebx, [ecx]
> 
> @@ -206,7 +206,7 @@ CProcedureInvoke:
>      call       rax               ; Call assembly function to initialize FPU per UEFI spec
>      add        rsp, 20h
> 
> -    mov        edx, ebx          ; edx is NumApsExecuting
> +    mov        edx, ebx          ; edx is ApIndex
>      mov        ecx, esi
>      add        ecx, LockLocation ; rcx is address of exchange info data buffer
> 
> --
> 2.7.0.windows.1



  reply	other threads:[~2017-10-24  5:57 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-23  7:22 [Patch 0/2] Enhance collect AP Count logic Eric Dong
2017-10-23  7:22 ` [Patch 1/2] UefiCpuPkg/MpInitLib: Change AP Index variable name Eric Dong
2017-10-24  6:00   ` Ni, Ruiyu [this message]
2017-10-23  7:22 ` [Patch 2/2] UefiCpuPkg/MpInitLib: Enhance waiting for AP initialization logic Eric Dong
2017-10-24  6:02   ` Ni, Ruiyu
2017-10-24  6:27     ` 答复: " Fan Jeff
2017-10-24  7:18       ` Ni, Ruiyu
2017-10-24  7:32         ` 答复: " Fan Jeff
2017-10-24 10:15   ` Laszlo Ersek
2017-10-24 14:24     ` 答复: " Fan Jeff
2017-10-24 16:29       ` Laszlo Ersek
2017-10-24 15:23     ` Dong, Eric
2017-10-24 15:40       ` Dong, Eric
2017-10-24 17:40       ` Laszlo Ersek
2017-10-24 22:30         ` Brian J. Johnson
2017-10-25  5:35           ` 答复: " Fan Jeff
2017-10-25  5:32         ` Fan Jeff
2017-10-25  5:42         ` Dong, Eric
2017-10-25 15:07           ` Laszlo Ersek
2017-10-26  1:13             ` Dong, Eric
2017-10-26 20:48               ` Brian J. Johnson
2017-10-27  1:31                 ` Dong, Eric
2017-10-24  7:31 ` 答复: [Patch 0/2] Enhance collect AP Count logic Fan Jeff

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=734D49CCEBEEF84792F5B80ED585239D5BAA3592@SHSMSX104.ccr.corp.intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox