[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20110113214022.GA12097@dumpdata.com>
Date: Thu, 13 Jan 2011 16:40:22 -0500
From: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
To: john stultz <johnstul@...ibm.com>,
Thomas Gleixner <tglx@...utronix.de>
Cc: "Kirill A. Shutemov" <kirill@...temov.name>,
Jeremy Fitzhardinge <jeremy@...p.org>,
Stefano Stabellini <stefano.stabellini@...citrix.com>,
Ian Campbell <Ian.Campbell@...citrix.com>,
Thomas Gleixner <tglx@...utronix.de>, mingo@...hat.com,
hpa@...or.com, linux-kernel@...r.kernel.org, andi@...stfloor.org,
williams@...hat.com, schwidefsky@...ibm.com, mingo@...e.hu,
linux-tip-commits@...r.kernel.org
Subject: [PATCH] acpi/pm: If failed at validating ACPI PM timer, inhibit
future reads.
tgl, John,
Should I push this to Linus or are you guys going to push
this patch during this merge window?
commit ad0a17d46570aca172080016601813173a778fb7
Author: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
Date: Thu Jan 13 12:56:51 2011 -0500
acpi/pm: If failed at validating ACPI PM timer, inhibit future reads.
Without this patch we get:
[ 4.628136] divide error: 0000 [#1] SMP
.. snip..
Pid: 441, comm: kworker/1:1 Not tainted 2.6.37test-05765-gda43a99-dirty #14 N61PB-M2S/N61PB-M2S
[ 4.628150] RIP: e030:[<ffffffff8101109b>] [<ffffffff8101109b>] tsc_refine_calibration_work+0x149/0x1bb
[ 4.628157] RSP: e02b:ffff88008f0d1df0 EFLAGS: 00010246
.. when running Linux under Xen.
I've traced it down to the fact that when we boot under Xen we do
not have the HPET enabled nor the ACPI PM timer setup. The
hpet_enable() is never called (b/c xen_time_init is called), and
for calibration of tsc_khz (calibrate_tsc == xen_tsc_khz) we
get a valid value.
So 'tsc_read_refs' tries to read the ACPI PM timer (acpi_pm_read_early),
however that is disabled under Xen:
[ 1.099272] calling init_acpi_pm_clocksource+0x0/0xdc @ 1
[ 1.140186] PM-Timer failed consistency check (0x0xffffff) - aborting.
So the tsc_calibrate_check gets called, it can't do HPET, and reading
from ACPI PM timer results in getting 0xffffff.. .. and
(0xffff..-0xffff..)/some other value results in div_zero.
There is a check in 'tsc_refine_calibration_work' for invalid
values:
/* hpet or pmtimer available ? */
if (!hpet && !ref_start && !ref_stop)
goto out;
But since ref_start and ref_stop have 0xffffff it does not trigger.
This little fix makes the read to be 0 and the check triggers.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
Acked-by: John Stultz <johnstul@...ibm.com>
diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c
index cfb0f52..709bb6d 100644
--- a/drivers/clocksource/acpi_pm.c
+++ b/drivers/clocksource/acpi_pm.c
@@ -207,6 +207,7 @@ static int __init init_acpi_pm_clocksource(void)
if (i == ACPI_PM_READ_CHECKS) {
printk(KERN_INFO "PM-Timer failed consistency check "
" (0x%#llx) - aborting.\n", value1);
+ pmtmr_ioport = 0;
return -ENODEV;
}
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists