Commit 39ba5d43 authored Jan 28, 2009 by Yasuaki Ishimatsu Committed by H. Peter Anvin Jan 29, 2009

x86: unify PM-Timer messages



Impact: Cleans up printk formatting

When LOCAL APIC was calibrated, the debug message is displayed as follows.

	CPU0: Intel(R) Xeon(R) CPU            5110  @ 1.60GHz stepping 06
	Using local APIC timer interrupts.
	calibrating APIC timer ...
	... lapic delta = 3773131
	... PM timer delta = 812434
	APIC calibration not consistent with PM Timer: 226ms instead of 100ms
	APIC delta adjusted to PM-Timer: 1662420 (3773131)
	TSC delta adjusted to PM-Timer: 159592409 (362220564)
	..... delta 1662420
	..... mult: 71411249
	..... calibration result: 265987
	..... CPU clock speed is 1595.0924 MHz.
	..... host bus clock speed is 265.0987 MHz.

There are three type of PM-Timer (PM-Timer, PM Timer, and PM timer),
in this message. This patch unifies those messages to PM-Timer.

Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

parent 754ef0cd

arch/x86/kernel/apic.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -547,7 +547,7 @@ calibrate_by_pmtimer(long deltapm, long delta, long deltatsc)
		return -1;
		#endif

		apic_printk(APIC_VERBOSE, "... PM timer delta = %ld\n", deltapm);
		apic_printk(APIC_VERBOSE, "... PM-Timer delta = %ld\n", deltapm);

		/* Check, if the PM timer is available */
		if (!deltapm)
		@@ -557,14 +557,14 @@ calibrate_by_pmtimer(long deltapm, long delta, long deltatsc)

		if (deltapm > (pm_100ms - pm_thresh) &&
		deltapm < (pm_100ms + pm_thresh)) {
		apic_printk(APIC_VERBOSE, "... PM timer result ok\n");
		apic_printk(APIC_VERBOSE, "... PM-Timer result ok\n");
		return 0;
		}

		res = (((u64)deltapm) * mult) >> 22;
		do_div(res, 1000000);
		pr_warning("APIC calibration not consistent "
		"with PM Timer: %ldms instead of 100ms\n",(long)res);
		"with PM-Timer: %ldms instead of 100ms\n",(long)res);

		/* Correct the lapic counter value */
		res = (((u64)(delta)) pm_100ms);

Admin message