From: Michael Kinney <michael.d.kinney@intel.com>
Date: Tue, 6 Dec 2016 04:39:01 +0000 (-0800)
Subject: UefiCpuPkg/PiSmmCpuDxeSmm: Remove MTRR field from PSD
X-Git-Tag: edk2-stable201903~4977
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=854c6b80dc3f1d4a151322b21c5fb6952b159ca9

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 cf5ef8217f..4600c7c36e 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.S
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.S
@@ -21,7 +21,6 @@
 
 ASM_GLOBAL  ASM_PFX(SmiPFHandler)
 ASM_GLOBAL  ASM_PFX(PageFaultStubFunction)
-ASM_GLOBAL  ASM_PFX(gSmiMtrrs)
 ASM_GLOBAL  ASM_PFX(gcSmiIdtr)
 ASM_GLOBAL  ASM_PFX(gcSmiGdtr)
 ASM_GLOBAL  ASM_PFX(gTaskGateDescriptor)
@@ -230,7 +229,7 @@ ASM_PFX(gcPsd):
             .long      GDT_SIZE
             .long 0
             .space 24, 0
-            .long      ASM_PFX(gSmiMtrrs)
+            .long 0
             .long 0
 .equ  PSD_SIZE,  . - ASM_PFX(gcPsd)
 
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.asm b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.asm
index 7b162f868b..80a44b861f 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.asm
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.asm
@@ -23,7 +23,6 @@
 
 EXTERNDEF   SmiPFHandler:PROC
 EXTERNDEF   PageFaultStubFunction:PROC
-EXTERNDEF   gSmiMtrrs:QWORD
 EXTERNDEF   gcSmiIdtr:FWORD
 EXTERNDEF   gcSmiGdtr:FWORD
 EXTERNDEF   gTaskGateDescriptor:QWORD
@@ -245,7 +244,7 @@ gcPsd     LABEL   BYTE
             DD      GDT_SIZE
             DD      0
             DB      24 dup (0)
-            DQ      offset gSmiMtrrs
+            DQ      0
 PSD_SIZE  = $ - offset gcPsd
 
 gcSmiGdtr   LABEL   FWORD
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.nasm b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.nasm
index 4d58999e90..7c80a6ae91 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.nasm
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.nasm
@@ -19,7 +19,6 @@
 ;-------------------------------------------------------------------------------
 
 extern  ASM_PFX(FeaturePcdGet (PcdCpuSmmProfileEnable))
-extern  ASM_PFX(gSmiMtrrs)
 extern  ASM_PFX(SmiPFHandler)
 
 global  ASM_PFX(gcSmiIdtr)
@@ -243,7 +242,7 @@ ASM_PFX(gcPsd):
             DD      0
             times   24 DB 0
             DD      0
-            DD      ASM_PFX(gSmiMtrrs)
+            DD      0
 PSD_SIZE  equ $ - ASM_PFX(gcPsd)
 
 ASM_PFX(gcSmiGdtr):
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.S b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.S
index 2e2792db20..338bb70dd8 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.S
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.S
@@ -20,7 +20,6 @@
 #------------------------------------------------------------------------------
 
 ASM_GLOBAL  ASM_PFX(SmiPFHandler)
-ASM_GLOBAL  ASM_PFX(gSmiMtrrs)
 ASM_GLOBAL  ASM_PFX(gcSmiIdtr)
 ASM_GLOBAL  ASM_PFX(gcSmiGdtr)
 ASM_GLOBAL  ASM_PFX(gcPsd)
@@ -113,7 +112,7 @@ ASM_PFX(gcPsd):
             .long      GDT_SIZE
             .long 0
             .space 24, 0
-            .quad      ASM_PFX(gSmiMtrrs)
+            .quad      0
 .equ  PSD_SIZE,  . - ASM_PFX(gcPsd)
 
 #
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.asm b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.asm
index f55ba723ff..80bd739ff4 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.asm
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.asm
@@ -19,7 +19,6 @@
 ;-------------------------------------------------------------------------------
 
 EXTERNDEF   SmiPFHandler:PROC
-EXTERNDEF   gSmiMtrrs:QWORD
 EXTERNDEF   gcSmiIdtr:FWORD
 EXTERNDEF   gcSmiGdtr:FWORD
 EXTERNDEF   gcPsd:BYTE
@@ -129,7 +128,7 @@ gcPsd     LABEL   BYTE
             DD      GDT_SIZE
             DD      0
             DB      24 dup (0)
-            DQ      offset gSmiMtrrs
+            DQ      0
 PSD_SIZE  = $ - offset gcPsd
 
 ;
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.nasm b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.nasm
index bc8d95d8dc..b2e2e6dee6 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.nasm
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.nasm
@@ -19,7 +19,6 @@
 ;-------------------------------------------------------------------------------
 
 extern  ASM_PFX(SmiPFHandler)
-extern  ASM_PFX(gSmiMtrrs)
 
 global  ASM_PFX(gcSmiIdtr)
 global  ASM_PFX(gcSmiGdtr)
@@ -130,7 +129,7 @@ ASM_PFX(gcPsd):
             DD      GDT_SIZE
             DD      0
             times   24 DB 0
-            DQ      ASM_PFX(gSmiMtrrs)
+            DQ      0
 PSD_SIZE  equ $ -   ASM_PFX(gcPsd)
 
 ;