From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 1354481C96 for ; Wed, 14 Dec 2016 22:34:10 -0800 (PST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga104.fm.intel.com with ESMTP; 14 Dec 2016 22:34:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,350,1477983600"; d="scan'208";a="18362872" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga002.jf.intel.com with ESMTP; 14 Dec 2016 22:34:09 -0800 Received: from fmsmsx158.amr.corp.intel.com (10.18.116.75) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.248.2; Wed, 14 Dec 2016 22:34:08 -0800 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by fmsmsx158.amr.corp.intel.com (10.18.116.75) with Microsoft SMTP Server (TLS) id 14.3.248.2; Wed, 14 Dec 2016 22:34:09 -0800 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.11]) by shsmsx102.ccr.corp.intel.com ([169.254.2.54]) with mapi id 14.03.0248.002; Thu, 15 Dec 2016 14:34:05 +0800 From: "Fan, Jeff" To: "Tian, Feng" , "edk2-devel@lists.01.org" CC: "Kinney, Michael D" Thread-Topic: [edk2] [patch] UefiCpuPkg/PiSmmCpuDxeSmm: Fix .S & .asm build failure Thread-Index: AQHSVpPO5Jisbn9nAUKXOSeuK5yVUqEIjT2w Date: Thu, 15 Dec 2016 06:34:05 +0000 Message-ID: <542CF652F8836A4AB8DBFAAD40ED192A4C4E1F2E@SHSMSX103.ccr.corp.intel.com> References: In-Reply-To: Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMzk0MDYwMjgtZTdhMy00NjY5LWI4YzktZTA1MzBiNDA4Njc5IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6IkdLUlFjb1FsczVNS3BBVFwvcHMyc2xheXpGcmdqWkRvOXZMSEkyVFh1T0d3PSJ9 x-ctpclassification: CTP_IC x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [patch] UefiCpuPkg/PiSmmCpuDxeSmm: Fix .S & .asm build failure 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: Thu, 15 Dec 2016 06:34:10 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Jeff Fan -----Original Message----- From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Feng= Tian Sent: Thursday, December 15, 2016 1:26 PM To: edk2-devel@lists.01.org Cc: Kinney, Michael D; Fan, Jeff Subject: [edk2] [patch] UefiCpuPkg/PiSmmCpuDxeSmm: Fix .S & .asm build fail= ure Cc: Michael D Kinney Cc: Jeff Fan Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Feng Tian --- UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.S | 1 + UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.asm | 2 +- UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.S | 2 +- UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.asm | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.S b/UefiCpuPkg/PiSmmCp= uDxeSmm/Ia32/SmiEntry.S index 378e065..62f1697 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.S +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.S @@ -28,6 +28,7 @@ ASM_GLOBAL ASM_PFX(mXdSupported) ASM_GLOBAL ASM_PFX(Fe= aturePcdGet (PcdCpuSmmStackGuard)) ASM_GLOBAL ASM_PFX(gSmiHandlerIdtr) =20 +.equ MSR_IA32_MISC_ENABLE, 0x1A0 .equ MSR_EFER, 0xc0000080 .equ MSR_EFER_XD, 0x800 =20 diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.asm b/UefiCpuPkg/PiSmm= CpuDxeSmm/Ia32/SmiEntry.asm index a4f4dcb..8296f36 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.asm +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.asm @@ -202,7 +202,7 @@ _SmiHandler PROC call eax add esp, 4 =20 - mov eax, mXdSupported + mov eax, offset mXdSupported mov al, [eax] cmp al, 0 jz @f diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.S b/UefiCpuPkg/PiSmmCpu= DxeSmm/X64/SmiEntry.S index f4761b0..600d862 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.S +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.S @@ -158,7 +158,7 @@ L13: rdmsr orw $MSR_EFER_XD,%ax # enable NXE wrmsr - jmp @NxeDone + jmp NxeDone SkipNxe: subl $8, %esp NxeDone: diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.asm b/UefiCpuPkg/PiSmmC= puDxeSmm/X64/SmiEntry.asm index e2fcb6f..c74f82a 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.asm +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.asm @@ -222,7 +222,7 @@ _SmiHandler: =20 add rsp, 200h =20 - mov rax, ASM_PFX(mXdSupported) + mov rax, offset ASM_PFX(mXdSupported) mov al, [rax] cmp al, 0 jz @f -- 2.7.1.windows.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel