From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by ml01.01.org (Postfix) with ESMTP id 792EB1A1E2D for ; Fri, 29 Jul 2016 11:15:26 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP; 29 Jul 2016 11:15:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,440,1464678000"; d="scan'208";a="1016338979" Received: from jfan12-desk.ccr.corp.intel.com ([10.239.9.5]) by fmsmga001.fm.intel.com with ESMTP; 29 Jul 2016 11:15:25 -0700 From: Jeff Fan To: edk2-devel@ml01.01.org Cc: Michael Kinney , Feng Tian , Giri P Mudusuru , Laszlo Ersek Date: Sat, 30 Jul 2016 02:14:33 +0800 Message-Id: <1469816112-8200-8-git-send-email-jeff.fan@intel.com> X-Mailer: git-send-email 2.7.4.windows.1 In-Reply-To: <1469816112-8200-1-git-send-email-jeff.fan@intel.com> References: <1469816112-8200-1-git-send-email-jeff.fan@intel.com> Subject: [Patch v4 07/46] UefiCpuPkg/MpInitLib: Fix typo and clean up the code X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jul 2016 18:15:26 -0000 1. Rename NumApsExecutingLoction to NumApsExecutingLocation 2. Update some comments in NASM files. 3. Remove PeiCpuMpData from MP_CPU_EXCHANGE_INFO. Cc: Michael Kinney Cc: Feng Tian Cc: Giri P Mudusuru Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jeff Fan --- UefiCpuPkg/Library/MpInitLib/Ia32/MpEqu.inc | 2 +- UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm | 10 +++++----- UefiCpuPkg/Library/MpInitLib/MpLib.h | 1 - UefiCpuPkg/Library/MpInitLib/X64/MpEqu.inc | 2 +- UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm | 14 +++++++------- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/UefiCpuPkg/Library/MpInitLib/Ia32/MpEqu.inc b/UefiCpuPkg/Library/MpInitLib/Ia32/MpEqu.inc index 773eab3..015396a 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 -NumApsExecutingLoction equ LockLocation + 24h +NumApsExecutingLocation equ LockLocation + 24h CodeSegmentLocation equ LockLocation + 28h DataSegmentLocation equ LockLocation + 2Ch diff --git a/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm b/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm index 0852a5b..7050413 100644 --- a/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm +++ b/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm @@ -71,8 +71,8 @@ o32 lidt [cs:si] xor ax, ax mov ds, ax - mov eax, cr0 ;Get control register 0 - or eax, 000000003h ;Set PE bit (bit #0) & MP + mov eax, cr0 ; Get control register 0 + or eax, 000000003h ; Set PE bit (bit #0) & MP mov cr0, eax jmp 0:strict dword 0 ; far jump to protected mode @@ -95,7 +95,7 @@ TestLock: jz TestLock mov edi, esi - add edi, NumApsExecutingLoction + add edi, NumApsExecutingLocation inc dword [edi] mov ebx, [edi] @@ -133,9 +133,9 @@ CProcedureInvoke: add edi, ApProcedureLocation mov eax, [edi] - call eax ; invoke C function + call eax ; Invoke C function - jmp $ ; never reach here + jmp $ ; Never reach here RendezvousFunnelProcEnd: ;------------------------------------------------------------------------------------- diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.h b/UefiCpuPkg/Library/MpInitLib/MpLib.h index 0453c22..92d1dd9 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.h +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.h @@ -56,7 +56,6 @@ typedef struct { UINTN CodeSegment; UINTN DataSegment; UINTN Cr3; - PEI_CPU_MP_DATA *PeiCpuMpData; } MP_CPU_EXCHANGE_INFO; #pragma pack() diff --git a/UefiCpuPkg/Library/MpInitLib/X64/MpEqu.inc b/UefiCpuPkg/Library/MpInitLib/X64/MpEqu.inc index 00f57ce..5aac212 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 -NumApsExecutingLoction equ LockLocation + 44h +NumApsExecutingLocation equ LockLocation + 44h CodeSegmentLocation equ LockLocation + 4Ch DataSegmentLocation equ LockLocation + 54h Cr3Location equ LockLocation + 5Ch diff --git a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm b/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm index f19c75f..848992c 100644 --- a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm +++ b/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm @@ -57,7 +57,7 @@ BITS 16 mov di, CodeSegmentLocation mov edx, [di] mov di, ax - sub di, 02h + sub di, 02h mov [di],dx ; Patch long mode CS sub di, 04h add eax, ebx @@ -117,7 +117,7 @@ TestLock: jz TestLock mov edi, esi - add edi, NumApsExecutingLoction + add edi, NumApsExecutingLocation inc dword [edi] mov ebx, [edi] @@ -138,8 +138,8 @@ Releaselock: xchg qword [edi], rax CProcedureInvoke: - push rbp ; push BIST data at top of AP stack - xor rbp, rbp ; clear ebp for call stack trace + push rbp ; Push BIST data at top of AP stack + xor rbp, rbp ; Clear ebp for call stack trace push rbp mov rbp, rsp @@ -157,9 +157,9 @@ CProcedureInvoke: mov rax, qword [edi] sub rsp, 20h - call rax ; invoke C function + call rax ; Invoke C function add rsp, 20h - jmp $ + jmp $ ; Should never reach here RendezvousFunnelProcEnd: @@ -176,7 +176,7 @@ ASM_PFX(AsmGetAddressMap): ;------------------------------------------------------------------------------------- ;AsmExchangeRole procedure follows. This procedure executed by current BSP, that is -;about to become an AP. It switches it'stack with the current AP. +;about to become an AP. It switches its stack with the current AP. ;AsmExchangeRole (IN CPU_EXCHANGE_INFO *MyInfo, IN CPU_EXCHANGE_INFO *OthersInfo); ;------------------------------------------------------------------------------------- global ASM_PFX(AsmExchangeRole) -- 2.7.4.windows.1