Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

atp870u: Untangle tmpcip

Browse source 
Untangle the tmpcip crap so it becomes obvious what ports are accessed.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Reviewed-by: Hannes Reinicke <hare@suse.de>
Acked-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Ondrej Zary 2015-11-17 19:23:47 +01:00 committed by Martin K. Petersen
parent e2c22b45cb
commit bc0fe4c91c
1 changed files with 23 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
drivers/scsi/atp870u.c
View file

@ -47,7 +47,7 @@ static void tscam_885(void);
static irqreturn_t atp870u_intr_handle(int irq, void *dev_id) static irqreturn_t atp870u_intr_handle(int irq, void *dev_id)
{ {
unsigned long flags; unsigned long flags;
unsigned short int tmpcip, id; unsigned short int id;
unsigned char i, j, c, target_id, lun,cmdp; unsigned char i, j, c, target_id, lun,cmdp;
unsigned char *prd; unsigned char *prd;
struct scsi_cmnd *workreq; struct scsi_cmnd *workreq;
@ -79,30 +79,24 @@ static irqreturn_t atp870u_intr_handle(int irq, void *dev_id)
if ((inb(dev->ioport[c] + 0x16) & 0x80) == 0) if ((inb(dev->ioport[c] + 0x16) & 0x80) == 0)
outb((inb(dev->ioport[c] + 0x16) | 0x80), dev->ioport[c] + 0x16); outb((inb(dev->ioport[c] + 0x16) | 0x80), dev->ioport[c] + 0x16);
} }
tmpcip = dev->pciport[c]; if ((inb(dev->pciport[c]) & 0x08) != 0)
if ((inb(tmpcip) & 0x08) != 0)
{ {
tmpcip += 0x2;
for (k=0; k < 1000; k++) { for (k=0; k < 1000; k++) {
if ((inb(tmpcip) & 0x08) == 0) { if ((inb(dev->pciport[c] + 2) & 0x08) == 0) {
goto stop_dma; goto stop_dma;
} }
if ((inb(tmpcip) & 0x01) == 0) { if ((inb(dev->pciport[c] + 2) & 0x01) == 0) {
goto stop_dma; goto stop_dma;
} }
} }
} }
stop_dma: stop_dma:
tmpcip = dev->pciport[c]; outb(0x00, dev->pciport[c]);
outb(0x00, tmpcip);
i = inb(dev->ioport[c] + 0x17); i = inb(dev->ioport[c] + 0x17);
if (dev->dev_id == ATP885_DEVID) { if (dev->dev_id == ATP885_DEVID)
tmpcip += 2; outb(0x06, dev->pciport[c] + 2);
outb(0x06, tmpcip);
tmpcip -= 2;
}
target_id = inb(dev->ioport[c] + 0x15); target_id = inb(dev->ioport[c] + 0x15);
@ -303,13 +297,12 @@ static irqreturn_t atp870u_intr_handle(int irq, void *dev_id)
/* enable 32 bit fifo transfer */ /* enable 32 bit fifo transfer */
if (dev->dev_id == ATP885_DEVID) { if (dev->dev_id == ATP885_DEVID) {
tmpcip = dev->pciport[c] + 1; i=inb(dev->pciport[c] + 1) & 0xf3;
i=inb(tmpcip) & 0xf3;
//j=workreq->cmnd[0]; //j=workreq->cmnd[0];
if ((workreq->cmnd[0] == 0x08) || (workreq->cmnd[0] == 0x28) || (workreq->cmnd[0] == 0x0a) || (workreq->cmnd[0] == 0x2a)) { if ((workreq->cmnd[0] == 0x08) || (workreq->cmnd[0] == 0x28) || (workreq->cmnd[0] == 0x0a) || (workreq->cmnd[0] == 0x2a)) {
i |= 0x0c; i |= 0x0c;
} }
outb(i,tmpcip); outb(i, dev->pciport[c] + 1);
} else if ((dev->dev_id == ATP880_DEVID1) || } else if ((dev->dev_id == ATP880_DEVID1) ||
(dev->dev_id == ATP880_DEVID2) ) { (dev->dev_id == ATP880_DEVID2) ) {
if ((workreq->cmnd[0] == 0x08) || (workreq->cmnd[0] == 0x28) || (workreq->cmnd[0] == 0x0a) || (workreq->cmnd[0] == 0x2a)) { if ((workreq->cmnd[0] == 0x08) || (workreq->cmnd[0] == 0x28) || (workreq->cmnd[0] == 0x0a) || (workreq->cmnd[0] == 0x2a)) {
@ -371,25 +364,20 @@ static irqreturn_t atp870u_intr_handle(int irq, void *dev_id)
} }
} }
} }
tmpcip = dev->pciport[c] + 0x04; outl(dev->id[c][target_id].prdaddr, dev->pciport[c] + 0x04);
outl(dev->id[c][target_id].prdaddr, tmpcip);
#ifdef ED_DBGP #ifdef ED_DBGP
printk("dev->id[%d][%d].prdaddr 0x%8x\n", c, target_id, dev->id[c][target_id].prdaddr); printk("dev->id[%d][%d].prdaddr 0x%8x\n", c, target_id, dev->id[c][target_id].prdaddr);
#endif #endif
if (dev->dev_id == ATP885_DEVID) { if (dev->dev_id != ATP885_DEVID) {
tmpcip -= 0x04; outb(0x06, dev->pciport[c] + 2);
} else { outb(0x00, dev->pciport[c] + 2);
tmpcip -= 0x02;
outb(0x06, tmpcip);
outb(0x00, tmpcip);
tmpcip -= 0x02;
} }
/* /*
* Check transfer direction * Check transfer direction
*/ */
if (dev->id[c][target_id].dirct != 0) { if (dev->id[c][target_id].dirct != 0) {
outb(0x08, dev->ioport[c] + 0x18); outb(0x08, dev->ioport[c] + 0x18);
outb(0x01, tmpcip); outb(0x01, dev->pciport[c]);
dev->in_int[c] = 0; dev->in_int[c] = 0;
#ifdef ED_DBGP #ifdef ED_DBGP
printk("status 0x80 return dirct != 0\n"); printk("status 0x80 return dirct != 0\n");
@ -397,7 +385,7 @@ static irqreturn_t atp870u_intr_handle(int irq, void *dev_id)
goto handled; goto handled;
} }
outb(0x08, dev->ioport[c] + 0x18); outb(0x08, dev->ioport[c] + 0x18);
outb(0x09, tmpcip); outb(0x09, dev->pciport[c]);
dev->in_int[c] = 0; dev->in_int[c] = 0;
#ifdef ED_DBGP #ifdef ED_DBGP
printk("status 0x80 return dirct = 0\n"); printk("status 0x80 return dirct = 0\n");
@ -484,12 +472,9 @@ static irqreturn_t atp870u_intr_handle(int irq, void *dev_id)
} }
i &= 0x0f; i &= 0x0f;
if (i == 0x09) { if (i == 0x09) {
tmpcip += 4; outl(dev->id[c][target_id].prdaddr, dev->pciport[c] + 4);
outl(dev->id[c][target_id].prdaddr, tmpcip); outb(0x06, dev->pciport[c] + 2);
tmpcip = tmpcip - 2; outb(0x00, dev->pciport[c] + 2);
outb(0x06, tmpcip);
outb(0x00, tmpcip);
tmpcip = tmpcip - 2;
outb(0x41, dev->ioport[c] + 0x10); outb(0x41, dev->ioport[c] + 0x10);
if (dev->dev_id == ATP885_DEVID) { if (dev->dev_id == ATP885_DEVID) {
k = dev->id[c][target_id].last_len; k = dev->id[c][target_id].last_len;
@ -501,17 +486,14 @@ static irqreturn_t atp870u_intr_handle(int irq, void *dev_id)
dev->id[c][target_id].dirct = 0x00; dev->id[c][target_id].dirct = 0x00;
} }
outb(0x08, dev->ioport[c] + 0x18); outb(0x08, dev->ioport[c] + 0x18);
outb(0x09, tmpcip); outb(0x09, dev->pciport[c]);
dev->in_int[c] = 0; dev->in_int[c] = 0;
goto handled; goto handled;
} }
if (i == 0x08) { if (i == 0x08) {
tmpcip += 4; outl(dev->id[c][target_id].prdaddr, dev->pciport[c] + 4);
outl(dev->id[c][target_id].prdaddr, tmpcip); outb(0x06, dev->pciport[c] + 2);
tmpcip = tmpcip - 2; outb(0x00, dev->pciport[c] + 2);
outb(0x06, tmpcip);
outb(0x00, tmpcip);
tmpcip = tmpcip - 2;
outb(0x41, dev->ioport[c] + 0x10); outb(0x41, dev->ioport[c] + 0x10);
if (dev->dev_id == ATP885_DEVID) { if (dev->dev_id == ATP885_DEVID) {
k = dev->id[c][target_id].last_len; k = dev->id[c][target_id].last_len;
@ -522,7 +504,7 @@ static irqreturn_t atp870u_intr_handle(int irq, void *dev_id)
outb((unsigned char) (inb(dev->ioport[c] + 0x15) | 0x20), dev->ioport[c] + 0x15); outb((unsigned char) (inb(dev->ioport[c] + 0x15) | 0x20), dev->ioport[c] + 0x15);
dev->id[c][target_id].dirct = 0x20; dev->id[c][target_id].dirct = 0x20;
outb(0x08, dev->ioport[c] + 0x18); outb(0x08, dev->ioport[c] + 0x18);
outb(0x01, tmpcip); outb(0x01, dev->pciport[c]);
dev->in_int[c] = 0; dev->in_int[c] = 0;
goto handled; goto handled;
} }