diff options
| author | Michael Kinney <michael.d.kinney@intel.com> | 2016-02-18 13:09:23 -0800 |
|---|---|---|
| committer | Hao Wu <hao.a.wu@intel.com> | 2016-02-25 09:46:55 +0800 |
| commit | f7ff5dae06dce09a554994066a2cf5d8d49ea322 (patch) | |
| tree | 31f66d659c8a7be2c9c71d0023cb67cd8566126d | |
| parent | c3a78be406beb4af7b63652c5817defb8907d249 (diff) | |
| download | edk2-platforms-f7ff5dae06dce09a554994066a2cf5d8d49ea322.tar.xz | |
UefiCpuPkg/PiSmmCpuDxeSmm: Enable/Restore XD in SMM
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>
(cherry picked from commit e1695f8dcf18f612d34f6da0a4579a5b7c49ef9b)
| -rw-r--r-- | UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c | 18 | ||||
| -rw-r--r-- | UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.h | 1 |
2 files changed, 16 insertions, 3 deletions
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c b/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c index 79b7c90a80..185cb3d593 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c @@ -1,7 +1,7 @@ /** @file
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
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
@@ -1019,6 +1019,7 @@ SmiRendezvous ( BOOLEAN BspInProgress;
UINTN Index;
UINTN Cr2;
+ BOOLEAN XdDisableFlag;
//
// 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 ((AsmReadMsr64 (MSR_IA32_MISC_ENABLE) & B_XD_DISABLE_BIT) != 0) {
+ XdDisableFlag = TRUE;
+ AsmMsrAnd64 (MSR_IA32_MISC_ENABLE, ~B_XD_DISABLE_BIT);
+ }
ActivateXd ();
}
@@ -1152,7 +1158,6 @@ SmiRendezvous ( // BSP Handler is always called with a ValidSmi == TRUE
//
BSPHandler (CpuIndex, mSmmMpSyncData->EffectiveSyncMode);
-
} else {
APHandler (CpuIndex, ValidSmi, mSmmMpSyncData->EffectiveSyncMode);
}
@@ -1165,6 +1170,13 @@ SmiRendezvous ( //
while (mSmmMpSyncData->AllCpusInSync) {
CpuPause ();
+ }
+
+ //
+ // Restore XD
+ //
+ if (XdDisableFlag) {
+ AsmMsrOr64 (MSR_IA32_MISC_ENABLE, B_XD_DISABLE_BIT);
}
}
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.h b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.h index c6ce1f59ad..5488c148e8 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.h +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.h @@ -21,6 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /// MSR Register Index
///
#define MSR_IA32_MISC_ENABLE 0x1A0
+#define B_XD_DISABLE_BIT BIT34
//
// External functions
|