From: Michal Schmidt <xschmi00@stud.feec.vutbr.cz>
To: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>
Cc: linux-kernel@vger.kernel.org
Subject: [patch] IDE: Touch NMI watchdog during resume from STR
Date: Thu, 13 Jul 2006 12:14:34 +0200 [thread overview]
Message-ID: <44B61D0A.7010305@stud.feec.vutbr.cz> (raw)
When resuming from suspend-to-RAM, the NMI watchdog detects a lockup in
ide_wait_not_busy.
Here's a screenshot of the trace taken by a digital camera:
http://www.uamt.feec.vutbr.cz/rizeni/pom/DSC03510-2.JPG
Let's touch the NMI watchdog in ide_wait_not_busy. The system then
resumes correctly from STR.
Signed-off-by: Michal Schmidt <xschmi00@stud.feec.vutbr.cz>
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 6571652..77703ac 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -23,6 +23,7 @@ #include <linux/delay.h>
#include <linux/hdreg.h>
#include <linux/ide.h>
#include <linux/bitops.h>
+#include <linux/nmi.h>
#include <asm/byteorder.h>
#include <asm/irq.h>
@@ -1243,6 +1244,7 @@ int ide_wait_not_busy(ide_hwif_t *hwif,
if (stat == 0xff)
return -ENODEV;
touch_softlockup_watchdog();
+ touch_nmi_watchdog();
}
return -EBUSY;
}
next reply other threads:[~2006-07-13 10:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-07-13 10:14 Michal Schmidt [this message]
2006-07-13 13:28 ` [patch] IDE: Touch NMI watchdog during resume from STR Andi Kleen
2006-07-13 17:33 ` Michal Schmidt
2006-07-13 17:36 ` Andi Kleen
2006-07-23 22:06 ` [PATCH] Make touch_nmi_watchdog imply touch_softlockup_watchdog on all archs Michal Schmidt
2006-07-24 7:15 ` Ingo Molnar
2006-07-14 19:06 ` [patch] IDE: Touch NMI watchdog during resume from STR Pavel Machek
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=44B61D0A.7010305@stud.feec.vutbr.cz \
--to=xschmi00@stud.feec.vutbr.cz \
--cc=B.Zolnierkiewicz@elka.pw.edu.pl \
--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