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:

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>

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.S b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.S
index cf5ef8217f63c9bc957220510f87306087dd39d9..4600c7c36ee606a799cecd49b37b49be0dddfd51 100644 (file)
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.S
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.S
@@ -21,7 +21,6 @@
 \r
 ASM_GLOBAL  ASM_PFX(SmiPFHandler)\r
 ASM_GLOBAL  ASM_PFX(PageFaultStubFunction)\r
 \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
 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      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
             .long 0\r
 .equ  PSD_SIZE,  . - ASM_PFX(gcPsd)\r
 \r

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.asm b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.asm
index 7b162f868b943d783620d554a0d2c4c03cdf227a..80a44b861fcb183bdfd3542645eb81e49b6df8e7 100644 (file)
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.asm
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.asm
@@ -23,7 +23,6 @@
 \r
 EXTERNDEF   SmiPFHandler:PROC\r
 EXTERNDEF   PageFaultStubFunction:PROC\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
 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
             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
 PSD_SIZE  = $ - offset gcPsd\r
 \r
 gcSmiGdtr   LABEL   FWORD\r

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.nasm b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.nasm
index 4d58999e90a64f74376e067431d33c3e9897a779..7c80a6ae91c274b38ec5bd3579e64c42adf53f62 100644 (file)
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.nasm
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.nasm
@@ -19,7 +19,6 @@
 ;-------------------------------------------------------------------------------\r
 \r
 extern  ASM_PFX(FeaturePcdGet (PcdCpuSmmProfileEnable))\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
 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      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
 PSD_SIZE  equ $ - ASM_PFX(gcPsd)\r
 \r
 ASM_PFX(gcSmiGdtr):\r

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.S b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.S
index 2e2792db20e520b4ab8f30a1f86fbddda2e7bb7a..338bb70dd82161eb905d5cf043eca0a52982b182 100644 (file)
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.S
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.S
@@ -20,7 +20,6 @@
 #------------------------------------------------------------------------------\r
 \r
 ASM_GLOBAL  ASM_PFX(SmiPFHandler)\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
 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
             .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
 .equ  PSD_SIZE,  . - ASM_PFX(gcPsd)\r
 \r
 #\r

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.asm b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.asm
index f55ba723ff3878e698b43b157e6036999ffd6eec..80bd739ff4c89ccc8598a11bb7fc2b41675aa425 100644 (file)
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.asm
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.asm
@@ -19,7 +19,6 @@
 ;-------------------------------------------------------------------------------\r
 \r
 EXTERNDEF   SmiPFHandler:PROC\r
 ;-------------------------------------------------------------------------------\r
 \r
 EXTERNDEF   SmiPFHandler:PROC\r

-EXTERNDEF   gSmiMtrrs:QWORD\r

 EXTERNDEF   gcSmiIdtr:FWORD\r
 EXTERNDEF   gcSmiGdtr:FWORD\r
 EXTERNDEF   gcPsd:BYTE\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
             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
 PSD_SIZE  = $ - offset gcPsd\r
 \r
 ;\r

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.nasm b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.nasm
index bc8d95d8dc99e6edaa5aea563921d887e844174c..b2e2e6dee6021f304f48837a05170303e4c4dd51 100644 (file)
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.nasm
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.nasm
@@ -19,7 +19,6 @@
 ;-------------------------------------------------------------------------------\r
 \r
 extern  ASM_PFX(SmiPFHandler)\r
 ;-------------------------------------------------------------------------------\r
 \r
 extern  ASM_PFX(SmiPFHandler)\r

-extern  ASM_PFX(gSmiMtrrs)\r

 \r
 global  ASM_PFX(gcSmiIdtr)\r
 global  ASM_PFX(gcSmiGdtr)\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
             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
 PSD_SIZE  equ $ -   ASM_PFX(gcPsd)\r
 \r
 ;\r