tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UefiCpuPkg/SmmCpuFeaturesLib: Fix Ia32/SmiEntry.asm build issue 

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff.fan@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
This commit is contained in:
Jeff Fan 2017-05-10 14:42:41 +08:00
parent 6d92ae11d1
commit 6afc643ce0
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.asm
View File

@ -1,5 +1,5 @@
;------------------------------------------------------------------------------ ;
; Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
; Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
; This program and the accompanying materials
; are licensed and made available under the terms and conditions of the BSD License
; which accompanies this distribution. The full text of the license may be found at
@ -201,7 +201,7 @@ CommonHandler:
call eax
add esp, 4
mov eax, gStmXdSupported
mov eax, offset gStmXdSupported
mov al, [eax]
cmp al, 0
jz @f
@ -221,7 +221,7 @@ _StmSmiHandler:
; Check XD disable bit
;
xor esi, esi
mov eax, gStmXdSupported
mov eax, offset gStmXdSupported
mov al, [eax]
cmp al, 0
jz @StmXdDone

15
UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.asm
View File

@ -1,5 +1,5 @@
;------------------------------------------------------------------------------ ;
; Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
; Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
; This program and the accompanying materials
; are licensed and made available under the terms and conditions of the BSD License
; which accompanies this distribution. The full text of the license may be found at
@ -26,11 +26,16 @@ EXTERNDEF gcStmPsd:BYTE
EXTERNDEF SmmStmExceptionHandler:PROC
EXTERNDEF SmmStmSetup:PROC
EXTERNDEF SmmStmTeardown:PROC
EXTERNDEF gStmXdSupported:BYTE
CODE_SEL = 08h
DATA_SEL = 20h
TSS_SEL = 40h
MSR_IA32_MISC_ENABLE EQU 1A0h
MSR_EFER EQU 0c0000080h
MSR_EFER_XD EQU 0800h
.data
gcStmPsd LABEL BYTE
@ -88,7 +93,7 @@ _OnStmSetup PROC
; Check XD disable bit
;
xor esi, esi
mov eax, gStmXdSupported
mov eax, offset gStmXdSupported
mov al, [eax]
cmp al, 0
jz @StmXdDone1
@ -109,7 +114,7 @@ _OnStmSetup PROC
call SmmStmSetup
mov eax, gStmXdSupported
mov eax, offset gStmXdSupported
mov al, [eax]
cmp al, 0
jz @f
@ -130,7 +135,7 @@ _OnStmTeardown PROC
; Check XD disable bit
;
xor esi, esi
mov eax, gStmXdSupported
mov eax, offset gStmXdSupported
mov al, [eax]
cmp al, 0
jz @StmXdDone2
@ -151,7 +156,7 @@ _OnStmTeardown PROC
call SmmStmTeardown
mov eax, gStmXdSupported
mov eax, offset gStmXdSupported
mov al, [eax]
cmp al, 0
jz @f