* [patch] UefiCpuPkg/PiSmmCpuDxeSmm: Fix .S & .asm build failure
@ 2016-12-15 5:26 Feng Tian
2016-12-15 6:34 ` Fan, Jeff
0 siblings, 1 reply; 3+ messages in thread
From: Feng Tian @ 2016-12-15 5:26 UTC (permalink / raw)
To: edk2-devel; +Cc: Michael D Kinney, Jeff Fan
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [patch] UefiCpuPkg/PiSmmCpuDxeSmm: Fix .S & .asm build failure
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
0 siblings, 1 reply; 3+ messages in thread
From: Fan, Jeff @ 2016-12-15 6:34 UTC (permalink / raw)
To: Tian, Feng, edk2-devel@lists.01.org; +Cc: Kinney, Michael D
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [patch] UefiCpuPkg/PiSmmCpuDxeSmm: Fix .S & .asm build failure
2016-12-15 6:34 ` Fan, Jeff
@ 2016-12-15 17:14 ` Kinney, Michael D
0 siblings, 0 replies; 3+ messages in thread
From: Kinney, Michael D @ 2016-12-15 17:14 UTC (permalink / raw)
To: Fan, Jeff, Tian, Feng, edk2-devel@lists.01.org, Kinney, Michael D
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-12-15 17:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox