From: "Kinney, Michael D" <michael.d.kinney@intel.com>
To: "Fan, Jeff" <jeff.fan@intel.com>,
"Tian, Feng" <feng.tian@intel.com>,
"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>,
"Kinney, Michael D" <michael.d.kinney@intel.com>
Subject: Re: [patch] UefiCpuPkg/PiSmmCpuDxeSmm: Fix .S & .asm build failure
Date: Thu, 15 Dec 2016 17:14:07 +0000 [thread overview]
Message-ID: <E92EE9817A31E24EB0585FDF735412F56487B611@ORSMSX113.amr.corp.intel.com> (raw)
In-Reply-To: <542CF652F8836A4AB8DBFAAD40ED192A4C4E1F2E@SHSMSX103.ccr.corp.intel.com>
Reviewed-by: Michael Kinney <michael.d.kinney@intel.com>
Mike
> -----Original Message-----
> From: Fan, Jeff
> Sent: Wednesday, December 14, 2016 10:34 PM
> To: Tian, Feng <feng.tian@intel.com>; edk2-devel@lists.01.org
> Cc: Kinney, Michael D <michael.d.kinney@intel.com>
> Subject: RE: [edk2] [patch] UefiCpuPkg/PiSmmCpuDxeSmm: Fix .S & .asm build failure
>
> Reviewed-by: Jeff Fan <jeff.fan@intel.com>
>
> -----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 failure
>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Jeff Fan <jeff.fan@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Feng Tian <feng.tian@intel.com>
> ---
> 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/PiSmmCpuDxeSmm/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(FeaturePcdGet (PcdCpuSmmStackGuard)) ASM_GLOBAL ASM_PFX(gSmiHandlerIdtr)
>
> +.equ MSR_IA32_MISC_ENABLE, 0x1A0
> .equ MSR_EFER, 0xc0000080
> .equ MSR_EFER_XD, 0x800
>
> diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.asm
> b/UefiCpuPkg/PiSmmCpuDxeSmm/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
>
> - 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/PiSmmCpuDxeSmm/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/PiSmmCpuDxeSmm/X64/SmiEntry.asm
> index e2fcb6f..c74f82a 100644
> --- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.asm
> +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.asm
> @@ -222,7 +222,7 @@ _SmiHandler:
>
> add rsp, 200h
>
> - 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
prev parent reply other threads:[~2016-12-15 17:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-15 5:26 [patch] UefiCpuPkg/PiSmmCpuDxeSmm: Fix .S & .asm build failure Feng Tian
2016-12-15 6:34 ` Fan, Jeff
2016-12-15 17:14 ` Kinney, Michael D [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E92EE9817A31E24EB0585FDF735412F56487B611@ORSMSX113.amr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox