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

atp870u: Untangle tmpcip #2

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:48 +01:00 committed by Martin K. Petersen
parent bc0fe4c91c
commit c2bab4031b
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/scsi/atp870u.c
View File

@ -645,7 +645,7 @@ static void send_s870(struct atp_unit *dev,unsigned char c)
unsigned int i;//,k; unsigned int i;//,k;
unsigned char j, target_id; unsigned char j, target_id;
unsigned char *prd; unsigned char *prd;
unsigned short int tmpcip, w; unsigned short int w;
unsigned long l, bttl = 0; unsigned long l, bttl = 0;
unsigned long sg_count; unsigned long sg_count;
@ -813,7 +813,6 @@ oktosend:
dev->in_snd[c] = 0; dev->in_snd[c] = 0;
return; return;
} }
tmpcip = dev->pciport[c];
prd = dev->id[c][target_id].prd_table; prd = dev->id[c][target_id].prd_table;
dev->id[c][target_id].prd_pos = prd; dev->id[c][target_id].prd_pos = prd;
@ -850,34 +849,28 @@ oktosend:
printk("2. bttl %x, l %x\n",bttl, l); printk("2. bttl %x, l %x\n",bttl, l);
#endif #endif
} }
tmpcip += 4;
#ifdef ED_DBGP #ifdef ED_DBGP
printk("send_s870: prdaddr_2 0x%8x tmpcip %x target_id %d\n", dev->id[c][target_id].prdaddr,tmpcip,target_id); printk("send_s870: prdaddr_2 0x%8x target_id %d\n", dev->id[c][target_id].prdaddr,target_id);
#endif #endif
dev->id[c][target_id].prdaddr = dev->id[c][target_id].prd_bus; dev->id[c][target_id].prdaddr = dev->id[c][target_id].prd_bus;
outl(dev->id[c][target_id].prdaddr, tmpcip); outl(dev->id[c][target_id].prdaddr, dev->pciport[c] + 4);
tmpcip = tmpcip - 2; outb(0x06, dev->pciport[c] + 2);
outb(0x06, tmpcip); outb(0x00, dev->pciport[c] + 2);
outb(0x00, tmpcip);
if (dev->dev_id == ATP885_DEVID) { if (dev->dev_id == ATP885_DEVID) {
tmpcip--; j = inb(dev->pciport[c] + 1) & 0xf3;
j=inb(tmpcip) & 0xf3;
if ((workreq->cmnd[0] == 0x08) || (workreq->cmnd[0] == 0x28) || if ((workreq->cmnd[0] == 0x08) || (workreq->cmnd[0] == 0x28) ||
(workreq->cmnd[0] == 0x0a) || (workreq->cmnd[0] == 0x2a)) { (workreq->cmnd[0] == 0x0a) || (workreq->cmnd[0] == 0x2a)) {
j |= 0x0c; j |= 0x0c;
} }
outb(j,tmpcip); outb(j, dev->pciport[c] + 1);
tmpcip--;
} else if ((dev->dev_id == ATP880_DEVID1) || } else if ((dev->dev_id == ATP880_DEVID1) ||
(dev->dev_id == ATP880_DEVID2)) { (dev->dev_id == ATP880_DEVID2)) {
tmpcip =tmpcip -2;
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)) {
outb((unsigned char) ((inb(dev->ioport[c] - 0x05) & 0x3f) | 0xc0), dev->ioport[c] - 0x05); outb((unsigned char) ((inb(dev->ioport[c] - 0x05) & 0x3f) | 0xc0), dev->ioport[c] - 0x05);
} else { } else {
outb((unsigned char) (inb(dev->ioport[c] - 0x05) & 0x3f), dev->ioport[c] - 0x05); outb((unsigned char) (inb(dev->ioport[c] - 0x05) & 0x3f), dev->ioport[c] - 0x05);
} }
} else { } else {
tmpcip =tmpcip -2;
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)) {
outb((inb(dev->ioport[c] + 0x3a) & 0xf3) | 0x08, dev->ioport[c] + 0x3a); outb((inb(dev->ioport[c] + 0x3a) & 0xf3) | 0x08, dev->ioport[c] + 0x3a);
} else { } else {
@ -889,7 +882,7 @@ oktosend:
dev->id[c][target_id].dirct = 0x20; dev->id[c][target_id].dirct = 0x20;
if (inb(dev->ioport[c] + 0x1c) == 0) { if (inb(dev->ioport[c] + 0x1c) == 0) {
outb(0x08, dev->ioport[c] + 0x18); outb(0x08, dev->ioport[c] + 0x18);
outb(0x01, tmpcip); outb(0x01, dev->pciport[c]);
#ifdef ED_DBGP #ifdef ED_DBGP
printk( "start DMA(to target)\n"); printk( "start DMA(to target)\n");
#endif #endif
@ -901,7 +894,7 @@ oktosend:
} }
if (inb(dev->ioport[c] + 0x1c) == 0) { if (inb(dev->ioport[c] + 0x1c) == 0) {
outb(0x08, dev->ioport[c] + 0x18); outb(0x08, dev->ioport[c] + 0x18);
outb(0x09, tmpcip); outb(0x09, dev->pciport[c]);
#ifdef ED_DBGP #ifdef ED_DBGP
printk( "start DMA(to host)\n"); printk( "start DMA(to host)\n");
#endif #endif