Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e93ef949 authored by Alok Kataria's avatar Alok Kataria Committed by Ingo Molnar
Browse files

x86: rename paravirtualized TSC functions 



Rename the paravirtualized calculate_cpu_khz to calibrate_tsc.
In all cases, we actually calibrate_tsc and use that as the cpu_khz value.

Signed-off-by: default avatarAlok N Kataria <akataria@vmware.com>
Signed-off-by: default avatarDan Hecht <dhecht@vmware.com>
Cc: Dan Hecht <dhecht@vmware.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 8fbbc4b4

arch/x86/kernel/paravirt.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -285,7 +285,7 @@ struct pv_time_ops pv_time_ops = { 
	.get_wallclock = native_get_wallclock,

	.get_wallclock = native_get_wallclock,

	.set_wallclock = native_set_wallclock,

	.set_wallclock = native_set_wallclock,

	.sched_clock = native_sched_clock,

	.sched_clock = native_sched_clock,

	.get_cpu_khz = native_calculate_cpu_khz,

	.get_tsc_khz = native_calibrate_tsc,

};

};





struct pv_irq_ops pv_irq_ops = {

struct pv_irq_ops pv_irq_ops = {

arch/x86/kernel/tsc.c

+7 −11
Original line number Original line Diff line number Diff line
@@ -123,9 +123,9 @@ static u64 __init tsc_read_refs(u64 *pm, u64 *hpet) 
}

}





/**

/**

 * tsc_calibrate - calibrate the tsc on boot

 * native_calibrate_tsc - calibrate the tsc on boot

 */

 */

static unsigned int __init tsc_calibrate(void)

unsigned long native_calibrate_tsc(void)

{

{

	unsigned long flags;

	unsigned long flags;

	u64 tsc1, tsc2, tr1, tr2, delta, pm1, pm2, hpet1, hpet2;

	u64 tsc1, tsc2, tr1, tr2, delta, pm1, pm2, hpet1, hpet2;
@@ -195,10 +195,6 @@ static unsigned int __init tsc_calibrate(void) 
	return tsc_khz_val;

	return tsc_khz_val;

}

}





unsigned long native_calculate_cpu_khz(void)

{

	return tsc_calibrate();

}





#ifdef CONFIG_X86_32

#ifdef CONFIG_X86_32

/* Only called from the Powernow K7 cpu freq driver */

/* Only called from the Powernow K7 cpu freq driver */
@@ -208,8 +204,8 @@ int recalibrate_cpu_khz(void) 
	unsigned long cpu_khz_old = cpu_khz;

	unsigned long cpu_khz_old = cpu_khz;





	if (cpu_has_tsc) {

	if (cpu_has_tsc) {

		cpu_khz = calculate_cpu_khz();

		tsc_khz = calibrate_tsc();

		tsc_khz = cpu_khz;

		cpu_khz = tsc_khz;

		cpu_data(0).loops_per_jiffy =

		cpu_data(0).loops_per_jiffy =

			cpufreq_scale(cpu_data(0).loops_per_jiffy,

			cpufreq_scale(cpu_data(0).loops_per_jiffy,

					cpu_khz_old, cpu_khz);

					cpu_khz_old, cpu_khz);
@@ -487,10 +483,10 @@ void __init tsc_init(void) 
	if (!cpu_has_tsc)

	if (!cpu_has_tsc)

		return;

		return;





	cpu_khz = calculate_cpu_khz();

	tsc_khz = calibrate_tsc();

	tsc_khz = cpu_khz;

	cpu_khz = tsc_khz;





	if (!cpu_khz) {

	if (!tsc_khz) {

		mark_tsc_unstable("could not calculate TSC khz");

		mark_tsc_unstable("could not calculate TSC khz");

		return;

		return;

	}

	}

arch/x86/kernel/vmi_32.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -932,7 +932,7 @@ static inline int __init activate_vmi(void) 
		pv_apic_ops.setup_secondary_clock = vmi_time_ap_init;

		pv_apic_ops.setup_secondary_clock = vmi_time_ap_init;

#endif

#endif

		pv_time_ops.sched_clock = vmi_sched_clock;

		pv_time_ops.sched_clock = vmi_sched_clock;

 		pv_time_ops.get_cpu_khz = vmi_cpu_khz;

		pv_time_ops.get_tsc_khz = vmi_tsc_khz;





		/* We have true wallclock functions; disable CMOS clock sync */

		/* We have true wallclock functions; disable CMOS clock sync */

		no_sync_cmos_clock = 1;

		no_sync_cmos_clock = 1;

arch/x86/kernel/vmiclock_32.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -69,8 +69,8 @@ unsigned long long vmi_sched_clock(void) 
	return cycles_2_ns(vmi_timer_ops.get_cycle_counter(VMI_CYCLES_AVAILABLE));

	return cycles_2_ns(vmi_timer_ops.get_cycle_counter(VMI_CYCLES_AVAILABLE));

}

}





/* paravirt_ops.get_cpu_khz = vmi_cpu_khz */

/* paravirt_ops.get_tsc_khz = vmi_tsc_khz */

unsigned long vmi_cpu_khz(void)

unsigned long vmi_tsc_khz(void)

{

{

	unsigned long long khz;

	unsigned long long khz;

	khz = vmi_timer_ops.get_cycle_frequency();

	khz = vmi_timer_ops.get_cycle_frequency();

arch/x86/lguest/boot.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -607,7 +607,7 @@ static unsigned long lguest_get_wallclock(void) 
 * what speed it runs at, or 0 if it's unusable as a reliable clock source.

 * what speed it runs at, or 0 if it's unusable as a reliable clock source.

 * This matches what we want here: if we return 0 from this function, the x86

 * This matches what we want here: if we return 0 from this function, the x86

 * TSC clock will give up and not register itself. */

 * TSC clock will give up and not register itself. */

static unsigned long lguest_cpu_khz(void)

static unsigned long lguest_tsc_khz(void)

{

{

	return lguest_data.tsc_khz;

	return lguest_data.tsc_khz;

}

}
@@ -998,7 +998,7 @@ __init void lguest_init(void) 
	/* time operations */

	/* time operations */

	pv_time_ops.get_wallclock = lguest_get_wallclock;

	pv_time_ops.get_wallclock = lguest_get_wallclock;

	pv_time_ops.time_init = lguest_time_init;

	pv_time_ops.time_init = lguest_time_init;

	pv_time_ops.get_cpu_khz = lguest_cpu_khz;

	pv_time_ops.get_tsc_khz = lguest_tsc_khz;





	/* Now is a good time to look at the implementations of these functions

	/* Now is a good time to look at the implementations of these functions

	 * before returning to the rest of lguest_init(). */

	 * before returning to the rest of lguest_init(). */