From: Ray Ni Date: Tue, 4 Jun 2019 10:49:25 +0000 (+0800) Subject: UefiCpuPkg/MpInitLib: increase NumApsExecuting only for ApInitConfig X-Git-Tag: edk2-stable201908~441 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=5b9b0a8da64105ed8a87743f7d71faddf1719175 UefiCpuPkg/MpInitLib: increase NumApsExecuting only for ApInitConfig NumApsExecuting is only used when InitFlag == ApInitConfig for counting the processor count. The patch changes Ia32 version of waking up vector assembly code to align to x64 version of waking up vector assembly code. After the change both versions of waking up vector increase NumApsExecuting when InitFlag == ApInitConfig. Signed-off-by: Ray Ni Reviewed-by: Laszlo Ersek Reviewed-by: Eric Dong --- diff --git a/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm b/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm index 34b8705adb..b74046b76a 100644 --- a/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm +++ b/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm @@ -1,5 +1,5 @@ ;------------------------------------------------------------------------------ ; -; Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.
+; Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.
; SPDX-License-Identifier: BSD-2-Clause-Patent ; ; Module Name: @@ -81,12 +81,6 @@ Flat32Start: ; protected mode entry point mov esi, ebx - ; Increment the number of APs executing here as early as possible - ; This is decremented in C code when AP is finished executing - mov edi, esi - add edi, NumApsExecutingLocation - lock inc dword [edi] - mov edi, esi add edi, EnableExecuteDisableLocation cmp byte [edi], 0 @@ -120,6 +114,12 @@ SkipEnableExecuteDisable: cmp dword [edi], 1 ; 1 == ApInitConfig jnz GetApicId + ; Increment the number of APs executing here as early as possible + ; This is decremented in C code when AP is finished executing + mov edi, esi + add edi, NumApsExecutingLocation + lock inc dword [edi] + ; AP init mov edi, esi add edi, LockLocation