Re: [PATCH 1/2] SCSI: nsp32: replace large udelay by mdelay

From: Marc Dietrich
Date: Mon May 27 2013 - 05:05:00 EST


James,

Am Mittwoch, 22. Mai 2013, 22:33:18 schrieb Marc Dietrich:
> Looks like Arnd already send a fix for this. Sorry for the noise.

are you going to pick up Arnd's patch [1] for scsi-stable (3.10) branch?

Marc

[1] https://patchwork.kernel.org/patch/2489251/

> Am Mittwoch, 22. Mai 2013, 21:48:41 schrieb Marc Dietrich:
> > ARM has a maximum of 2000 usec delay. Use mdelay for larger delays.
> > This affects distro kernels mostly.
> >
> > Cc: GOTO Masanori <gotom@xxxxxxxxxxxx>
> > Cc: YOKOTA Hiroshi <yokota@xxxxxxxxxxxxxxxxxxxxxxx>
> > Cc: "James E.J. Bottomley" <JBottomley@xxxxxxxxxxxxx>
> > Cc: linux-scsi@xxxxxxxxxxxxxxx
> > Cc: linux-kernel@xxxxxxxxxxxxxxx
> > Signed-off-by: Marc Dietrich <marvin24@xxxxxx>
> > ---
> >
> > drivers/scsi/nsp32.c | 2 +-
> > drivers/scsi/nsp32.h | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
> > index 1e3879d..e2f796f 100644
> > --- a/drivers/scsi/nsp32.c
> > +++ b/drivers/scsi/nsp32.c
> > @@ -2899,7 +2899,7 @@ static void nsp32_do_bus_reset(nsp32_hw_data *data)
> >
> > * reset SCSI bus
> > */
> >
> > nsp32_write1(base, SCSI_BUS_CONTROL, BUSCTL_RST);
> >
> > - udelay(RESET_HOLD_TIME);
> > + mdelay(RESET_HOLD_TIME);
> >
> > nsp32_write1(base, SCSI_BUS_CONTROL, 0);
> > for(i = 0; i < 5; i++) {
> >
> > intrdat = nsp32_read2(base, IRQ_STATUS); /* dummy read */
> >
> > diff --git a/drivers/scsi/nsp32.h b/drivers/scsi/nsp32.h
> > index c022182..b2b3dc6 100644
> > --- a/drivers/scsi/nsp32.h
> > +++ b/drivers/scsi/nsp32.h
> > @@ -605,7 +605,7 @@ typedef struct _nsp32_hw_data {
> >
> > /*
> >
> > * TIME definition
> > */
> >
> > -#define RESET_HOLD_TIME 10000 /* reset time in us (SCSI-2 says the
> > +#define RESET_HOLD_TIME 10 /* reset time in ms (SCSI-2 says the
> >
> > minimum is 25us) */
> >
> > #define SEL_TIMEOUT_TIME 10000 /* 250ms defined in SCSI specification
> >
> > (25.6us/1unit) */

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/