From 20c436f729a76f06463f8658942d2879dbcb0b35 Mon Sep 17 00:00:00 2001 From: Ruiyu Ni Date: Fri, 5 Jan 2018 17:08:13 +0800 Subject: [PATCH] UefiCpuPkg/MpInitLib: Fix a bug that AP enters timer INT handler When SourceLevelDebug is enabled, AP randomly executes the DXECORE timer handler logic. The root cause is the interrupts are not masked in AP wake up procedure. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ruiyu Ni Reviewed-by: Jeff Fan (cherry picked from commit a2ea6894e6ca95e8d7a254593661a79e4b988626) --- UefiCpuPkg/Library/MpInitLib/MpLib.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c index 0c2058a7b0..1a6cdb678e 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c @@ -1,7 +1,7 @@ /** @file CPU MP Initialize Library common functions. - Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.
+ Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.
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 @@ -582,6 +582,10 @@ ApWakeupFunction ( // We need to re-initialize them at here // ProgramVirtualWireMode (); + // + // Mask the LINT0 and LINT1 so that AP doesn't enter the system timer interrupt handler. + // + DisableLvtInterrupts (); SyncLocalApicTimerSetting (CpuMpData); CurrentApicMode = GetApicMode ();