leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aha1542: Remove WAIT and WAITd macros

Browse Source 
Convert the ugly WAIT and WAITd macros into wait_mask function.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
This commit is contained in:
Ondrej Zary 2015-02-06 23:11:31 +01:00 committed by James Bottomley
parent 6d9ffe6a01
commit 2093bfa136
1 changed files with 56 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
drivers/scsi/aha1542.c
View File

@ -120,38 +120,31 @@ struct aha1542_hostdata {
static DEFINE_SPINLOCK(aha1542_lock); static DEFINE_SPINLOCK(aha1542_lock);
#define WAITnexttimeout 3000000
static inline void aha1542_intr_reset(u16 base) static inline void aha1542_intr_reset(u16 base)
{ {
outb(IRST, CONTROL(base)); outb(IRST, CONTROL(base));
} }
#define WAIT(port, mask, allof, noneof) \ static inline bool wait_mask(u16 port, u8 mask, u8 allof, u8 noneof, int timeout)
{ register int WAITbits; \ {
register int WAITtimeout = WAITnexttimeout; \ bool delayed = true;
while (1) { \
WAITbits = inb(port) & (mask); \ if (timeout == 0) {
if ((WAITbits & (allof)) == (allof) && ((WAITbits & (noneof)) == 0)) \ timeout = 3000000;
break; \ delayed = false;
if (--WAITtimeout == 0) goto fail; \
} \
} }
/* Similar to WAIT, except we use the udelay call to regulate the while (1) {
amount of time we wait. */ u8 bits = inb(port) & mask;
#define WAITd(port, mask, allof, noneof, timeout) \ if ((bits & allof) == allof && ((bits & noneof) == 0))
{ register int WAITbits; \ break;
register int WAITtimeout = timeout; \ if (delayed)
while (1) { \ mdelay(1);
WAITbits = inb(port) & (mask); \ if (--timeout == 0)
if ((WAITbits & (allof)) == (allof) && ((WAITbits & (noneof)) == 0)) \ return false;
break; \ }
mdelay(1); \
if (--WAITtimeout == 0) goto fail; \ return true;
} \
} }
/* This is a bit complicated, but we need to make sure that an interrupt /* This is a bit complicated, but we need to make sure that an interrupt
@ -166,7 +159,8 @@ static int aha1542_out(unsigned int base, u8 *cmdp, int len)
if (len == 1) { if (len == 1) {
got_lock = 0; got_lock = 0;
while (1 == 1) { while (1 == 1) {
WAIT(STATUS(base), CDF, 0, CDF); if (!wait_mask(STATUS(base), CDF, 0, CDF, 0))
goto fail;
spin_lock_irqsave(&aha1542_lock, flags); spin_lock_irqsave(&aha1542_lock, flags);
if (inb(STATUS(base)) & CDF) { if (inb(STATUS(base)) & CDF) {
spin_unlock_irqrestore(&aha1542_lock, flags); spin_unlock_irqrestore(&aha1542_lock, flags);
@ -180,7 +174,8 @@ static int aha1542_out(unsigned int base, u8 *cmdp, int len)
spin_lock_irqsave(&aha1542_lock, flags); spin_lock_irqsave(&aha1542_lock, flags);
got_lock = 1; got_lock = 1;
while (len--) { while (len--) {
WAIT(STATUS(base), CDF, 0, CDF); if (!wait_mask(STATUS(base), CDF, 0, CDF, 0))
goto fail;
outb(*cmdp++, DATA(base)); outb(*cmdp++, DATA(base));
} }
spin_unlock_irqrestore(&aha1542_lock, flags); spin_unlock_irqrestore(&aha1542_lock, flags);
@ -202,7 +197,8 @@ static int aha1542_in(unsigned int base, u8 *cmdp, int len)
spin_lock_irqsave(&aha1542_lock, flags); spin_lock_irqsave(&aha1542_lock, flags);
while (len--) { while (len--) {
WAIT(STATUS(base), DF, DF, 0); if (!wait_mask(STATUS(base), DF, DF, 0, 0))
goto fail;
*cmdp++ = inb(DATA(base)); *cmdp++ = inb(DATA(base));
} }
spin_unlock_irqrestore(&aha1542_lock, flags); spin_unlock_irqrestore(&aha1542_lock, flags);
@ -222,7 +218,8 @@ static int aha1542_in1(unsigned int base, u8 *cmdp, int len)
spin_lock_irqsave(&aha1542_lock, flags); spin_lock_irqsave(&aha1542_lock, flags);
while (len--) { while (len--) {
WAITd(STATUS(base), DF, DF, 0, 100); if (!wait_mask(STATUS(base), DF, DF, 0, 100))
goto fail;
*cmdp++ = inb(DATA(base)); *cmdp++ = inb(DATA(base));
} }
spin_unlock_irqrestore(&aha1542_lock, flags); spin_unlock_irqrestore(&aha1542_lock, flags);
@ -313,7 +310,8 @@ static int aha1542_test_port(int bse, struct Scsi_Host *shpnt)
debug = 1; debug = 1;
/* Expect INIT and IDLE, any of the others are bad */ /* Expect INIT and IDLE, any of the others are bad */
WAIT(STATUS(bse), STATMASK, INIT | IDLE, STST | DIAGF | INVDCMD | DF | CDF); if (!wait_mask(STATUS(bse), STATMASK, INIT | IDLE, STST | DIAGF | INVDCMD | DF | CDF, 0))
goto fail;
debug = 2; debug = 2;
/* Shouldn't have generated any interrupts during reset */ /* Shouldn't have generated any interrupts during reset */
@ -331,7 +329,8 @@ static int aha1542_test_port(int bse, struct Scsi_Host *shpnt)
cmdp = &inquiry_result[0]; cmdp = &inquiry_result[0];
while (len--) { while (len--) {
WAIT(STATUS(bse), DF, DF, 0); if (!wait_mask(STATUS(bse), DF, DF, 0, 0))
goto fail;
*cmdp++ = inb(DATA(bse)); *cmdp++ = inb(DATA(bse));
} }
@ -342,7 +341,8 @@ static int aha1542_test_port(int bse, struct Scsi_Host *shpnt)
debug = 9; debug = 9;
/* When HACC, command is completed, and we're though testing */ /* When HACC, command is completed, and we're though testing */
WAIT(INTRFLAGS(bse), HACC, HACC, 0); if (!wait_mask(INTRFLAGS(bse), HACC, HACC, 0, 0))
goto fail;
/* now initialize adapter */ /* now initialize adapter */
debug = 10; debug = 10;
@ -711,7 +711,8 @@ static void setup_mailboxes(int bse, struct Scsi_Host *shpnt)
aha1542_intr_reset(bse); /* reset interrupts, so they don't block */ aha1542_intr_reset(bse); /* reset interrupts, so they don't block */
any2scsi((cmd + 2), isa_virt_to_bus(mb)); any2scsi((cmd + 2), isa_virt_to_bus(mb));
aha1542_out(bse, cmd, 5); aha1542_out(bse, cmd, 5);
WAIT(INTRFLAGS(bse), INTRMASK, HACC, 0); if (!wait_mask(INTRFLAGS(bse), INTRMASK, HACC, 0, 0))
goto fail;
while (0) { while (0) {
fail: fail:
printk(KERN_ERR "aha1542_detect: failed setting up mailboxes\n"); printk(KERN_ERR "aha1542_detect: failed setting up mailboxes\n");
@ -730,7 +731,8 @@ static int aha1542_getconfig(int base_io, unsigned char *irq_level, unsigned cha
}; };
aha1542_out(base_io, inquiry_cmd, 1); aha1542_out(base_io, inquiry_cmd, 1);
aha1542_in(base_io, inquiry_result, 3); aha1542_in(base_io, inquiry_result, 3);
WAIT(INTRFLAGS(base_io), INTRMASK, HACC, 0); if (!wait_mask(INTRFLAGS(base_io), INTRMASK, HACC, 0, 0))
goto fail;
while (0) { while (0) {
fail: fail:
printk(KERN_ERR "aha1542_detect: query board settings\n"); printk(KERN_ERR "aha1542_detect: query board settings\n");
@ -800,7 +802,8 @@ static int aha1542_mbenable(int base)
aha1542_out(base, mbenable_cmd, 1); aha1542_out(base, mbenable_cmd, 1);
if (aha1542_in1(base, mbenable_result, 2)) if (aha1542_in1(base, mbenable_result, 2))
return retval; return retval;
WAITd(INTRFLAGS(base), INTRMASK, HACC, 0, 100); if (!wait_mask(INTRFLAGS(base), INTRMASK, HACC, 0, 100))
goto fail;
aha1542_intr_reset(base); aha1542_intr_reset(base);
if ((mbenable_result[0] & 0x08) || mbenable_result[1]) { if ((mbenable_result[0] & 0x08) || mbenable_result[1]) {
@ -812,7 +815,8 @@ static int aha1542_mbenable(int base)
retval = BIOS_TRANSLATION_25563; retval = BIOS_TRANSLATION_25563;
aha1542_out(base, mbenable_cmd, 3); aha1542_out(base, mbenable_cmd, 3);
WAIT(INTRFLAGS(base), INTRMASK, HACC, 0); if (!wait_mask(INTRFLAGS(base), INTRMASK, HACC, 0, 0))
goto fail;
}; };
while (0) { while (0) {
fail: fail:
@ -834,7 +838,8 @@ static int aha1542_query(int base_io, int *transl)
}; };
aha1542_out(base_io, inquiry_cmd, 1); aha1542_out(base_io, inquiry_cmd, 1);
aha1542_in(base_io, inquiry_result, 4); aha1542_in(base_io, inquiry_result, 4);
WAIT(INTRFLAGS(base_io), INTRMASK, HACC, 0); if (!wait_mask(INTRFLAGS(base_io), INTRMASK, HACC, 0, 0))
goto fail;
while (0) { while (0) {
fail: fail:
printk(KERN_ERR "aha1542_detect: query card type\n"); printk(KERN_ERR "aha1542_detect: query card type\n");
@ -978,16 +983,19 @@ static struct Scsi_Host *aha1542_hw_init(struct scsi_host_template *tpnt, struct
} }
aha1542_intr_reset(base_io); aha1542_intr_reset(base_io);
aha1542_out(base_io, oncmd, 2); aha1542_out(base_io, oncmd, 2);
WAIT(INTRFLAGS(base_io), INTRMASK, HACC, 0); if (!wait_mask(INTRFLAGS(base_io), INTRMASK, HACC, 0, 0))
goto fail;
aha1542_intr_reset(base_io); aha1542_intr_reset(base_io);
aha1542_out(base_io, offcmd, 2); aha1542_out(base_io, offcmd, 2);
WAIT(INTRFLAGS(base_io), INTRMASK, HACC, 0); if (!wait_mask(INTRFLAGS(base_io), INTRMASK, HACC, 0, 0))
goto fail;
if (setup_dmaspeed[indx] >= 0) { if (setup_dmaspeed[indx] >= 0) {
u8 dmacmd[] = {CMD_DMASPEED, 0}; u8 dmacmd[] = {CMD_DMASPEED, 0};
dmacmd[1] = setup_dmaspeed[indx]; dmacmd[1] = setup_dmaspeed[indx];
aha1542_intr_reset(base_io); aha1542_intr_reset(base_io);
aha1542_out(base_io, dmacmd, 2); aha1542_out(base_io, dmacmd, 2);
WAIT(INTRFLAGS(base_io), INTRMASK, HACC, 0); if (!wait_mask(INTRFLAGS(base_io), INTRMASK, HACC, 0, 0))
goto fail;
} }
while (0) { while (0) {
fail: fail:
@ -1162,8 +1170,9 @@ static int aha1542_bus_reset(Scsi_Cmnd * SCpnt)
spin_lock_irq(SCpnt->device->host->host_lock); spin_lock_irq(SCpnt->device->host->host_lock);
WAIT(STATUS(SCpnt->device->host->io_port), if (!wait_mask(STATUS(SCpnt->device->host->io_port),
STATMASK, INIT | IDLE, STST | DIAGF | INVDCMD | DF | CDF); STATMASK, INIT | IDLE, STST | DIAGF | INVDCMD | DF | CDF, 0))
goto fail;
/* /*
* Now try to pick up the pieces. For all pending commands, * Now try to pick up the pieces. For all pending commands,
@ -1226,8 +1235,9 @@ static int aha1542_host_reset(Scsi_Cmnd * SCpnt)
ssleep(4); ssleep(4);
spin_lock_irq(SCpnt->device->host->host_lock); spin_lock_irq(SCpnt->device->host->host_lock);
WAIT(STATUS(SCpnt->device->host->io_port), if (!wait_mask(STATUS(SCpnt->device->host->io_port),
STATMASK, INIT | IDLE, STST | DIAGF | INVDCMD | DF | CDF); STATMASK, INIT | IDLE, STST | DIAGF | INVDCMD | DF | CDF, 0))
goto fail;
/* /*
* We need to do this too before the 1542 can interact with * We need to do this too before the 1542 can interact with