From f17e2f8c9e1a34c3707f93ca373a79f14927f7b1 Mon Sep 17 00:00:00 2001 From: Hao Wu Date: Fri, 9 Oct 2015 07:04:00 +0000 Subject: UefiCpuPkg: Add ASSERT to handle local APIC not config properly When the local APIC is not configurated properly, function GetApicTimerInitCount() in LocalApicLib may return zero, which will lead to a divide by zero exception in SecPeiDxeTimerLibUefiCpu. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu Reviewed-by: Jeff Fan git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18594 6f19259b-4bc3-4df7-8a09-765794883524 --- UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/X86TimerLib.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'UefiCpuPkg/Library') diff --git a/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/X86TimerLib.c b/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/X86TimerLib.c index 52ae7717dd..f703d7e477 100644 --- a/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/X86TimerLib.c +++ b/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/X86TimerLib.c @@ -3,7 +3,7 @@ This library uses the local APIC library so that it supports x2APIC mode. - Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.
+ Copyright (c) 2010 - 2015, 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 @@ -45,6 +45,9 @@ InternalX86GetTimerFrequency ( Stalls the CPU for at least the given number of ticks. It's invoked by MicroSecondDelay() and NanoSecondDelay(). + This function will ASSERT if the APIC timer intial count returned from + GetApicTimerInitCount() is zero. + @param Delay A period of time to delay in ticks. **/ @@ -67,6 +70,7 @@ InternalX86Delay ( // Delay and the Init Count. // InitCount = GetApicTimerInitCount (); + ASSERT (InitCount != 0); Times = Delay / (InitCount / 2); Delay = Delay % (InitCount / 2); -- cgit v1.2.3