Commit 6bb74df4 authored by john stultz's avatar john stultz Committed by Linus Torvalds
Browse files

[PATCH] clocksource init adjustments (fix bug #7426) 

This patch resolves the issue found here:
http://bugme.osdl.org/show_bug.cgi?id=7426



The basic summary is:
Currently we register most of i386/x86_64 clocksources at module_init
time. Then we enable clocksource selection at late_initcall time. This
causes some problems for drivers that use gettimeofday for init
calibration routines (specifically the es1968 driver in this case),
where durring module_init, the only clocksource available is the low-res
jiffies clocksource. This may cause slight calibration errors, due to
the small sampling time used.

It should be noted that drivers that require fine grained time may not
function on architectures that do not have better then jiffies
resolution timekeeping (there are a few). However, this does not
discount the reasonable need for such fine-grained timekeeping at init
time.

Thus the solution here is to register clocksources earlier (ideally when
the hardware is being initialized), and then we enable clocksource
selection at fs_initcall (before device_initcall).

This patch should probably get some testing time in -mm, since
clocksource selection is one of the most important issues for correct
timekeeping, and I've only been able to test this on a few of my own
boxes.

Signed-off-by: default avatarJohn Stultz <johnstul@us.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 45407680

arch/i386/kernel/hpet.c

+37 −43
Original line number Diff line number Diff line
@@ -200,6 +200,23 @@ static int hpet_next_event(unsigned long delta, 
	return ((long)(hpet_readl(HPET_COUNTER) - cnt ) > 0);

}



/*

 * Clock source related code

 */

static cycle_t read_hpet(void)

{

	return (cycle_t)hpet_readl(HPET_COUNTER);

}



static struct clocksource clocksource_hpet = {

	.name		= "hpet",

	.rating		= 250,

	.read		= read_hpet,

	.mask		= HPET_MASK,

	.shift		= HPET_SHIFT,

	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,

};



/*

 * Try to setup the HPET timer

 */
@@ -207,6 +224,7 @@ int __init hpet_enable(void) 
{

	unsigned long id;

	uint64_t hpet_freq;

	u64 tmp;



	if (!is_hpet_capable())

		return 0;
@@ -253,6 +271,25 @@ int __init hpet_enable(void) 
	/* Start the counter */

	hpet_start_counter();



	/* Initialize and register HPET clocksource

	 *

	 * hpet period is in femto seconds per cycle

	 * so we need to convert this to ns/cyc units

	 * aproximated by mult/2^shift

	 *

	 *  fsec/cyc * 1nsec/1000000fsec = nsec/cyc = mult/2^shift

	 *  fsec/cyc * 1ns/1000000fsec * 2^shift = mult

	 *  fsec/cyc * 2^shift * 1nsec/1000000fsec = mult

	 *  (fsec/cyc << shift)/1000000 = mult

	 *  (hpet_period << shift)/FSEC_PER_NSEC = mult

	 */

	tmp = (u64)hpet_period << HPET_SHIFT;

	do_div(tmp, FSEC_PER_NSEC);

	clocksource_hpet.mult = (u32)tmp;



	clocksource_register(&clocksource_hpet);





	if (id & HPET_ID_LEGSUP) {

		hpet_enable_int();

		hpet_reserve_platform_timers(id);
@@ -273,49 +310,6 @@ out_nohpet: 
	return 0;

}



/*

 * Clock source related code

 */

static cycle_t read_hpet(void)

{

	return (cycle_t)hpet_readl(HPET_COUNTER);

}



static struct clocksource clocksource_hpet = {

	.name		= "hpet",

	.rating		= 250,

	.read		= read_hpet,

	.mask		= HPET_MASK,

	.shift		= HPET_SHIFT,

	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,

};



static int __init init_hpet_clocksource(void)

{

	u64 tmp;



	if (!hpet_virt_address)

		return -ENODEV;



	/*

	 * hpet period is in femto seconds per cycle

	 * so we need to convert this to ns/cyc units

	 * aproximated by mult/2^shift

	 *

	 *  fsec/cyc * 1nsec/1000000fsec = nsec/cyc = mult/2^shift

	 *  fsec/cyc * 1ns/1000000fsec * 2^shift = mult

	 *  fsec/cyc * 2^shift * 1nsec/1000000fsec = mult

	 *  (fsec/cyc << shift)/1000000 = mult

	 *  (hpet_period << shift)/FSEC_PER_NSEC = mult

	 */

	tmp = (u64)hpet_period << HPET_SHIFT;

	do_div(tmp, FSEC_PER_NSEC);

	clocksource_hpet.mult = (u32)tmp;



	return clocksource_register(&clocksource_hpet);

}



module_init(init_hpet_clocksource);



#ifdef CONFIG_HPET_EMULATE_RTC

arch/i386/kernel/i8253.c

+1 −1
Original line number Diff line number Diff line
@@ -195,4 +195,4 @@ static int __init init_pit_clocksource(void) 
	clocksource_pit.mult = clocksource_hz2mult(CLOCK_TICK_RATE, 20);

	return clocksource_register(&clocksource_pit);

}

module_init(init_pit_clocksource);
 
arch_initcall(init_pit_clocksource);

arch/i386/kernel/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -657,5 +657,4 @@ void __init setup_arch(char **cmdline_p) 
	conswitchp = &dummy_con;

#endif

#endif

	tsc_init();

}

