From: Randy Dunlap <rdunlap@xenotime.net>
To: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: lkml <linux-kernel@vger.kernel.org>,
akpm <akpm@linux-foundation.org>,
Mike Miller <mike.miller@hp.com>,
iss_storagedev@hp.com
Subject: Re: [PATCH] cciss: fix schedule_timeout() parameters
Date: Mon, 31 Aug 2009 13:03:42 -0700 [thread overview]
Message-ID: <20090831130342.a5f3d821.rdunlap@xenotime.net> (raw)
In-Reply-To: <4A9C156D.5080701@gmail.com>
On Mon, 31 Aug 2009 20:24:45 +0200 Marcin Slusarz wrote:
> Randy Dunlap wrote:
> > From: Randy Dunlap <randy.dunlap@oracle.com>
> >
> > Change schedule_timeout() parameter to not be specific to HZ=1000.
> >
> > Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> > Cc: Mike Miller <mike.miller@hp.com>
> > Cc: iss_storagedev@hp.com
> > ---
> > drivers/block/cciss.c | 5 +++--
> > 1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > --- lnx-2631-rc7.orig/drivers/block/cciss.c
> > +++ lnx-2631-rc7/drivers/block/cciss.c
> > @@ -36,6 +36,7 @@
> > #include <linux/proc_fs.h>
> > #include <linux/seq_file.h>
> > #include <linux/init.h>
> > +#include <linux/jiffies.h>
> > #include <linux/hdreg.h>
> > #include <linux/spinlock.h>
> > #include <linux/compat.h>
> > @@ -3489,7 +3490,7 @@ static int __devinit cciss_pci_init(ctlr
> > if (scratchpad == CCISS_FIRMWARE_READY)
> > break;
> > set_current_state(TASK_INTERRUPTIBLE);
> > - schedule_timeout(HZ / 10); /* wait 100ms */
> > + schedule_timeout(msecs_to_jiffies(100)); /* wait 100ms */
> > }
> > if (scratchpad != CCISS_FIRMWARE_READY) {
> > printk(KERN_WARNING "cciss: Board not ready. Timed out.\n");
> > @@ -3615,7 +3616,7 @@ static int __devinit cciss_pci_init(ctlr
> > break;
> > /* delay and try again */
> > set_current_state(TASK_INTERRUPTIBLE);
> > - schedule_timeout(10);
> > + schedule_timeout(msecs_to_jiffies(1));
>
> shouldn't it be msecs_to_jiffies(10)?
Hm, thanks, that's a good observation -- and possibly correct.
The reason that I used (1) was that I looked at the loop:
for (i = 0; i < MAX_CONFIG_WAIT; i++) {
if (!(readl(c->vaddr + SA5_DOORBELL) & CFGTBL_ChangeReq))
break;
/* delay and try again */
set_current_state(TASK_INTERRUPTIBLE);
schedule_timeout(msecs_to_jiffies(1));
}
and this:
/* How long to wait (in milliseconds) for board to go into simple mode */
#define MAX_CONFIG_WAIT 30000
and then I tried to make the loop run for a max. of 30000 milliseconds.
Mike M., any comments here?
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
next prev parent reply other threads:[~2009-08-31 20:03 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-30 20:19 Randy Dunlap
2009-08-31 14:23 ` Miller, Mike (OS Dev)
2009-08-31 18:24 ` Marcin Slusarz
2009-08-31 20:03 ` Randy Dunlap [this message]
2009-09-01 19:43 ` Miller, Mike (OS Dev)
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=20090831130342.a5f3d821.rdunlap@xenotime.net \
--to=rdunlap@xenotime.net \
--cc=akpm@linux-foundation.org \
--cc=iss_storagedev@hp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=marcin.slusarz@gmail.com \
--cc=mike.miller@hp.com \
/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
all inboxes | Powered by JetHome®