https://bugzilla.tianocore.org/show_bug.cgi?id=277
The MTRR field was removed from PROCESS_SMM_DESCRIPTOR
structure in commit:
https://github.com/tianocore/edk2/commit/
26ab5ac3621bdefe96987f8c1512ca79e1bb7ac0
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>
\r
ASM_GLOBAL ASM_PFX(SmiPFHandler)\r
ASM_GLOBAL ASM_PFX(PageFaultStubFunction)\r
-ASM_GLOBAL ASM_PFX(gSmiMtrrs)\r
ASM_GLOBAL ASM_PFX(gcSmiIdtr)\r
ASM_GLOBAL ASM_PFX(gcSmiGdtr)\r
ASM_GLOBAL ASM_PFX(gTaskGateDescriptor)\r
.long GDT_SIZE\r
.long 0\r
.space 24, 0\r
- .long ASM_PFX(gSmiMtrrs)\r
+ .long 0\r
.long 0\r
.equ PSD_SIZE, . - ASM_PFX(gcPsd)\r
\r
\r
EXTERNDEF SmiPFHandler:PROC\r
EXTERNDEF PageFaultStubFunction:PROC\r
-EXTERNDEF gSmiMtrrs:QWORD\r
EXTERNDEF gcSmiIdtr:FWORD\r
EXTERNDEF gcSmiGdtr:FWORD\r
EXTERNDEF gTaskGateDescriptor:QWORD\r
DD GDT_SIZE\r
DD 0\r
DB 24 dup (0)\r
- DQ offset gSmiMtrrs\r
+ DQ 0\r
PSD_SIZE = $ - offset gcPsd\r
\r
gcSmiGdtr LABEL FWORD\r
;-------------------------------------------------------------------------------\r
\r
extern ASM_PFX(FeaturePcdGet (PcdCpuSmmProfileEnable))\r
-extern ASM_PFX(gSmiMtrrs)\r
extern ASM_PFX(SmiPFHandler)\r
\r
global ASM_PFX(gcSmiIdtr)\r
DD 0\r
times 24 DB 0\r
DD 0\r
- DD ASM_PFX(gSmiMtrrs)\r
+ DD 0\r
PSD_SIZE equ $ - ASM_PFX(gcPsd)\r
\r
ASM_PFX(gcSmiGdtr):\r
#------------------------------------------------------------------------------\r
\r
ASM_GLOBAL ASM_PFX(SmiPFHandler)\r
-ASM_GLOBAL ASM_PFX(gSmiMtrrs)\r
ASM_GLOBAL ASM_PFX(gcSmiIdtr)\r
ASM_GLOBAL ASM_PFX(gcSmiGdtr)\r
ASM_GLOBAL ASM_PFX(gcPsd)\r
.long GDT_SIZE\r
.long 0\r
.space 24, 0\r
- .quad ASM_PFX(gSmiMtrrs)\r
+ .quad 0\r
.equ PSD_SIZE, . - ASM_PFX(gcPsd)\r
\r
#\r
;-------------------------------------------------------------------------------\r
\r
EXTERNDEF SmiPFHandler:PROC\r
-EXTERNDEF gSmiMtrrs:QWORD\r
EXTERNDEF gcSmiIdtr:FWORD\r
EXTERNDEF gcSmiGdtr:FWORD\r
EXTERNDEF gcPsd:BYTE\r
DD GDT_SIZE\r
DD 0\r
DB 24 dup (0)\r
- DQ offset gSmiMtrrs\r
+ DQ 0\r
PSD_SIZE = $ - offset gcPsd\r
\r
;\r
;-------------------------------------------------------------------------------\r
\r
extern ASM_PFX(SmiPFHandler)\r
-extern ASM_PFX(gSmiMtrrs)\r
\r
global ASM_PFX(gcSmiIdtr)\r
global ASM_PFX(gcSmiGdtr)\r
DD GDT_SIZE\r
DD 0\r
times 24 DB 0\r
- DQ ASM_PFX(gSmiMtrrs)\r
+ DQ 0\r
PSD_SIZE equ $ - ASM_PFX(gcPsd)\r
\r
;\r