diff options
| author | Hao Wu <hao.a.wu@intel.com> | 2018-03-19 15:02:59 +0800 |
|---|---|---|
| committer | Hao Wu <hao.a.wu@intel.com> | 2018-03-20 16:12:55 +0800 |
| commit | c01ec8dc8f7c6b6646bb04f00252d5f48069708a (patch) | |
| tree | 05e5c22386d19d63f141314ee1e5e492fe1c71f1 | |
| parent | bd1c83ca518731121133e1342d84a5c1014da2af (diff) | |
| download | edk2-c01ec8dc8f7c6b6646bb04f00252d5f48069708a.tar.gz | |
MdeModulePkg/DxeMain: Fix BSP interrupts reenabled in ExitBootServices
Within function CoreExitBootServices(), this commit will move the call
of:
MemoryProtectionExitBootServicesCallback();
before:
SaveAndSetDebugTimerInterrupt (FALSE);
and
gCpu->DisableInterrupt (gCpu);
The reason is that, within MemoryProtectionExitBootServicesCallback(),
APIs like RaiseTpl and RestoreTpl maybe called. An example will be:
DebugLib (using PeiDxeDebugLibReportStatusCode instance)
|
v
ReportStatusCodeLib (using DxeReportStatusCodeLib instance)
|
v
Raise/RestoreTpl
The call of Raise/RestoreTpl APIs will re-enable BSP interrupts. Hence,
this commit refine the calling sequence to ensure BSP interrupts before
leaving CoreExitBootServices().
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
(cherry picked from commit bce776a5b695b5bf1f063f5417e48c56b43b88a7)
| -rw-r--r-- | MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c index 62a597edaf..07c7403462 100644 --- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c +++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c @@ -1,7 +1,7 @@ /** @file
DXE Core Main Entry Point
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, 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
@@ -805,6 +805,8 @@ CoreExitBootServices ( (EFI_SOFTWARE_EFI_BOOT_SERVICE | EFI_SW_BS_PC_EXIT_BOOT_SERVICES)
);
+ MemoryProtectionExitBootServicesCallback();
+
//
// Disable interrupt of Debug timer.
//
@@ -815,8 +817,6 @@ CoreExitBootServices ( //
gCpu->DisableInterrupt (gCpu);
- MemoryProtectionExitBootServicesCallback();
-
//
// Clear the non-runtime values of the EFI System Table
//
|