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

UefiCpuPkg/PiSmmCpuDxeSmm: Remove MTRR field from PSD 

https://bugzilla.tianocore.org/show_bug.cgi?id=277

The MTRR field was removed from PROCESS_SMM_DESCRIPTOR
structure in commit:

26ab5ac362

However, the references to the MTRR field in assembly
files were not removed.  Remove the extern reference
to gSmiMtrr and set the Reserved14 field
of PROCESS_SMM_DESCRIPTOR to 0.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jeff Fan <jeff.fan@intel.com>
Cc: Feng Tian <feng.tian@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
Reviewed-by: Jeff Fan <jeff.fan@intel.com>
This commit is contained in:
Michael Kinney 2016-12-05 20:39:01 -08:00
parent a6b7bc7a87
commit 854c6b80dc
6 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.S
View File

@ -21,7 +21,6 @@
ASM_GLOBAL ASM_PFX(SmiPFHandler) ASM_GLOBAL ASM_PFX(SmiPFHandler)
ASM_GLOBAL ASM_PFX(PageFaultStubFunction) ASM_GLOBAL ASM_PFX(PageFaultStubFunction)
ASM_GLOBAL ASM_PFX(gSmiMtrrs)
ASM_GLOBAL ASM_PFX(gcSmiIdtr) ASM_GLOBAL ASM_PFX(gcSmiIdtr)
ASM_GLOBAL ASM_PFX(gcSmiGdtr) ASM_GLOBAL ASM_PFX(gcSmiGdtr)
ASM_GLOBAL ASM_PFX(gTaskGateDescriptor) ASM_GLOBAL ASM_PFX(gTaskGateDescriptor)
@ -230,7 +229,7 @@ ASM_PFX(gcPsd):
.long GDT_SIZE .long GDT_SIZE
.long 0 .long 0
.space 24, 0 .space 24, 0
.long ASM_PFX(gSmiMtrrs) .long 0
.long 0 .long 0
.equ PSD_SIZE, . - ASM_PFX(gcPsd) .equ PSD_SIZE, . - ASM_PFX(gcPsd)

3
UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.asm
View File

@ -23,7 +23,6 @@
EXTERNDEF SmiPFHandler:PROC EXTERNDEF SmiPFHandler:PROC
EXTERNDEF PageFaultStubFunction:PROC EXTERNDEF PageFaultStubFunction:PROC
EXTERNDEF gSmiMtrrs:QWORD
EXTERNDEF gcSmiIdtr:FWORD EXTERNDEF gcSmiIdtr:FWORD
EXTERNDEF gcSmiGdtr:FWORD EXTERNDEF gcSmiGdtr:FWORD
EXTERNDEF gTaskGateDescriptor:QWORD EXTERNDEF gTaskGateDescriptor:QWORD
@ -245,7 +244,7 @@ gcPsd LABEL BYTE
DD GDT_SIZE DD GDT_SIZE
DD 0 DD 0
DB 24 dup (0) DB 24 dup (0)
DQ offset gSmiMtrrs DQ 0
PSD_SIZE = $ - offset gcPsd PSD_SIZE = $ - offset gcPsd
gcSmiGdtr LABEL FWORD gcSmiGdtr LABEL FWORD

3
UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.nasm
View File

@ -19,7 +19,6 @@
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------
extern ASM_PFX(FeaturePcdGet (PcdCpuSmmProfileEnable)) extern ASM_PFX(FeaturePcdGet (PcdCpuSmmProfileEnable))
extern ASM_PFX(gSmiMtrrs)
extern ASM_PFX(SmiPFHandler) extern ASM_PFX(SmiPFHandler)
global ASM_PFX(gcSmiIdtr) global ASM_PFX(gcSmiIdtr)
@ -243,7 +242,7 @@ ASM_PFX(gcPsd):
DD 0 DD 0
times 24 DB 0 times 24 DB 0
DD 0 DD 0
DD ASM_PFX(gSmiMtrrs) DD 0
PSD_SIZE equ $ - ASM_PFX(gcPsd) PSD_SIZE equ $ - ASM_PFX(gcPsd)
ASM_PFX(gcSmiGdtr): ASM_PFX(gcSmiGdtr):

3
UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.S
View File

@ -20,7 +20,6 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
ASM_GLOBAL ASM_PFX(SmiPFHandler) ASM_GLOBAL ASM_PFX(SmiPFHandler)
ASM_GLOBAL ASM_PFX(gSmiMtrrs)
ASM_GLOBAL ASM_PFX(gcSmiIdtr) ASM_GLOBAL ASM_PFX(gcSmiIdtr)
ASM_GLOBAL ASM_PFX(gcSmiGdtr) ASM_GLOBAL ASM_PFX(gcSmiGdtr)
ASM_GLOBAL ASM_PFX(gcPsd) ASM_GLOBAL ASM_PFX(gcPsd)
@ -113,7 +112,7 @@ ASM_PFX(gcPsd):
.long GDT_SIZE .long GDT_SIZE
.long 0 .long 0
.space 24, 0 .space 24, 0
.quad ASM_PFX(gSmiMtrrs) .quad 0
.equ PSD_SIZE, . - ASM_PFX(gcPsd) .equ PSD_SIZE, . - ASM_PFX(gcPsd)
# #

3
UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.asm
View File

@ -19,7 +19,6 @@
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------
EXTERNDEF SmiPFHandler:PROC EXTERNDEF SmiPFHandler:PROC
EXTERNDEF gSmiMtrrs:QWORD
EXTERNDEF gcSmiIdtr:FWORD EXTERNDEF gcSmiIdtr:FWORD
EXTERNDEF gcSmiGdtr:FWORD EXTERNDEF gcSmiGdtr:FWORD
EXTERNDEF gcPsd:BYTE EXTERNDEF gcPsd:BYTE
@ -129,7 +128,7 @@ gcPsd LABEL BYTE
DD GDT_SIZE DD GDT_SIZE
DD 0 DD 0
DB 24 dup (0) DB 24 dup (0)
DQ offset gSmiMtrrs DQ 0
PSD_SIZE = $ - offset gcPsd PSD_SIZE = $ - offset gcPsd
; ;

3
UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.nasm
View File

@ -19,7 +19,6 @@
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------
extern ASM_PFX(SmiPFHandler) extern ASM_PFX(SmiPFHandler)
extern ASM_PFX(gSmiMtrrs)
global ASM_PFX(gcSmiIdtr) global ASM_PFX(gcSmiIdtr)
global ASM_PFX(gcSmiGdtr) global ASM_PFX(gcSmiGdtr)
@ -130,7 +129,7 @@ ASM_PFX(gcPsd):
DD GDT_SIZE DD GDT_SIZE
DD 0 DD 0
times 24 DB 0 times 24 DB 0
DQ ASM_PFX(gSmiMtrrs) DQ 0
PSD_SIZE equ $ - ASM_PFX(gcPsd) PSD_SIZE equ $ - ASM_PFX(gcPsd)
; ;