leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: apic - unify __setup_APIC_LVTT

Browse Source 
To be able to unify this function we RE-introduce
APIC_DIVISOR for 64bit mode. This snipped was eliminated
in some time ago in a sake of clenup but now we need it
again since it allow up to get rid of #ifdef(s).

And lapic_is_integrated call is added in apic_64.c but
since we always have APIC integrated on 64bit cpu compiler
will ignore this call.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Cyrill Gorcunov 2008-08-15 13:51:21 +02:00 committed by Ingo Molnar
parent 36fef0949c
commit f07f4f9046
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/x86/kernel/apic_64.c
View File

@ -244,6 +244,9 @@ int lapic_get_maxlvt(void)
return APIC_INTEGRATED(GET_APIC_VERSION(v)) ? GET_APIC_MAXLVT(v) : 2; return APIC_INTEGRATED(GET_APIC_VERSION(v)) ? GET_APIC_MAXLVT(v) : 2;
} }
/* Clock divisor is set to 1 */
#define APIC_DIVISOR 1
/* /*
* This function sets up the local APIC timer, with a timeout of * This function sets up the local APIC timer, with a timeout of
* 'clocks' APIC bus clock. During calibration we actually call * 'clocks' APIC bus clock. During calibration we actually call
@ -262,6 +265,9 @@ static void __setup_APIC_LVTT(unsigned int clocks, int oneshot, int irqen)
lvtt_value = LOCAL_TIMER_VECTOR; lvtt_value = LOCAL_TIMER_VECTOR;
if (!oneshot) if (!oneshot)
lvtt_value |= APIC_LVT_TIMER_PERIODIC; lvtt_value |= APIC_LVT_TIMER_PERIODIC;
if (!lapic_is_integrated())
lvtt_value |= SET_APIC_TIMER_BASE(APIC_TIMER_BASE_DIV);
if (!irqen) if (!irqen)
lvtt_value |= APIC_LVT_MASKED; lvtt_value |= APIC_LVT_MASKED;
@ -276,7 +282,7 @@ static void __setup_APIC_LVTT(unsigned int clocks, int oneshot, int irqen)
| APIC_TDR_DIV_16); | APIC_TDR_DIV_16);
if (!oneshot) if (!oneshot)
apic_write(APIC_TMICT, clocks); apic_write(APIC_TMICT, clocks / APIC_DIVISOR);
} }
/* /*
@ -446,7 +452,7 @@ static int __init calibrate_APIC_clock(void)
lapic_clockevent.min_delta_ns = lapic_clockevent.min_delta_ns =
clockevent_delta2ns(0xF, &lapic_clockevent); clockevent_delta2ns(0xF, &lapic_clockevent);
calibration_result = result / HZ; calibration_result = (result * APIC_DIVISOR) / HZ;
/* /*
* Do a sanity check on the APIC calibration result * Do a sanity check on the APIC calibration result