Re: [RFC][PATCH 5/6] x86_64: Clocksources for x86-64

[Andi Kleen <ak@suse.de>]

On Wednesday 09 August 2006 04:17, john stultz wrote:
> Re-add TSC and HPET support to x86_64 via clocksource infrastructure.

The actual review needed is in the existing clock source drivers
I guess.

I definitely don't want the "read three times" pmtimer code that 
is in the generic clock source on 64bit. You would need at least an ifdef
there or better detect the case where it is needed at runtime.

  
> -unsigned int cpu_khz;					/* TSC clocks / usec, not used here */
> +unsigned int cpu_khz;					/* CPU clocks / usec, not used here */

The previous comment was more correct. It is really TSC clocks.


>  EXPORT_SYMBOL(cpu_khz);
> +unsigned int tsc_khz;					/* TSC clocks / usec, not used here */

And that comment can't have the same unit as the earlier one?


> +/* clock source code: */
> +
> +static unsigned long current_tsc_khz = 0;

Another one? Don't we have already too many of these variables?

> +
> +static int tsc_update_callback(void);
> +
> +static cycle_t read_tsc(void)
> +{
> +	cycle_t ret;
> +	rdtscll(ret);

It would need to be _sync

> +
> +	/* only update if tsc_khz has changed: */
> +	if (current_tsc_khz != tsc_khz){
> +		current_tsc_khz = tsc_khz;
> +		clocksource_tsc.mult = clocksource_khz2mult(current_tsc_khz,
> +							clocksource_tsc.shift);
> +		change = 1;
> +	}

Are you sure this handles p-state invariant TSC correctly?

And I hope there is a printk somewhere when this happens?

> +	return change;
> +}
> +
> +static int __init init_tsc_clocksource(void)
> +{
> +	if (!notsc && tsc_khz) {

How can tsc_khz be 0 ?

> +		current_tsc_khz = tsc_khz;
> +		clocksource_tsc.mult = clocksource_khz2mult(current_tsc_khz,
> +							clocksource_tsc.shift);
> +		return clocksource_register(&clocksource_tsc);
> +	}
> +	return 0;
> +}
> +
> +module_init(init_tsc_clocksource);

So what clocksource does it use before?

BTW I guess i would be ok with putting tsc and hpet into their own files.
And is there a reason HPET can't be generic in drivers/clocksource now?


> +
> +
> +#define HPET_MASK	0xFFFFFFFF
> +#define HPET_SHIFT	22
> +
> +/* FSEC = 10^-15 NSEC = 10^-9 */
> +#define FSEC_PER_NSEC	1000000
> +
> +static void *hpet_ptr;
> +
> +static cycle_t read_hpet(void)
> +{
> +	return (cycle_t)readl(hpet_ptr);

No 64bit HPET support? 

> +}
> +
> +struct clocksource clocksource_hpet = {
> +	.name		= "hpet",
> +	.rating		= 250,
> +	.read		= read_hpet,
> +	.mask		= (cycle_t)HPET_MASK,
> +	.mult		= 0, /* set below */
> +	.shift		= HPET_SHIFT,
> +	.is_continuous	= 1,
> +};

How is priority of the different time sources established in this? 

e.g. is the old fallback selection logic still fully functional?

-Andi