* [PATCH 1/2] UefiCpuPkg/SmmCpuFeaturesLib: Fix Ia32/SmiEntry.asm build issue
2017-05-10 6:49 [PATCH 0/2] Fix SmmCpuFeaturesLib issues Jeff Fan
@ 2017-05-10 6:49 ` Jeff Fan
2017-05-10 6:49 ` [PATCH 2/2] UefiCpuPkg/SmmCpuFeaturesLib: Correct print level Jeff Fan
2017-05-11 7:56 ` [PATCH 0/2] Fix SmmCpuFeaturesLib issues Dong, Eric
2 siblings, 0 replies; 4+ messages in thread
From: Jeff Fan @ 2017-05-10 6:49 UTC (permalink / raw)
To: edk2-devel; +Cc: Jiewen Yao, Eric Dong
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff.fan@intel.com>
---
UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.asm | 6 +++---
.../Library/SmmCpuFeaturesLib/Ia32/SmiException.asm | 15 ++++++++++-----
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.asm b/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.asm
index 94888d5..91dc1eb 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.asm
+++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.asm
@@ -1,5 +1,5 @@
;------------------------------------------------------------------------------ ;
-; Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
+; Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
; This program and the accompanying materials
; are licensed and made available under the terms and conditions of the BSD License
; which accompanies this distribution. The full text of the license may be found at
@@ -201,7 +201,7 @@ CommonHandler:
call eax
add esp, 4
- mov eax, gStmXdSupported
+ mov eax, offset gStmXdSupported
mov al, [eax]
cmp al, 0
jz @f
@@ -221,7 +221,7 @@ _StmSmiHandler:
; Check XD disable bit
;
xor esi, esi
- mov eax, gStmXdSupported
+ mov eax, offset gStmXdSupported
mov al, [eax]
cmp al, 0
jz @StmXdDone
diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.asm b/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.asm
index 7c04ad9..d0ae147 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.asm
+++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.asm
@@ -1,5 +1,5 @@
;------------------------------------------------------------------------------ ;
-; Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
+; Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
; This program and the accompanying materials
; are licensed and made available under the terms and conditions of the BSD License
; which accompanies this distribution. The full text of the license may be found at
@@ -26,11 +26,16 @@ EXTERNDEF gcStmPsd:BYTE
EXTERNDEF SmmStmExceptionHandler:PROC
EXTERNDEF SmmStmSetup:PROC
EXTERNDEF SmmStmTeardown:PROC
+EXTERNDEF gStmXdSupported:BYTE
CODE_SEL = 08h
DATA_SEL = 20h
TSS_SEL = 40h
+MSR_IA32_MISC_ENABLE EQU 1A0h
+MSR_EFER EQU 0c0000080h
+MSR_EFER_XD EQU 0800h
+
.data
gcStmPsd LABEL BYTE
@@ -88,7 +93,7 @@ _OnStmSetup PROC
; Check XD disable bit
;
xor esi, esi
- mov eax, gStmXdSupported
+ mov eax, offset gStmXdSupported
mov al, [eax]
cmp al, 0
jz @StmXdDone1
@@ -109,7 +114,7 @@ _OnStmSetup PROC
call SmmStmSetup
- mov eax, gStmXdSupported
+ mov eax, offset gStmXdSupported
mov al, [eax]
cmp al, 0
jz @f
@@ -130,7 +135,7 @@ _OnStmTeardown PROC
; Check XD disable bit
;
xor esi, esi
- mov eax, gStmXdSupported
+ mov eax, offset gStmXdSupported
mov al, [eax]
cmp al, 0
jz @StmXdDone2
@@ -151,7 +156,7 @@ _OnStmTeardown PROC
call SmmStmTeardown
- mov eax, gStmXdSupported
+ mov eax, offset gStmXdSupported
mov al, [eax]
cmp al, 0
jz @f
--
2.9.3.windows.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] UefiCpuPkg/SmmCpuFeaturesLib: Correct print level
2017-05-10 6:49 [PATCH 0/2] Fix SmmCpuFeaturesLib issues Jeff Fan
2017-05-10 6:49 ` [PATCH 1/2] UefiCpuPkg/SmmCpuFeaturesLib: Fix Ia32/SmiEntry.asm build issue Jeff Fan
@ 2017-05-10 6:49 ` Jeff Fan
2017-05-11 7:56 ` [PATCH 0/2] Fix SmmCpuFeaturesLib issues Dong, Eric
2 siblings, 0 replies; 4+ messages in thread
From: Jeff Fan @ 2017-05-10 6:49 UTC (permalink / raw)
To: edk2-devel; +Cc: Jiewen Yao, Eric Dong
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff.fan@intel.com>
---
UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c
index 03937dc..45015b8 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c
+++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c
@@ -326,8 +326,8 @@ SmmCpuFeaturesInstallSmiHandler (
Psd->SmmSmiHandlerRsp = (UINTN)SmiStack + StackSize - sizeof(UINTN);
Psd->SmmCr3 = Cr3;
- DEBUG((DEBUG_ERROR, "CpuSmmStmExceptionStackSize - %x\n", PcdGet32(PcdCpuSmmStmExceptionStackSize)));
- DEBUG((DEBUG_ERROR, "Pages - %x\n", EFI_SIZE_TO_PAGES(PcdGet32(PcdCpuSmmStmExceptionStackSize))));
+ DEBUG((DEBUG_INFO, "CpuSmmStmExceptionStackSize - %x\n", PcdGet32(PcdCpuSmmStmExceptionStackSize)));
+ DEBUG((DEBUG_INFO, "Pages - %x\n", EFI_SIZE_TO_PAGES(PcdGet32(PcdCpuSmmStmExceptionStackSize))));
Psd->StmProtectionExceptionHandler.SpeRsp = (UINT64)(UINTN)AllocatePages (EFI_SIZE_TO_PAGES (PcdGet32 (PcdCpuSmmStmExceptionStackSize)));
Psd->StmProtectionExceptionHandler.SpeRsp += EFI_PAGES_TO_SIZE (EFI_SIZE_TO_PAGES (PcdGet32 (PcdCpuSmmStmExceptionStackSize)));
@@ -735,7 +735,7 @@ ValidateResource (
Resource = ResourceList;
for (Index = 0; Index < Count; Index++) {
- DEBUG ((DEBUG_ERROR, "ValidateResource (%d) - RscType(%x)\n", Index, Resource->Header.RscType));
+ DEBUG ((DEBUG_INFO, "ValidateResource (%d) - RscType(%x)\n", Index, Resource->Header.RscType));
//
// Validate resource.
//
@@ -782,7 +782,7 @@ ValidateResource (
break;
case PCI_CFG_RANGE:
- DEBUG ((DEBUG_ERROR, "ValidateResource - PCI (0x%02x, 0x%08x, 0x%02x, 0x%02x)\n", Resource->PciCfg.OriginatingBusNumber, Resource->PciCfg.LastNodeIndex, Resource->PciCfg.PciDevicePath[0].PciDevice, Resource->PciCfg.PciDevicePath[0].PciFunction));
+ DEBUG ((DEBUG_INFO, "ValidateResource - PCI (0x%02x, 0x%08x, 0x%02x, 0x%02x)\n", Resource->PciCfg.OriginatingBusNumber, Resource->PciCfg.LastNodeIndex, Resource->PciCfg.PciDevicePath[0].PciDevice, Resource->PciCfg.PciDevicePath[0].PciFunction));
if (Resource->Header.Length != sizeof (STM_RSC_PCI_CFG_DESC) + (sizeof(STM_PCI_DEVICE_PATH_NODE) * Resource->PciCfg.LastNodeIndex)) {
return FALSE;
}
--
2.9.3.windows.2
^ permalink raw reply related [flat|nested] 4+ messages in thread