UefiCpuPkg/PiSmmCpuDxeSmm: Remove MTRR field from PSD
authorMichael Kinney <michael.d.kinney@intel.com>
Tue, 6 Dec 2016 04:39:01 +0000 (20:39 -0800)
committerMichael Kinney <michael.d.kinney@intel.com>
Wed, 7 Dec 2016 07:34:16 +0000 (23:34 -0800)
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>
UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.S
UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.asm
UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.nasm
UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.S
UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.asm
UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.nasm

index cf5ef82..4600c7c 100644 (file)
@@ -21,7 +21,6 @@
 \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
@@ -230,7 +229,7 @@ ASM_PFX(gcPsd):
             .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
index 7b162f8..80a44b8 100644 (file)
@@ -23,7 +23,6 @@
 \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
@@ -245,7 +244,7 @@ gcPsd     LABEL   BYTE
             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
index 4d58999..7c80a6a 100644 (file)
@@ -19,7 +19,6 @@
 ;-------------------------------------------------------------------------------\r
 \r
 extern  ASM_PFX(FeaturePcdGet (PcdCpuSmmProfileEnable))\r
-extern  ASM_PFX(gSmiMtrrs)\r
 extern  ASM_PFX(SmiPFHandler)\r
 \r
 global  ASM_PFX(gcSmiIdtr)\r
@@ -243,7 +242,7 @@ ASM_PFX(gcPsd):
             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
index 2e2792d..338bb70 100644 (file)
@@ -20,7 +20,6 @@
 #------------------------------------------------------------------------------\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
@@ -113,7 +112,7 @@ ASM_PFX(gcPsd):
             .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
index f55ba72..80bd739 100644 (file)
@@ -19,7 +19,6 @@
 ;-------------------------------------------------------------------------------\r
 \r
 EXTERNDEF   SmiPFHandler:PROC\r
-EXTERNDEF   gSmiMtrrs:QWORD\r
 EXTERNDEF   gcSmiIdtr:FWORD\r
 EXTERNDEF   gcSmiGdtr:FWORD\r
 EXTERNDEF   gcPsd:BYTE\r
@@ -129,7 +128,7 @@ gcPsd     LABEL   BYTE
             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
index bc8d95d..b2e2e6d 100644 (file)
@@ -19,7 +19,6 @@
 ;-------------------------------------------------------------------------------\r
 \r
 extern  ASM_PFX(SmiPFHandler)\r
-extern  ASM_PFX(gSmiMtrrs)\r
 \r
 global  ASM_PFX(gcSmiIdtr)\r
 global  ASM_PFX(gcSmiGdtr)\r
@@ -130,7 +129,7 @@ ASM_PFX(gcPsd):
             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