RT kernel: HPET as per CPU eventsource
PATCH 3/5 RT kernel: HPET as per CPU eventsource
Register HPET as eventsource.
If number of logical CPUs is less than number of HPET channels, HPET provides a per CPU eventsource (using as many timers as needed). Otherwise, it is a global eventsource (using only one timer).
HPET timers are programmed in their standard interrupt mapping mode (not in legacy replacement mode).
Signed-off-by Venkatesh Pallipadi <[email protected]>
arch/x86_64/kernel/apic.c +17 -10
@@ -794,17 +794,24 @@ static void lapic_timer_setup(enum clockunsigned long flags;local_irq_save (flags); -/* Turn off PIT interrupt if we use APIC timer as main timer. -Only works with the PM timer right now -TBD fix it for HPET too. */ -if ((pmtmr_ioport !=0 ) && -smp_processor_id () == boot_cpu_id && - apic_runs_main_timer ==1 && - !cpu_isset (boot_cpu_id, timer_interrupt_broadcast_ipi_mask)) { -stop_timer_interrupt (); - apic_runs_main_timer++; +if (mode ==CLOCK_EVT_MODE_SHUTDOWN ) { +unsigned long v; + v =apic_read (APIC_LVTT ); + v |= (APIC_LVT_MASKED |LOCAL_TIMER_VECTOR ); +apic_write (APIC_LVTT , v); + }else { +/* Turn off IRQ 0 timer if we use APIC timer as main timer. */ +if (smp_processor_id () == boot_cpu_id && + apic_runs_main_timer ==1 && + !cpu_isset (boot_cpu_id, + timer_interrupt_broadcast_ipi_mask)) { +stop_timer_interrupt (); + apic_runs_main_timer++; + } +__setup_APIC_LVTT (calibration_result, + mode !=CLOCK_EVT_MODE_PERIODIC ); } -__setup_APIC_LVTT (calibration_result, mode !=CLOCK_EVT_MODE_PERIODIC ); +local_irq_restore (flags); }
arch/x86_64/kernel/hpet.c +466 -7
523 lines not on this page · raw message
arch/x86_64/kernel/time.c +2 -2
@@ -341,7 +341,7 @@ void __init stop_timer_interrupt(void)char *name;if (hpet_address) { name ="HPET" ; -hpet_timer_stop_set_go (0 ); +hpet_timer_stop (); }else { name ="PIT" ;pit_stop_interrupt ();
@@ -417,7 +417,7 @@ static int timer_suspend(struct sys_devistatic int timer_resume (struct sys_device *dev) {if (hpet_address) -hpet_reenable (); +hpet_timer_reenable ();else i8254_timer_resume ();
include/asm-x86_64/hpet.h +2 -2
@@ -57,8 +57,8 @@ extern int is_hpet_enabled(void);extern int hpet_rtc_timer_init (void );extern int apic_is_clustered_box (void );extern int hpet_arch_init (void ); -extern int hpet_timer_stop_set_go (unsigned long tick); -extern int hpet_reenable (void ); +extern int hpet_timer_stop (void ); +extern int hpet_timer_reenable (void );extern unsigned int hpet_calibrate_tsc (void );extern int hpet_use_timer;