From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org, Andi Kleen <ak@suse.de>,
"Discuss x86-64" <discuss@x86-64.org>
Subject: Re: 2.6.15-rc5-mm2: broken resume from disk on x86-64
Date: Sun, 11 Dec 2005 16:52:10 +0100 [thread overview]
Message-ID: <200512111652.10906.rjw@sisk.pl> (raw)
In-Reply-To: <200512111647.31202.rjw@sisk.pl>
It is impossible to resume from disk on x86-64 machines due to the changes
introduced by the x86_64-hpet-overflow patch. The problem is known
(appeared in -mm1), but there's no official fix yet.
The appended patch fixes the issue, although I'm not sure if this is the right
fix.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
arch/x86_64/kernel/time.c | 9 +++++++++
1 files changed, 9 insertions(+)
Index: linux-2.6.15-rc5-mm1/arch/x86_64/kernel/time.c
===================================================================
--- linux-2.6.15-rc5-mm1.orig/arch/x86_64/kernel/time.c 2005-12-08 22:57:33.000000000 +0100
+++ linux-2.6.15-rc5-mm1/arch/x86_64/kernel/time.c 2005-12-09 14:37:31.000000000 +0100
@@ -65,6 +65,7 @@ unsigned long hpet_tick;
static int hpet_use_timer;
unsigned long vxtime_hz = PIT_TICK_RATE;
unsigned long long monotonic_base;
+static int vxtime_last_invalid; /* for the interrupt handler */
static int report_lost_ticks; /* command line option */
@@ -417,6 +418,13 @@ static irqreturn_t timer_interrupt(int i
rdtscll_sync(&tsc);
+ if (vxtime_last_invalid) {
+ if (vxtime.mode == VXTIME_HPET)
+ vxtime.last = offset;
+ vxtime.last_tsc = tsc;
+ vxtime_last_invalid = 0;
+ }
+
if (vxtime.mode == VXTIME_HPET) {
if (hpet64 > 0) {
unsigned long delta = offset - vxtime.last;
@@ -1125,6 +1133,7 @@ static int timer_resume(struct sys_devic
sec = ctime + clock_cmos_diff;
write_seqlock_irqsave(&xtime_lock,flags);
+ vxtime_last_invalid = 1;
xtime.tv_sec = sec;
xtime.tv_nsec = 0;
write_sequnlock_irqrestore(&xtime_lock,flags);
next prev parent reply other threads:[~2005-12-11 16:08 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-12-11 12:13 2.6.15-rc5-mm2 Andrew Morton
2005-12-11 12:39 ` 2.6.15-rc5-mm2 Benoit Boissinot
2005-12-11 15:17 ` 2.6.15-rc5-mm2 Benoit Boissinot
2005-12-11 15:47 ` 2.6.15-rc5-mm2 Rafael J. Wysocki
2005-12-11 15:52 ` Rafael J. Wysocki [this message]
2005-12-11 16:02 ` 2.6.15-rc5-mm2: evdev problem Rafael J. Wysocki
2005-12-11 18:22 ` Dmitry Torokhov
2005-12-11 16:06 ` 2.6.15-rc5-mm2: ehci_hcd crashes on load sometimes Rafael J. Wysocki
2005-12-11 20:38 ` Andrew Morton
2005-12-12 19:53 ` Rafael J. Wysocki
2005-12-12 20:29 ` Andrew Morton
2005-12-12 20:55 ` Rafael J. Wysocki
2005-12-12 21:09 ` Andrew Morton
2005-12-12 21:39 ` Rafael J. Wysocki
2005-12-12 21:47 ` Andrew Morton
2005-12-12 21:56 ` Ben Pfaff
2005-12-13 6:52 ` [linux-usb-devel] " David Brownell
2005-12-13 22:10 ` Rafael J. Wysocki
2005-12-13 22:22 ` David Brownell
2005-12-13 22:39 ` Rafael J. Wysocki
2005-12-13 23:31 ` David Brownell
2005-12-11 16:08 ` 2.6.15-rc5-mm2 Jesper Juhl
2005-12-11 21:13 ` [PATCH] Fix vesafb display panning regression Antonino A. Daplas
2005-12-11 21:30 ` Jesper Juhl
2005-12-11 16:12 ` 2.6.15-rc5-mm2 :-) Maciej Soltysiak
2005-12-13 5:52 ` Con Kolivas
[not found] ` <1916802326.20051213121330@dns.toxicfilms.tv>
2005-12-13 12:16 ` Con Kolivas
2005-12-13 23:30 ` Peter Williams
2005-12-11 17:56 ` 2.6.15-rc5-mm2: two cs5535 modules Adrian Bunk
2005-12-12 18:29 ` Ben Gardner
2005-12-12 22:49 ` Alan Cox
2005-12-12 0:53 ` 2.6.15-rc5-mm2 Grant Coady
2005-12-12 14:05 ` 2.6.15-rc5-mm2 Cornelia Huck
2005-12-14 8:54 ` SMP+nosmp=hang [was: Re: 2.6.15-rc5-mm2] J.A. Magallon
[not found] ` <20060120192259.4460af42.akpm@osdl.org>
2006-01-21 23:46 ` J.A. Magallon
2006-01-22 0:22 ` Randy.Dunlap
2005-12-15 13:41 ` 2.6.15-rc5-mm2 Reuben Farrelly
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200512111652.10906.rjw@sisk.pl \
--to=rjw@sisk.pl \
--cc=ak@suse.de \
--cc=akpm@osdl.org \
--cc=discuss@x86-64.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).