From 3b30acf6a8989dc1a98f959d3c7743790eab00df Mon Sep 17 00:00:00 2001 From: Ondrej Zary Date: Tue, 17 Nov 2015 19:23:43 +0100 Subject: [PATCH] atp870u: Untangle tmport #5 Untangle the tmport crap so it becomes obvious what ports are accessed. Signed-off-by: Ondrej Zary Reviewed-by: Hannes Reinicke Acked-by: Christoph Hellwig Signed-off-by: Martin K. Petersen --- drivers/scsi/atp870u.c | 470 +++++++++++++++-------------------------- 1 file changed, 173 insertions(+), 297 deletions(-) diff --git a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.c index 3e3a68b2738d..3bf01fcb4b49 100644 --- a/drivers/scsi/atp870u.c +++ b/drivers/scsi/atp870u.c @@ -1639,7 +1639,6 @@ set_syn_ok: static void is880(struct atp_unit *dev, unsigned int wkport) { - unsigned int tmport; unsigned char i, j, k, rmb, n, lvdmode; unsigned short int m; static unsigned char mbuf[512]; @@ -1664,130 +1663,100 @@ static void is880(struct atp_unit *dev, unsigned int wkport) printk(KERN_INFO " ID: %2d Host Adapter\n", dev->host_id[0]); continue; } - tmport = wkport + 0x5b; - outb(0x01, tmport); - tmport = wkport + 0x41; - outb(0x08, tmport++); - outb(0x7f, tmport++); - outb(satn[0], tmport++); - outb(satn[1], tmport++); - outb(satn[2], tmport++); - outb(satn[3], tmport++); - outb(satn[4], tmport++); - outb(satn[5], tmport++); - tmport += 0x06; - outb(0, tmport); - tmport += 0x02; - outb(dev->id[0][i].devsp, tmport++); - outb(0, tmport++); - outb(satn[6], tmport++); - outb(satn[7], tmport++); + outb(0x01, wkport + 0x5b); + outb(0x08, wkport + 0x41); + outb(0x7f, wkport + 0x42); + outb(satn[0], wkport + 0x43); + outb(satn[1], wkport + 0x44); + outb(satn[2], wkport + 0x45); + outb(satn[3], wkport + 0x46); + outb(satn[4], wkport + 0x47); + outb(satn[5], wkport + 0x48); + outb(0, wkport + 0x4f); + outb(dev->id[0][i].devsp, wkport + 0x51); + outb(0, wkport + 0x52); + outb(satn[6], wkport + 0x53); + outb(satn[7], wkport + 0x54); j = i; if ((j & 0x08) != 0) { j = (j & 0x07) | 0x40; } - outb(j, tmport); - tmport += 0x03; - outb(satn[8], tmport); - tmport += 0x07; + outb(j, wkport + 0x55); + outb(satn[8], wkport + 0x58); - while ((inb(tmport) & 0x80) == 0x00) + while ((inb(wkport + 0x5f) & 0x80) == 0x00) cpu_relax(); - tmport -= 0x08; - if (inb(tmport) != 0x11 && inb(tmport) != 0x8e) + if (inb(wkport + 0x57) != 0x11 && inb(wkport + 0x57) != 0x8e) continue; - while (inb(tmport) != 0x8e) + while (inb(wkport + 0x57) != 0x8e) cpu_relax(); dev->active_id[0] |= m; - tmport = wkport + 0x50; - outb(0x30, tmport); - tmport = wkport + 0x54; - outb(0x00, tmport); + outb(0x30, wkport + 0x50); + outb(0x00, wkport + 0x54); phase_cmd: - tmport = wkport + 0x58; - outb(0x08, tmport); - tmport += 0x07; + outb(0x08, wkport + 0x58); - while ((inb(tmport) & 0x80) == 0x00) + while ((inb(wkport + 0x5f) & 0x80) == 0x00) cpu_relax(); - tmport -= 0x08; - j = inb(tmport); + j = inb(wkport + 0x57); if (j != 0x16) { - tmport = wkport + 0x50; - outb(0x41, tmport); + outb(0x41, wkport + 0x50); goto phase_cmd; } sel_ok: - tmport = wkport + 0x43; - outb(inqd[0], tmport++); - outb(inqd[1], tmport++); - outb(inqd[2], tmport++); - outb(inqd[3], tmport++); - outb(inqd[4], tmport++); - outb(inqd[5], tmport); - tmport += 0x07; - outb(0, tmport); - tmport += 0x02; - outb(dev->id[0][i].devsp, tmport++); - outb(0, tmport++); - outb(inqd[6], tmport++); - outb(inqd[7], tmport++); - tmport += 0x03; - outb(inqd[8], tmport); - tmport += 0x07; + outb(inqd[0], wkport + 0x43); + outb(inqd[1], wkport + 0x44); + outb(inqd[2], wkport + 0x45); + outb(inqd[3], wkport + 0x46); + outb(inqd[4], wkport + 0x47); + outb(inqd[5], wkport + 0x48); + outb(0, wkport + 0x4f); + outb(dev->id[0][i].devsp, wkport + 0x51); + outb(0, wkport + 0x52); + outb(inqd[6], wkport + 0x53); + outb(inqd[7], wkport + 0x54); + outb(inqd[8], wkport + 0x58); - while ((inb(tmport) & 0x80) == 0x00) + while ((inb(wkport + 0x5f) & 0x80) == 0x00) cpu_relax(); - tmport -= 0x08; - if (inb(tmport) != 0x11 && inb(tmport) != 0x8e) + if (inb(wkport + 0x57) != 0x11 && inb(wkport + 0x57) != 0x8e) continue; - while (inb(tmport) != 0x8e) + while (inb(wkport + 0x57) != 0x8e) cpu_relax(); - tmport = wkport + 0x5b; - outb(0x00, tmport); - tmport = wkport + 0x58; - outb(0x08, tmport); - tmport += 0x07; + outb(0x00, wkport + 0x5b); + outb(0x08, wkport + 0x58); j = 0; rd_inq_data: - k = inb(tmport); + k = inb(wkport + 0x5f); if ((k & 0x01) != 0) { - tmport -= 0x06; - mbuf[j++] = inb(tmport); - tmport += 0x06; + mbuf[j++] = inb(wkport + 0x59); goto rd_inq_data; } if ((k & 0x80) == 0) { goto rd_inq_data; } - tmport -= 0x08; - j = inb(tmport); + j = inb(wkport + 0x57); if (j == 0x16) { goto inq_ok; } - tmport = wkport + 0x50; - outb(0x46, tmport); - tmport += 0x02; - outb(0, tmport++); - outb(0, tmport++); - outb(0, tmport++); - tmport += 0x03; - outb(0x08, tmport); - tmport += 0x07; - while ((inb(tmport) & 0x80) == 0x00) + outb(0x46, wkport + 0x50); + outb(0, wkport + 0x52); + outb(0, wkport + 0x53); + outb(0, wkport + 0x54); + outb(0x08, wkport + 0x58); + while ((inb(wkport + 0x5f) & 0x80) == 0x00) cpu_relax(); - tmport -= 0x08; - if (inb(tmport) != 0x16) + if (inb(wkport + 0x57) != 0x16) goto sel_ok; inq_ok: @@ -1810,58 +1779,43 @@ inq_ok: goto chg_wide; } - tmport = wkport + 0x5b; - outb(0x01, tmport); - tmport = wkport + 0x43; - outb(satn[0], tmport++); - outb(satn[1], tmport++); - outb(satn[2], tmport++); - outb(satn[3], tmport++); - outb(satn[4], tmport++); - outb(satn[5], tmport++); - tmport += 0x06; - outb(0, tmport); - tmport += 0x02; - outb(dev->id[0][i].devsp, tmport++); - outb(0, tmport++); - outb(satn[6], tmport++); - outb(satn[7], tmport++); - tmport += 0x03; - outb(satn[8], tmport); - tmport += 0x07; - - while ((inb(tmport) & 0x80) == 0x00) + outb(0x01, wkport + 0x5b); + outb(satn[0], wkport + 0x43); + outb(satn[1], wkport + 0x44); + outb(satn[2], wkport + 0x45); + outb(satn[3], wkport + 0x46); + outb(satn[4], wkport + 0x47); + outb(satn[5], wkport + 0x48); + outb(0, wkport + 0x4f); + outb(dev->id[0][i].devsp, wkport + 0x51); + outb(0, wkport + 0x52); + outb(satn[6], wkport + 0x53); + outb(satn[7], wkport + 0x54); + outb(satn[8], wkport + 0x58); + + while ((inb(wkport + 0x5f) & 0x80) == 0x00) cpu_relax(); - tmport -= 0x08; - - if (inb(tmport) != 0x11 && inb(tmport) != 0x8e) + if (inb(wkport + 0x57) != 0x11 && inb(wkport + 0x57) != 0x8e) continue; - while (inb(tmport) != 0x8e) + while (inb(wkport + 0x57) != 0x8e) cpu_relax(); try_u3: j = 0; - tmport = wkport + 0x54; - outb(0x09, tmport); - tmport += 0x04; - outb(0x20, tmport); - tmport += 0x07; + outb(0x09, wkport + 0x54); + outb(0x20, wkport + 0x58); - while ((inb(tmport) & 0x80) == 0) { - if ((inb(tmport) & 0x01) != 0) { - tmport -= 0x06; - outb(u3[j++], tmport); - tmport += 0x06; - } + while ((inb(wkport + 0x5f) & 0x80) == 0) { + if ((inb(wkport + 0x5f) & 0x01) != 0) + outb(u3[j++], wkport + 0x59); } - tmport -= 0x08; - while ((inb(tmport) & 0x80) == 0x00) + while ((inb(wkport + 0x57) & 0x80) == 0x00) cpu_relax(); - j = inb(tmport) & 0x0f; + j = inb(wkport + 0x57) & 0x0f; if (j == 0x0f) { goto u3p_in; } @@ -1873,18 +1827,12 @@ try_u3: } continue; u3p_out: - tmport = wkport + 0x58; - outb(0x20, tmport); - tmport += 0x07; - while ((inb(tmport) & 0x80) == 0) { - if ((inb(tmport) & 0x01) != 0) { - tmport -= 0x06; - outb(0, tmport); - tmport += 0x06; - } + outb(0x20, wkport + 0x58); + while ((inb(wkport + 0x5f) & 0x80) == 0) { + if ((inb(wkport + 0x5f) & 0x01) != 0) + outb(0, wkport + 0x59); } - tmport -= 0x08; - j = inb(tmport) & 0x0f; + j = inb(wkport + 0x57) & 0x0f; if (j == 0x0f) { goto u3p_in; } @@ -1896,25 +1844,19 @@ u3p_out: } continue; u3p_in: - tmport = wkport + 0x54; - outb(0x09, tmport); - tmport += 0x04; - outb(0x20, tmport); - tmport += 0x07; + outb(0x09, wkport + 0x54); + outb(0x20, wkport + 0x58); k = 0; u3p_in1: - j = inb(tmport); + j = inb(wkport + 0x5f); if ((j & 0x01) != 0) { - tmport -= 0x06; - mbuf[k++] = inb(tmport); - tmport += 0x06; + mbuf[k++] = inb(wkport + 0x59); goto u3p_in1; } if ((j & 0x80) == 0x00) { goto u3p_in1; } - tmport -= 0x08; - j = inb(tmport) & 0x0f; + j = inb(wkport + 0x57) & 0x0f; if (j == 0x0f) { goto u3p_in; } @@ -1926,19 +1868,14 @@ u3p_in1: } continue; u3p_cmd: - tmport = wkport + 0x50; - outb(0x30, tmport); - tmport = wkport + 0x54; - outb(0x00, tmport); - tmport += 0x04; - outb(0x08, tmport); - tmport += 0x07; + outb(0x30, wkport + 0x50); + outb(0x00, wkport + 0x54); + outb(0x08, wkport + 0x58); - while ((inb(tmport) & 0x80) == 0x00) + while ((inb(wkport + 0x5f) & 0x80) == 0x00) cpu_relax(); - tmport -= 0x08; - j = inb(tmport); + j = inb(wkport + 0x57); if (j != 0x16) { if (j == 0x4e) { goto u3p_out; @@ -1962,56 +1899,42 @@ u3p_cmd: continue; } chg_wide: - tmport = wkport + 0x5b; - outb(0x01, tmport); - tmport = wkport + 0x43; - outb(satn[0], tmport++); - outb(satn[1], tmport++); - outb(satn[2], tmport++); - outb(satn[3], tmport++); - outb(satn[4], tmport++); - outb(satn[5], tmport++); - tmport += 0x06; - outb(0, tmport); - tmport += 0x02; - outb(dev->id[0][i].devsp, tmport++); - outb(0, tmport++); - outb(satn[6], tmport++); - outb(satn[7], tmport++); - tmport += 0x03; - outb(satn[8], tmport); - tmport += 0x07; - - while ((inb(tmport) & 0x80) == 0x00) + outb(0x01, wkport + 0x5b); + outb(satn[0], wkport + 0x43); + outb(satn[1], wkport + 0x44); + outb(satn[2], wkport + 0x45); + outb(satn[3], wkport + 0x46); + outb(satn[4], wkport + 0x47); + outb(satn[5], wkport + 0x48); + outb(0, wkport + 0x4f); + outb(dev->id[0][i].devsp, wkport + 0x51); + outb(0, wkport + 0x52); + outb(satn[6], wkport + 0x53); + outb(satn[7], wkport + 0x54); + outb(satn[8], wkport + 0x58); + + while ((inb(wkport + 0x5f) & 0x80) == 0x00) cpu_relax(); - tmport -= 0x08; - if (inb(tmport) != 0x11 && inb(tmport) != 0x8e) + if (inb(wkport + 0x57) != 0x11 && inb(wkport + 0x57) != 0x8e) continue; - while (inb(tmport) != 0x8e) + while (inb(wkport + 0x57) != 0x8e) cpu_relax(); try_wide: j = 0; - tmport = wkport + 0x54; - outb(0x05, tmport); - tmport += 0x04; - outb(0x20, tmport); - tmport += 0x07; + outb(0x05, wkport + 0x54); + outb(0x20, wkport + 0x58); - while ((inb(tmport) & 0x80) == 0) { - if ((inb(tmport) & 0x01) != 0) { - tmport -= 0x06; - outb(wide[j++], tmport); - tmport += 0x06; - } + while ((inb(wkport + 0x5f) & 0x80) == 0) { + if ((inb(wkport + 0x5f) & 0x01) != 0) + outb(wide[j++], wkport + 0x59); } - tmport -= 0x08; - while ((inb(tmport) & 0x80) == 0x00) + while ((inb(wkport + 0x57) & 0x80) == 0x00) cpu_relax(); - j = inb(tmport) & 0x0f; + j = inb(wkport + 0x57) & 0x0f; if (j == 0x0f) { goto widep_in; } @@ -2023,18 +1946,12 @@ try_wide: } continue; widep_out: - tmport = wkport + 0x58; - outb(0x20, tmport); - tmport += 0x07; - while ((inb(tmport) & 0x80) == 0) { - if ((inb(tmport) & 0x01) != 0) { - tmport -= 0x06; - outb(0, tmport); - tmport += 0x06; - } + outb(0x20, wkport + 0x58); + while ((inb(wkport + 0x5f) & 0x80) == 0) { + if ((inb(wkport + 0x5f) & 0x01) != 0) + outb(0, wkport + 0x59); } - tmport -= 0x08; - j = inb(tmport) & 0x0f; + j = inb(wkport + 0x57) & 0x0f; if (j == 0x0f) { goto widep_in; } @@ -2046,25 +1963,19 @@ widep_out: } continue; widep_in: - tmport = wkport + 0x54; - outb(0xff, tmport); - tmport += 0x04; - outb(0x20, tmport); - tmport += 0x07; + outb(0xff, wkport + 0x54); + outb(0x20, wkport + 0x58); k = 0; widep_in1: - j = inb(tmport); + j = inb(wkport + 0x5f); if ((j & 0x01) != 0) { - tmport -= 0x06; - mbuf[k++] = inb(tmport); - tmport += 0x06; + mbuf[k++] = inb(wkport + 0x59); goto widep_in1; } if ((j & 0x80) == 0x00) { goto widep_in1; } - tmport -= 0x08; - j = inb(tmport) & 0x0f; + j = inb(wkport + 0x57) & 0x0f; if (j == 0x0f) { goto widep_in; } @@ -2076,19 +1987,14 @@ widep_in1: } continue; widep_cmd: - tmport = wkport + 0x50; - outb(0x30, tmport); - tmport = wkport + 0x54; - outb(0x00, tmport); - tmport += 0x04; - outb(0x08, tmport); - tmport += 0x07; + outb(0x30, wkport + 0x50); + outb(0x00, wkport + 0x54); + outb(0x08, wkport + 0x58); - while ((inb(tmport) & 0x80) == 0x00) + while ((inb(wkport + 0x5f) & 0x80) == 0x00) cpu_relax(); - tmport -= 0x08; - j = inb(tmport); + j = inb(wkport + 0x57); if (j != 0x16) { if (j == 0x4e) { goto widep_out; @@ -2129,73 +2035,60 @@ set_sync: synuw[4] = 0x0a; } } - tmport = wkport + 0x5b; j = 0; if ((m & dev->wide_id[0]) != 0) { j |= 0x01; } - outb(j, tmport); - tmport = wkport + 0x43; - outb(satn[0], tmport++); - outb(satn[1], tmport++); - outb(satn[2], tmport++); - outb(satn[3], tmport++); - outb(satn[4], tmport++); - outb(satn[5], tmport++); - tmport += 0x06; - outb(0, tmport); - tmport += 0x02; - outb(dev->id[0][i].devsp, tmport++); - outb(0, tmport++); - outb(satn[6], tmport++); - outb(satn[7], tmport++); - tmport += 0x03; - outb(satn[8], tmport); - tmport += 0x07; - - while ((inb(tmport) & 0x80) == 0x00) + outb(j, wkport + 0x5b); + outb(satn[0], wkport + 0x43); + outb(satn[1], wkport + 0x44); + outb(satn[2], wkport + 0x45); + outb(satn[3], wkport + 0x46); + outb(satn[4], wkport + 0x47); + outb(satn[5], wkport + 0x48); + outb(0, wkport + 0x4f); + outb(dev->id[0][i].devsp, wkport + 0x51); + outb(0, wkport + 0x52); + outb(satn[6], wkport + 0x53); + outb(satn[7], wkport + 0x54); + outb(satn[8], wkport + 0x58); + + while ((inb(wkport + 0x5f) & 0x80) == 0x00) cpu_relax(); - tmport -= 0x08; - if ((inb(tmport) != 0x11) && (inb(tmport) != 0x8e)) { + if ((inb(wkport + 0x57) != 0x11) && (inb(wkport + 0x57) != 0x8e)) { continue; } - while (inb(tmport) != 0x8e) + while (inb(wkport + 0x57) != 0x8e) cpu_relax(); try_sync: j = 0; - tmport = wkport + 0x54; - outb(0x06, tmport); - tmport += 0x04; - outb(0x20, tmport); - tmport += 0x07; + outb(0x06, wkport + 0x54); + outb(0x20, wkport + 0x58); - while ((inb(tmport) & 0x80) == 0) { - if ((inb(tmport) & 0x01) != 0) { - tmport -= 0x06; + while ((inb(wkport + 0x5f) & 0x80) == 0) { + if ((inb(wkport + 0x5f) & 0x01) != 0) { if ((m & dev->wide_id[0]) != 0) { if ((m & dev->ultra_map[0]) != 0) { - outb(synuw[j++], tmport); + outb(synuw[j++], wkport + 0x59); } else { - outb(synw[j++], tmport); + outb(synw[j++], wkport + 0x59); } } else { if ((m & dev->ultra_map[0]) != 0) { - outb(synu[j++], tmport); + outb(synu[j++], wkport + 0x59); } else { - outb(synn[j++], tmport); + outb(synn[j++], wkport + 0x59); } } - tmport += 0x06; } } - tmport -= 0x08; - while ((inb(tmport) & 0x80) == 0x00) + while ((inb(wkport + 0x57) & 0x80) == 0x00) cpu_relax(); - j = inb(tmport) & 0x0f; + j = inb(wkport + 0x57) & 0x0f; if (j == 0x0f) { goto phase_ins; } @@ -2207,18 +2100,12 @@ try_sync: } continue; phase_outs: - tmport = wkport + 0x58; - outb(0x20, tmport); - tmport += 0x07; - while ((inb(tmport) & 0x80) == 0x00) { - if ((inb(tmport) & 0x01) != 0x00) { - tmport -= 0x06; - outb(0x00, tmport); - tmport += 0x06; - } + outb(0x20, wkport + 0x58); + while ((inb(wkport + 0x5f) & 0x80) == 0x00) { + if ((inb(wkport + 0x5f) & 0x01) != 0x00) + outb(0x00, wkport + 0x59); } - tmport -= 0x08; - j = inb(tmport); + j = inb(wkport + 0x57); if (j == 0x85) { goto tar_dcons; } @@ -2234,29 +2121,23 @@ phase_outs: } continue; phase_ins: - tmport = wkport + 0x54; - outb(0x06, tmport); - tmport += 0x04; - outb(0x20, tmport); - tmport += 0x07; + outb(0x06, wkport + 0x54); + outb(0x20, wkport + 0x58); k = 0; phase_ins1: - j = inb(tmport); + j = inb(wkport + 0x5f); if ((j & 0x01) != 0x00) { - tmport -= 0x06; - mbuf[k++] = inb(tmport); - tmport += 0x06; + mbuf[k++] = inb(wkport + 0x59); goto phase_ins1; } if ((j & 0x80) == 0x00) { goto phase_ins1; } - tmport -= 0x08; - while ((inb(tmport) & 0x80) == 0x00) + while ((inb(wkport + 0x57) & 0x80) == 0x00) cpu_relax(); - j = inb(tmport); + j = inb(wkport + 0x57); if (j == 0x85) { goto tar_dcons; } @@ -2272,20 +2153,15 @@ phase_ins1: } continue; phase_cmds: - tmport = wkport + 0x50; - outb(0x30, tmport); + outb(0x30, wkport + 0x50); tar_dcons: - tmport = wkport + 0x54; - outb(0x00, tmport); - tmport += 0x04; - outb(0x08, tmport); - tmport += 0x07; + outb(0x00, wkport + 0x54); + outb(0x08, wkport + 0x58); - while ((inb(tmport) & 0x80) == 0x00) + while ((inb(wkport + 0x5f) & 0x80) == 0x00) cpu_relax(); - tmport -= 0x08; - j = inb(tmport); + j = inb(wkport + 0x57); if (j != 0x16) { continue; } -- 2.20.1