* [Patch] UefiCpuPkg/PiSmmCpuDxeSmm: Remove MTRR field from PSD
@ 2016-12-06 4:41 Michael Kinney
2016-12-06 5:20 ` Fan, Jeff
2016-12-07 11:36 ` Yao, Jiewen
0 siblings, 2 replies; 3+ messages in thread
From: Michael Kinney @ 2016-12-06 4:41 UTC (permalink / raw)
To: edk2-devel; +Cc: Jiewen Yao, Jeff Fan, Feng Tian
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>
---
UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.S | 3 +--
UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.asm | 3 +--
UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.nasm | 3 +--
UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.S | 3 +--
UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.asm | 3 +--
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)
;
--
2.6.3.windows.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Patch] UefiCpuPkg/PiSmmCpuDxeSmm: Remove MTRR field from PSD
2016-12-06 4:41 [Patch] UefiCpuPkg/PiSmmCpuDxeSmm: Remove MTRR field from PSD Michael Kinney
@ 2016-12-06 5:20 ` Fan, Jeff
2016-12-07 11:36 ` Yao, Jiewen
1 sibling, 0 replies; 3+ messages in thread
From: Fan, Jeff @ 2016-12-06 5:20 UTC (permalink / raw)
To: Kinney, Michael D, edk2-devel@lists.01.org; +Cc: Yao, Jiewen, Tian, Feng
Reviewed-by: Jeff Fan <jeff.fan@intel.com>
-----Original Message-----
From: Kinney, Michael D
Sent: Tuesday, December 06, 2016 12:41 PM
To: edk2-devel@lists.01.org
Cc: Yao, Jiewen; Fan, Jeff; Tian, Feng
Subject: [Patch] 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>
---
UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.S | 3 +--
UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.asm | 3 +-- UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.nasm | 3 +--
UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.S | 3 +--
UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.asm | 3 +--
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)
;
--
2.6.3.windows.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Patch] UefiCpuPkg/PiSmmCpuDxeSmm: Remove MTRR field from PSD
2016-12-06 4:41 [Patch] UefiCpuPkg/PiSmmCpuDxeSmm: Remove MTRR field from PSD Michael Kinney
2016-12-06 5:20 ` Fan, Jeff
@ 2016-12-07 11:36 ` Yao, Jiewen
1 sibling, 0 replies; 3+ messages in thread
From: Yao, Jiewen @ 2016-12-07 11:36 UTC (permalink / raw)
To: Kinney, Michael D, edk2-devel@lists.01.org; +Cc: Fan, Jeff, Tian, Feng
Reviewed-by: Jiewen.yao@intel.com
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Tuesday, December 6, 2016 12:41 PM
> To: edk2-devel@lists.01.org
> Cc: Yao, Jiewen <jiewen.yao@intel.com>; Fan, Jeff <jeff.fan@intel.com>; Tian,
> Feng <feng.tian@intel.com>
> Subject: [Patch] 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/26ab5ac3621bdefe96987f8c1512c
> a79e1bb7ac0
>
> 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>
> ---
> UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.S | 3 +--
> UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.asm | 3 +--
> UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.nasm | 3 +--
> UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.S | 3 +--
> UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.asm | 3 +--
> 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)
>
> ;
> --
> 2.6.3.windows.1
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-12-07 11:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-06 4:41 [Patch] UefiCpuPkg/PiSmmCpuDxeSmm: Remove MTRR field from PSD Michael Kinney
2016-12-06 5:20 ` Fan, Jeff
2016-12-07 11:36 ` Yao, Jiewen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox