Revision: 18594
http://sourceforge.net/p/edk2/code/18594
Author: hwu1225
Date: 2015-10-09 07:04:00 +0000 (Fri, 09 Oct 2015)
Log Message:
-----------
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 <[email protected]>
Reviewed-by: Jeff Fan <[email protected]>
Modified Paths:
--------------
trunk/edk2/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/X86TimerLib.c
Modified: trunk/edk2/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/X86TimerLib.c
===================================================================
--- trunk/edk2/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/X86TimerLib.c
2015-10-09 07:03:24 UTC (rev 18593)
+++ trunk/edk2/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/X86TimerLib.c
2015-10-09 07:04:00 UTC (rev 18594)
@@ -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.<BR>
+ Copyright (c) 2010 - 2015, 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
@@ -45,6 +45,9 @@
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 @@
// Delay and the Init Count.
//
InitCount = GetApicTimerInitCount ();
+ ASSERT (InitCount != 0);
Times = Delay / (InitCount / 2);
Delay = Delay % (InitCount / 2);
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
