tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-23 05:34:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

UefiCpuPkg/PiSmmCpuDxeSmm: Enable/Restore XD in SMM

Browse Source 
If XD is supported, then SMM enables it.  The non-SMM execution
environment can choose to enable or disable XD, so the state of
XD must be detected in each SMI and be enabled/restored.

Cc: Jeff Fan <jeff.fan@intel.com>
Cc: Jiewen Yao <jiewen.yao@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>
Regression-tested-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Michael Kinney 2016-02-18 13:09:23 -08:00
parent d691abec1b
commit e1695f8dcf
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
SMM MP service implementation SMM MP service implementation
Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR> Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -1019,6 +1019,7 @@ SmiRendezvous (
BOOLEAN BspInProgress; BOOLEAN BspInProgress;
UINTN Index; UINTN Index;
UINTN Cr2; UINTN Cr2;
BOOLEAN XdDisableFlag;
// //
// Save Cr2 because Page Fault exception in SMM may override its value // Save Cr2 because Page Fault exception in SMM may override its value
@ -1078,9 +1079,14 @@ SmiRendezvous (
} }
// //
// Try to enable NX // Try to enable XD
// //
XdDisableFlag = FALSE;
if (mXdSupported) { if (mXdSupported) {
if ((AsmReadMsr64 (MSR_IA32_MISC_ENABLE) & B_XD_DISABLE_BIT) != 0) {
XdDisableFlag = TRUE;
AsmMsrAnd64 (MSR_IA32_MISC_ENABLE, ~B_XD_DISABLE_BIT);
}
ActivateXd (); ActivateXd ();
} }
@ -1152,7 +1158,6 @@ SmiRendezvous (
// BSP Handler is always called with a ValidSmi == TRUE // BSP Handler is always called with a ValidSmi == TRUE
// //
BSPHandler (CpuIndex, mSmmMpSyncData->EffectiveSyncMode); BSPHandler (CpuIndex, mSmmMpSyncData->EffectiveSyncMode);
} else { } else {
APHandler (CpuIndex, ValidSmi, mSmmMpSyncData->EffectiveSyncMode); APHandler (CpuIndex, ValidSmi, mSmmMpSyncData->EffectiveSyncMode);
} }
@ -1165,6 +1170,13 @@ SmiRendezvous (
// //
while (mSmmMpSyncData->AllCpusInSync) { while (mSmmMpSyncData->AllCpusInSync) {
CpuPause (); CpuPause ();
}
//
// Restore XD
//
if (XdDisableFlag) {
AsmMsrOr64 (MSR_IA32_MISC_ENABLE, B_XD_DISABLE_BIT);
} }
} }

1
UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.h
View File

@ -21,6 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
/// MSR Register Index /// MSR Register Index
/// ///
#define MSR_IA32_MISC_ENABLE 0x1A0 #define MSR_IA32_MISC_ENABLE 0x1A0
#define B_XD_DISABLE_BIT BIT34
// //
// External functions // External functions