Skip to content

Commit

Permalink
x86: apic - unify APIC_DIVISOR
Browse files Browse the repository at this point in the history
Use APIC_DIVISOR being set to 16 for both 32/64bit
mode. To escape APIC timer underflow during calibration
set it to the maximum possible value.

Also typo error (CONFG instead of proper CONFIG) fixed.
The error was caught by Venkatesh Pallipadi, thanks a lot Venkatesh!

See details on http://lkml.org/lkml/2008/10/9/425

Reported-by: Venkatesh Pallipad <venkatesh.pallipadi@intel.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Acked-by: "Maciej W. Rozycki" <macro@linux-mips.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Cyrill Gorcunov authored and Ingo Molnar committed Oct 16, 2008
1 parent 4c66a73 commit 81608f3
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions arch/x86/kernel/apic.c
Original file line number Diff line number Diff line change
Expand Up @@ -332,11 +332,7 @@ int lapic_get_maxlvt(void)
*/

/* Clock divisor */
#ifdef CONFG_X86_64
#define APIC_DIVISOR 1
#else
#define APIC_DIVISOR 16
#endif

/*
* This function sets up the local APIC timer, with a timeout of
Expand Down Expand Up @@ -592,10 +588,10 @@ static int __init calibrate_APIC_clock(void)
global_clock_event->event_handler = lapic_cal_handler;

/*
* Setup the APIC counter to 1e9. There is no way the lapic
* Setup the APIC counter to maximum. There is no way the lapic
* can underflow in the 100ms detection time frame
*/
__setup_APIC_LVTT(1000000000, 0, 0);
__setup_APIC_LVTT(0xffffffff, 0, 0);

/* Let the interrupts run */
local_irq_enable();
Expand Down

0 comments on commit 81608f3

Please sign in to comment.