From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web08.10660.1612880219866701524 for ; Tue, 09 Feb 2021 06:16:59 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: ray.ni@intel.com) IronPort-SDR: 6CvqZnnlcrRIpAtIfrF9GHns6geXmUAbYCnd/Z+Bf67yx5abu7FdeTM9TAIAwLgnuAdcFEi0bZ xmTOKlysf6kA== X-IronPort-AV: E=McAfee;i="6000,8403,9889"; a="200959165" X-IronPort-AV: E=Sophos;i="5.81,165,1610438400"; d="scan'208";a="200959165" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Feb 2021 06:16:46 -0800 IronPort-SDR: UFRgn9I+vAHQPWbIsY83QuEVFxoyObPiQE4QHcVGmDfIkISee9qA8jOTDr5jrys06wtkrXyzLI Dp1eGwXR4A7w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,165,1610438400"; d="scan'208";a="374969207" Received: from ray-dev.ccr.corp.intel.com ([10.239.158.87]) by orsmga002.jf.intel.com with ESMTP; 09 Feb 2021 06:16:42 -0800 From: "Ni, Ray" To: devel@edk2.groups.io Cc: Eric Dong , Laszlo Ersek , Rahul Kumar Subject: [PATCH v3 4/4] UefiCpuPkg/MpInitLib: Remove unused Lock from MP_CPU_EXCHANGE_INFO Date: Tue, 9 Feb 2021 22:16:34 +0800 Message-Id: <20210209141634.1999-5-ray.ni@intel.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20210209141634.1999-1-ray.ni@intel.com> References: <20210209141634.1999-1-ray.ni@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable The Lock is no longer needed since "LOCK XADD" was used in MpFuncs.nasm for ApIndex atomic increment. Signed-off-by: Ray Ni Cc: Eric Dong Cc: Laszlo Ersek Cc: Rahul Kumar --- UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm | 4 ---- UefiCpuPkg/Library/MpInitLib/MpEqu.inc | 4 ---- UefiCpuPkg/Library/MpInitLib/MpLib.c | 1 - UefiCpuPkg/Library/MpInitLib/MpLib.h | 3 +-- UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm | 4 ---- 5 files changed, 1 insertion(+), 15 deletions(-) diff --git a/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm b/UefiCpuPkg/Li= brary/MpInitLib/Ia32/MpFuncs.nasm index 4363ad9a18..7bd2415670 100644 --- a/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm +++ b/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm @@ -121,10 +121,6 @@ SkipEnableExecuteDisable: lock inc dword [edi]=0D =0D ; AP init=0D - mov edi, esi=0D - add edi, MP_CPU_EXCHANGE_INFO_FIELD (Lock)=0D - mov eax, NotVacantFlag=0D -=0D mov edi, esi=0D add edi, MP_CPU_EXCHANGE_INFO_FIELD (ApIndex)=0D mov ebx, 1=0D diff --git a/UefiCpuPkg/Library/MpInitLib/MpEqu.inc b/UefiCpuPkg/Library/Mp= InitLib/MpEqu.inc index 46c2b5c116..2e9368a374 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpEqu.inc +++ b/UefiCpuPkg/Library/MpInitLib/MpEqu.inc @@ -13,9 +13,6 @@ ;-------------------------------------------------------------------------= ------=0D %include "Nasm.inc"=0D =0D -VacantFlag equ 00h=0D -NotVacantFlag equ 0ffh=0D -=0D CPU_SWITCH_STATE_IDLE equ 0=0D CPU_SWITCH_STATE_STORED equ 1=0D CPU_SWITCH_STATE_LOADED equ 2=0D @@ -72,7 +69,6 @@ endstruc ; Equivalent NASM structure of MP_CPU_EXCHANGE_INFO=0D ;=0D struc MP_CPU_EXCHANGE_INFO=0D - .Lock: CTYPE_UINTN 1=0D .StackStart: CTYPE_UINTN 1=0D .StackSize: CTYPE_UINTN 1=0D .CFunction: CTYPE_UINTN 1=0D diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpIn= itLib/MpLib.c index 2568986d8c..5040053dad 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c @@ -1006,7 +1006,6 @@ FillExchangeInfoData ( IA32_CR4 Cr4;=0D =0D ExchangeInfo =3D CpuMpData->MpCpuExchangeInfo;=0D - ExchangeInfo->Lock =3D 0;=0D ExchangeInfo->StackStart =3D CpuMpData->Buffer;=0D ExchangeInfo->StackSize =3D CpuMpData->CpuApStackSize;=0D ExchangeInfo->BufferStart =3D CpuMpData->WakeupBuffer;=0D diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.h b/UefiCpuPkg/Library/MpIn= itLib/MpLib.h index 02652eaae1..0bd60388b1 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.h +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.h @@ -1,7 +1,7 @@ /** @file=0D Common header file for MP Initialize Library.=0D =0D - Copyright (c) 2016 - 2020, Intel Corporation. All rights reserved.
=0D + Copyright (c) 2016 - 2021, Intel Corporation. All rights reserved.
=0D Copyright (c) 2020, AMD Inc. All rights reserved.
=0D =0D SPDX-License-Identifier: BSD-2-Clause-Patent=0D @@ -190,7 +190,6 @@ typedef struct _CPU_MP_DATA CPU_MP_DATA; // into this structure are used in assembly code in this module=0D //=0D typedef struct {=0D - UINTN Lock;=0D UINTN StackStart;=0D UINTN StackSize;=0D UINTN CFunction;=0D diff --git a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm b/UefiCpuPkg/Lib= rary/MpInitLib/X64/MpFuncs.nasm index db297f5cca..50df802d1f 100644 --- a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm +++ b/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm @@ -157,10 +157,6 @@ LongModeStart: lock inc dword [edi]=0D =0D ; AP init=0D - mov edi, esi=0D - add edi, MP_CPU_EXCHANGE_INFO_FIELD (Lock)=0D - mov rax, NotVacantFlag=0D -=0D mov edi, esi=0D add edi, MP_CPU_EXCHANGE_INFO_FIELD (ApIndex)=0D mov ebx, 1=0D --=20 2.27.0.windows.1