lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: UV RTC: Add clocksource only boot option

Browse Source 
Add clocksource only boot option for UV RTC.

Signed-off-by: Dimitri Sivanich <sivanich@sgi.com>
LKML-Reference: <20091014141848.GC11048@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Dimitri Sivanich
2009-10-14 09:18:48 -05:00
committed by Ingo Molnar
parent e47938b1fa
commit 8c28de4d01
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
arch/x86/kernel/uv_time.c
View File

@@ -75,6 +75,7 @@ struct uv_rtc_timer_head {
static struct uv_rtc_timer_head **blade_info __read_mostly; static struct uv_rtc_timer_head **blade_info __read_mostly;
static int uv_rtc_enable; static int uv_rtc_enable;
static int uv_rtc_evt_enable;
/* /*
* Hardware interface routines * Hardware interface routines
@@ -342,6 +343,14 @@ static int __init uv_enable_rtc(char *str)
} }
__setup("uvrtc", uv_enable_rtc); __setup("uvrtc", uv_enable_rtc);
static int __init uv_enable_evt_rtc(char *str)
{
uv_rtc_evt_enable = 1;
return 1;
}
__setup("uvrtcevt", uv_enable_evt_rtc);
static __init void uv_rtc_register_clockevents(struct work_struct *dummy) static __init void uv_rtc_register_clockevents(struct work_struct *dummy)
{ {
struct clock_event_device *ced = &__get_cpu_var(cpu_ced); struct clock_event_device *ced = &__get_cpu_var(cpu_ced);
@@ -358,16 +367,20 @@ static __init int uv_rtc_setup_clock(void)
if (!uv_rtc_enable || !is_uv_system() || generic_interrupt_extension) if (!uv_rtc_enable || !is_uv_system() || generic_interrupt_extension)
return -ENODEV; return -ENODEV;
generic_interrupt_extension = uv_rtc_interrupt;
clocksource_uv.mult = clocksource_hz2mult(sn_rtc_cycles_per_second, clocksource_uv.mult = clocksource_hz2mult(sn_rtc_cycles_per_second,
clocksource_uv.shift); clocksource_uv.shift);
rc = clocksource_register(&clocksource_uv); rc = clocksource_register(&clocksource_uv);
if (rc) { if (rc)
generic_interrupt_extension = NULL; printk(KERN_INFO "UV RTC clocksource failed rc %d\n", rc);
else
printk(KERN_INFO "UV RTC clocksource registered freq %lu MHz\n",
sn_rtc_cycles_per_second/(unsigned long)1E6);
if (rc || !uv_rtc_evt_enable)
return rc; return rc;
}
generic_interrupt_extension = uv_rtc_interrupt;
/* Setup and register clockevents */ /* Setup and register clockevents */
rc = uv_rtc_allocate_timers(); rc = uv_rtc_allocate_timers();