arch/i386/kernel/time.c

+1 −0
Original line number Diff line number Diff line
@@ -279,5 +279,6 @@ void __init hpet_time_init(void) 
 */

void __init time_init(void)

{

	tsc_init();

	late_time_init = choose_time_init();

}

arch/i386/kernel/tsc.c

+37 −46
Original line number Diff line number Diff line
@@ -184,34 +184,6 @@ int recalibrate_cpu_khz(void) 


EXPORT_SYMBOL(recalibrate_cpu_khz);



void __init tsc_init(void)

{

	if (!cpu_has_tsc || tsc_disable)

		goto out_no_tsc;



	cpu_khz = calculate_cpu_khz();

	tsc_khz = cpu_khz;



	if (!cpu_khz)

		goto out_no_tsc;



	printk("Detected %lu.%03lu MHz processor.\n",

				(unsigned long)cpu_khz / 1000,

				(unsigned long)cpu_khz % 1000);



	set_cyc2ns_scale(cpu_khz);

	use_tsc_delay();

	return;



out_no_tsc:

	/*

	 * Set the tsc_disable flag if there's no TSC support, this

	 * makes it a fast flag for the kernel to see whether it

	 * should be using the TSC.

	 */

	tsc_disable = 1;

}



#ifdef CONFIG_CPU_FREQ



/*
@@ -381,11 +353,26 @@ static void __init check_geode_tsc_reliable(void) 
static inline void check_geode_tsc_reliable(void) { }

#endif



static int __init init_tsc_clocksource(void)



void __init tsc_init(void)

{

	if (!cpu_has_tsc || tsc_disable)

		goto out_no_tsc;



	cpu_khz = calculate_cpu_khz();

	tsc_khz = cpu_khz;



	if (!cpu_khz)

		goto out_no_tsc;



	printk("Detected %lu.%03lu MHz processor.\n",

				(unsigned long)cpu_khz / 1000,

				(unsigned long)cpu_khz % 1000);



	if (cpu_has_tsc && tsc_khz && !tsc_disable) {

		/* check blacklist */

	set_cyc2ns_scale(cpu_khz);

	use_tsc_delay();



	/* Check and install the TSC clocksource */

	dmi_check_system(bad_tsc_dmi_table);



	unsynchronized_tsc();
@@ -398,11 +385,15 @@ static int __init init_tsc_clocksource(void) 
		clocksource_tsc.rating = 0;

		clocksource_tsc.flags &= ~CLOCK_SOURCE_IS_CONTINUOUS;

	}

	clocksource_register(&clocksource_tsc);



		return clocksource_register(&clocksource_tsc);

	}

	return;



	return 0;

out_no_tsc:

	/*

	 * Set the tsc_disable flag if there's no TSC support, this

	 * makes it a fast flag for the kernel to see whether it

	 * should be using the TSC.

	 */

	tsc_disable = 1;

}
 


module_init(init_tsc_clocksource);

CRA Git | Maintained and supported by SUSTech CRA and CCSE