e30fab3ad3
The time_init_hook in paravirt-ops no longer functions in the correct manner
after the integration of the hrtimers code. The problem is that now the call
path for time initialization is:
time_init :
late_time_init = hpet_time_init;
late_time_init -> hpet_time_init:
setup_pit_timer (BAD)
do_time_init --> (via paravirt.h)
time_init_hook --> (via arch_hooks.h)
time_init_hook (in SUBARCH/setup.c)
If this isn't confusing enough, the paravirt case goes through an indirect
function pointer in the paravirt-ops table. The problem is, by the time the
paravirt hook is called, the pit timer is already enabled.
But paravirt guests have their own timer, and don't want to use the PIT.
Rather than intensify the struggle for power going on here, just make it all
nice and simple and just unconditionally do all timer setup in the
late_time_init hook. This also has the advantage of enabling timers in the
same place in all code paths, so everyone has the same bugs and we don't have
outliers who break other code because they turn on timer too early or too
late.
So the paravirt-ops time init function is now by default hpet_time_init, which
is the time init function used for native hardware. Paravirt guests have the
chance to override this when they setup the paravirt-ops table, and should
need no change.
Signed-off-by: Zachary Amsden <zach@vmware.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
45 lines
807 B
C
45 lines
807 B
C
#ifndef _ASMi386_TIME_H
|
|
#define _ASMi386_TIME_H
|
|
|
|
#include <linux/efi.h>
|
|
#include "mach_time.h"
|
|
|
|
static inline unsigned long native_get_wallclock(void)
|
|
{
|
|
unsigned long retval;
|
|
|
|
if (efi_enabled)
|
|
retval = efi_get_time();
|
|
else
|
|
retval = mach_get_cmos_time();
|
|
|
|
return retval;
|
|
}
|
|
|
|
static inline int native_set_wallclock(unsigned long nowtime)
|
|
{
|
|
int retval;
|
|
|
|
if (efi_enabled)
|
|
retval = efi_set_rtc_mmss(nowtime);
|
|
else
|
|
retval = mach_set_rtc_mmss(nowtime);
|
|
|
|
return retval;
|
|
}
|
|
|
|
extern void (*late_time_init)(void);
|
|
extern void hpet_time_init(void);
|
|
|
|
#ifdef CONFIG_PARAVIRT
|
|
#include <asm/paravirt.h>
|
|
#else /* !CONFIG_PARAVIRT */
|
|
|
|
#define get_wallclock() native_get_wallclock()
|
|
#define set_wallclock(x) native_set_wallclock(x)
|
|
#define choose_time_init() hpet_time_init
|
|
|
|
#endif /* CONFIG_PARAVIRT */
|
|
|
|
#endif
|