diff options
| author | Michael Kinney <michael.d.kinney@intel.com> | 2016-12-05 20:39:01 -0800 |
|---|---|---|
| committer | Michael Kinney <michael.d.kinney@intel.com> | 2016-12-06 23:34:16 -0800 |
| commit | 854c6b80dc3f1d4a151322b21c5fb6952b159ca9 (patch) | |
| tree | e8bd30da87830e9f6ac20d048bbf88d15fc5b59e /UefiCpuPkg | |
| parent | a6b7bc7a87bc7690f7f5fd48cfcd79f14676896e (diff) | |
| download | edk2-854c6b80dc3f1d4a151322b21c5fb6952b159ca9.zip edk2-854c6b80dc3f1d4a151322b21c5fb6952b159ca9.tar.gz edk2-854c6b80dc3f1d4a151322b21c5fb6952b159ca9.tar.bz2 | |
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>
Diffstat (limited to 'UefiCpuPkg')
| -rw-r--r-- | UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.S | 3 | ||||
| -rw-r--r-- | UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.asm | 3 | ||||
| -rw-r--r-- | UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.nasm | 3 | ||||
| -rw-r--r-- | UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.S | 3 | ||||
| -rw-r--r-- | UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.asm | 3 | ||||
| -rw-r--r-- | UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.nasm | 3 |
6 files changed, 6 insertions, 12 deletions
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.S b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.S index cf5ef82..4600c7c 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 7b162f8..80a44b8 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 4d58999..7c80a6a 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 2e2792d..338bb70 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 f55ba72..80bd739 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 bc8d95d..b2e2e6d 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)
;
|