tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-24 06:04:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

UefiCpuPkg/MpInitLib: Remove unused Lock from MP_CPU_EXCHANGE_INFO

Browse Source 
The Lock is no longer needed since "LOCK XADD" was used in
MpFuncs.nasm for ApIndex atomic increment.

Signed-off-by: Ray Ni <ray.ni@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
Acked-by: Laszlo Ersek <lersek@redhat.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
This commit is contained in:
Ray Ni 2021-02-09 22:10:22 +08:00 committed by mergify[bot]
parent 2fba7d4ee4
commit 8c61f1934d
5 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,10 +121,6 @@ SkipEnableExecuteDisable:
lock inc dword [edi] lock inc dword [edi]
; AP init ; AP init
mov edi, esi
add edi, MP_CPU_EXCHANGE_INFO_FIELD (Lock)
mov eax, NotVacantFlag
mov edi, esi mov edi, esi
add edi, MP_CPU_EXCHANGE_INFO_FIELD (ApIndex) add edi, MP_CPU_EXCHANGE_INFO_FIELD (ApIndex)
mov ebx, 1 mov ebx, 1

4
UefiCpuPkg/Library/MpInitLib/MpEqu.inc
View File

@ -13,9 +13,6 @@
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------
%include "Nasm.inc" %include "Nasm.inc"
VacantFlag equ 00h
NotVacantFlag equ 0ffh
CPU_SWITCH_STATE_IDLE equ 0 CPU_SWITCH_STATE_IDLE equ 0
CPU_SWITCH_STATE_STORED equ 1 CPU_SWITCH_STATE_STORED equ 1
CPU_SWITCH_STATE_LOADED equ 2 CPU_SWITCH_STATE_LOADED equ 2
@ -72,7 +69,6 @@ endstruc
; Equivalent NASM structure of MP_CPU_EXCHANGE_INFO ; Equivalent NASM structure of MP_CPU_EXCHANGE_INFO
; ;
struc MP_CPU_EXCHANGE_INFO struc MP_CPU_EXCHANGE_INFO
.Lock: CTYPE_UINTN 1
.StackStart: CTYPE_UINTN 1 .StackStart: CTYPE_UINTN 1
.StackSize: CTYPE_UINTN 1 .StackSize: CTYPE_UINTN 1
.CFunction: CTYPE_UINTN 1 .CFunction: CTYPE_UINTN 1

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

@ -1006,7 +1006,6 @@ FillExchangeInfoData (
IA32_CR4 Cr4; IA32_CR4 Cr4;
ExchangeInfo = CpuMpData->MpCpuExchangeInfo; ExchangeInfo = CpuMpData->MpCpuExchangeInfo;
ExchangeInfo->Lock = 0;
ExchangeInfo->StackStart = CpuMpData->Buffer; ExchangeInfo->StackStart = CpuMpData->Buffer;
ExchangeInfo->StackSize = CpuMpData->CpuApStackSize; ExchangeInfo->StackSize = CpuMpData->CpuApStackSize;
ExchangeInfo->BufferStart = CpuMpData->WakeupBuffer; ExchangeInfo->BufferStart = CpuMpData->WakeupBuffer;

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

@ -1,7 +1,7 @@
/** @file /** @file
Common header file for MP Initialize Library. Common header file for MP Initialize Library.
Copyright (c) 2016 - 2020, Intel Corporation. All rights reserved.<BR> Copyright (c) 2016 - 2021, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2020, AMD Inc. All rights reserved.<BR> Copyright (c) 2020, AMD Inc. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent SPDX-License-Identifier: BSD-2-Clause-Patent
@ -190,7 +190,6 @@ typedef struct _CPU_MP_DATA CPU_MP_DATA;
// into this structure are used in assembly code in this module // into this structure are used in assembly code in this module
// //
typedef struct { typedef struct {
UINTN Lock;
UINTN StackStart; UINTN StackStart;
UINTN StackSize; UINTN StackSize;
UINTN CFunction; UINTN CFunction;

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

@ -157,10 +157,6 @@ LongModeStart:
lock inc dword [edi] lock inc dword [edi]
; AP init ; AP init
mov edi, esi
add edi, MP_CPU_EXCHANGE_INFO_FIELD (Lock)
mov rax, NotVacantFlag
mov edi, esi mov edi, esi
add edi, MP_CPU_EXCHANGE_INFO_FIELD (ApIndex) add edi, MP_CPU_EXCHANGE_INFO_FIELD (ApIndex)
mov ebx, 1 mov ebx, 1