From: "Daniel Marjamäki" <daniel.marjamaki@comhem.se>
To: linux-kernel@vger.kernel.org
Cc: "Daniel Marjamäki" <daniel.marjamaki@comhem.se>
Subject: I made a patch and would like feedback/testers (drivers/cdrom/aztcd.c)
Date: Sun, 20 Nov 2005 16:29:22 +0100 [thread overview]
Message-ID: <43809652.8000904@comhem.se> (raw)
Hello!
I made a patch and I would like feedback.
If you can test the patch.. please let me know.
Background:
There are busy loops that time out after 8 million repetitions.
I made these improvements:
* Sleep during the busy loops
* Time out is based on elapsed time
If this patch is accepted, AZT_TIMEOUT can be removed.
Best regards,
Daniel Marjamäki
diff -up a/drivers/cdrom/aztcd.c b/drivers/cdrom/aztcd.c
--- a/drivers/cdrom/aztcd.c 2005-11-17 11:39:53.000000000 +0100
+++ b/drivers/cdrom/aztcd.c 2005-11-19 17:14:58.000000000 +0100
@@ -179,6 +179,7 @@
#include <linux/ioport.h>
#include <linux/string.h>
#include <linux/major.h>
+#include <linux/jiffies.h>
#include <linux/init.h>
@@ -308,7 +309,7 @@ static char aztDiskChanged = 1;
static char aztTocUpToDate = 0;
static unsigned char aztIndatum;
-static unsigned long aztTimeOutCount;
+static unsigned long aztTimeOutCount, aztTimeOut;
static int aztCmd = 0;
static DEFINE_SPINLOCK(aztSpin);
@@ -361,14 +362,14 @@ static int azt_bcd2bin(unsigned char bcd
# define OP_OK op_ok()
static void op_ok(void)
{
- aztTimeOutCount = 0;
+ aztTimeOut = jiffies + 2;
do {
aztIndatum = inb(DATA_PORT);
- aztTimeOutCount++;
- if (aztTimeOutCount >= AZT_TIMEOUT) {
+ if (time_after(jiffies, aztTimeOut)) {
printk("aztcd: Error Wait OP_OK\n");
break;
}
+ schedule_timeout_interruptible(1);
} while (aztIndatum != AFL_OP_OK);
}
@@ -377,14 +378,14 @@ static void op_ok(void)
# define PA_OK pa_ok()
static void pa_ok(void)
{
- aztTimeOutCount = 0;
+ aztTimeOut = jiffies + 2;
do {
aztIndatum = inb(DATA_PORT);
- aztTimeOutCount++;
- if (aztTimeOutCount >= AZT_TIMEOUT) {
+ if (time_after(jiffies, aztTimeOut)) {
printk("aztcd: Error Wait PA_OK\n");
break;
}
+ schedule_timeout_interruptible(1);
} while (aztIndatum != AFL_PA_OK);
}
#endif
@@ -393,17 +394,17 @@ static void pa_ok(void)
# define STEN_LOW sten_low()
static void sten_low(void)
{
- aztTimeOutCount = 0;
+ aztTimeOut = jiffies + 2;
do {
aztIndatum = inb(STATUS_PORT);
- aztTimeOutCount++;
- if (aztTimeOutCount >= AZT_TIMEOUT) {
+ if (time_after(jiffies, aztTimeOut)) {
if (azt_init_end)
printk
("aztcd: Error Wait STEN_LOW commands:%x\n",
aztCmd);
break;
}
+ schedule_timeout_interruptible(1);
} while (aztIndatum & AFL_STATUS);
}
@@ -411,14 +412,14 @@ static void sten_low(void)
# define DTEN_LOW dten_low()
static void dten_low(void)
{
- aztTimeOutCount = 0;
+ aztTimeOut = jiffies + 2;
do {
aztIndatum = inb(STATUS_PORT);
- aztTimeOutCount++;
- if (aztTimeOutCount >= AZT_TIMEOUT) {
+ if (time_after(jiffies, aztTimeOut)) {
printk("aztcd: Error Wait DTEN_OK\n");
break;
}
+ schedule_timeout_interruptible(1);
} while (aztIndatum & AFL_DATA);
}
next reply other threads:[~2005-11-20 15:29 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-11-20 15:29 Daniel Marjamäki [this message]
2005-11-20 15:38 ` I made a patch and would like feedback/testers (drivers/cdrom/aztcd.c) Arjan van de Ven
2005-11-20 17:15 ` Thomas Gleixner
2005-11-20 21:04 ` Nish Aravamudan
[not found] <5aZsv-3CJ-17@gated-at.bofh.it>
2005-11-20 20:58 ` Bodo Eggert
2005-11-20 21:07 ` Nish Aravamudan
2005-11-21 8:09 ` Daniel Marjamäki
2005-11-21 8:19 ` Con Kolivas
2005-11-21 8:42 ` Daniel Marjamäki
2005-11-21 9:11 ` Con Kolivas
2005-11-21 10:47 ` Nick Piggin
2005-11-21 15:08 ` Nish Aravamudan
2005-11-21 16:33 ` Bodo Eggert
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=43809652.8000904@comhem.se \
--to=daniel.marjamaki@comhem.se \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.