From patchwork Tue Nov 17 18:24:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Zary X-Patchwork-Id: 7641031 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6C75EBF90C for ; Tue, 17 Nov 2015 18:38:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0ACA1204D1 for ; Tue, 17 Nov 2015 18:38:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9E1C720458 for ; Tue, 17 Nov 2015 18:38:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754590AbbKQSiR (ORCPT ); Tue, 17 Nov 2015 13:38:17 -0500 Received: from ns.gsystem.sk ([62.176.172.50]:56593 "EHLO gsystem.sk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754581AbbKQSiQ (ORCPT ); Tue, 17 Nov 2015 13:38:16 -0500 Received: from stip-static-68.213-81-217.telecom.sk ([213.81.217.68] helo=gsql.ggedos.sk) by gsystem.sk with esmtpsa (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.80) (envelope-from ) id 1Zykvx-0006dg-Na; Tue, 17 Nov 2015 19:24:49 +0100 From: Ondrej Zary To: "Martin K. Petersen" Cc: Christoph Hellwig , linux-scsi@vger.kernel.org Subject: [PATCH 29/52] atp870u: Remove is870() Date: Tue, 17 Nov 2015 19:24:05 +0100 Message-Id: <1447784668-23713-30-git-send-email-linux@rainbow-software.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1447784668-23713-1-git-send-email-linux@rainbow-software.org> References: <1447784668-23713-1-git-send-email-linux@rainbow-software.org> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Now that is885() supports everything from is870() and the rest of the code is almost identical, remove is870() and use is885() instead. Signed-off-by: Ondrej Zary --- drivers/scsi/atp870u.c | 427 +----------------------------------------------- 1 file changed, 1 insertion(+), 426 deletions(-) diff --git a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.c index 6427f87..918875b 100644 --- a/drivers/scsi/atp870u.c +++ b/drivers/scsi/atp870u.c @@ -1162,431 +1162,6 @@ static void tscam(struct Scsi_Host *host) } } -static void is870(struct atp_unit *dev, unsigned char c, bool wide_chip) -{ - unsigned char i, j, k, rmb, n; - unsigned short int m; - static unsigned char mbuf[512]; - static unsigned char satn[9] = { 0, 0, 0, 0, 0, 0, 0, 6, 6 }; - static unsigned char inqd[9] = { 0x12, 0, 0, 0, 0x24, 0, 0, 0x24, 6 }; - static unsigned char synn[6] = { 0x80, 1, 3, 1, 0x19, 0x0e }; - static unsigned char synu[6] = { 0x80, 1, 3, 1, 0x0c, 0x0e }; - static unsigned char synw[6] = { 0x80, 1, 3, 1, 0x0c, 0x07 }; - static unsigned char wide[6] = { 0x80, 1, 2, 3, 1, 0 }; - - for (i = 0; i < 16; i++) { - if (!wide_chip && (i > 7)) - break; - m = 1; - m = m << i; - if ((m & dev->active_id[c]) != 0) { - continue; - } - if (i == dev->host_id[c]) { - printk(KERN_INFO " ID: %2d Host Adapter\n", dev->host_id[c]); - continue; - } - atp_writeb_io(dev, c, 0x1b, wide_chip ? 0x01 : 0x00); - atp_writeb_io(dev, c, 1, 0x08); - atp_writeb_io(dev, c, 2, 0x7f); - atp_writeb_io(dev, c, 3, satn[0]); - atp_writeb_io(dev, c, 4, satn[1]); - atp_writeb_io(dev, c, 5, satn[2]); - atp_writeb_io(dev, c, 6, satn[3]); - atp_writeb_io(dev, c, 7, satn[4]); - atp_writeb_io(dev, c, 8, satn[5]); - atp_writeb_io(dev, c, 0x0f, 0); - atp_writeb_io(dev, c, 0x11, dev->id[c][i].devsp); - atp_writeb_io(dev, c, 0x12, 0); - atp_writeb_io(dev, c, 0x13, satn[6]); - atp_writeb_io(dev, c, 0x14, satn[7]); - j = i; - if ((j & 0x08) != 0) { - j = (j & 0x07) | 0x40; - } - atp_writeb_io(dev, c, 0x15, j); - atp_writeb_io(dev, c, 0x18, satn[8]); - - while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00) - cpu_relax(); - - if (atp_readb_io(dev, c, 0x17) != 0x11 && atp_readb_io(dev, c, 0x17) != 0x8e) - continue; - - while (atp_readb_io(dev, c, 0x17) != 0x8e) - cpu_relax(); - - dev->active_id[c] |= m; - - atp_writeb_io(dev, c, 0x10, 0x30); - atp_writeb_io(dev, c, 0x04, 0x00); - -phase_cmd: - atp_writeb_io(dev, c, 0x18, 0x08); - - while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00) - cpu_relax(); - - j = atp_readb_io(dev, c, 0x17); - if (j != 0x16) { - atp_writeb_io(dev, c, 0x10, 0x41); - goto phase_cmd; - } -sel_ok: - atp_writeb_io(dev, c, 3, inqd[0]); - atp_writeb_io(dev, c, 4, inqd[1]); - atp_writeb_io(dev, c, 5, inqd[2]); - atp_writeb_io(dev, c, 6, inqd[3]); - atp_writeb_io(dev, c, 7, inqd[4]); - atp_writeb_io(dev, c, 8, inqd[5]); - atp_writeb_io(dev, c, 0x0f, 0); - atp_writeb_io(dev, c, 0x11, dev->id[c][i].devsp); - atp_writeb_io(dev, c, 0x12, 0); - atp_writeb_io(dev, c, 0x13, inqd[6]); - atp_writeb_io(dev, c, 0x14, inqd[7]); - atp_writeb_io(dev, c, 0x18, inqd[8]); - - while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00) - cpu_relax(); - - if (atp_readb_io(dev, c, 0x17) != 0x11 && atp_readb_io(dev, c, 0x17) != 0x8e) - continue; - - while (atp_readb_io(dev, c, 0x17) != 0x8e) - cpu_relax(); - - if (wide_chip) - atp_writeb_io(dev, c, 0x1b, 0x00); - - atp_writeb_io(dev, c, 0x18, 0x08); - j = 0; -rd_inq_data: - k = atp_readb_io(dev, c, 0x1f); - if ((k & 0x01) != 0) { - mbuf[j++] = atp_readb_io(dev, c, 0x19); - goto rd_inq_data; - } - if ((k & 0x80) == 0) { - goto rd_inq_data; - } - j = atp_readb_io(dev, c, 0x17); - if (j == 0x16) { - goto inq_ok; - } - atp_writeb_io(dev, c, 0x10, 0x46); - atp_writeb_io(dev, c, 0x12, 0); - atp_writeb_io(dev, c, 0x13, 0); - atp_writeb_io(dev, c, 0x14, 0); - atp_writeb_io(dev, c, 0x18, 0x08); - - while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00) - cpu_relax(); - - if (atp_readb_io(dev, c, 0x17) != 0x16) - goto sel_ok; - -inq_ok: - mbuf[36] = 0; - printk(KERN_INFO " ID: %2d %s\n", i, &mbuf[8]); - dev->id[c][i].devtype = mbuf[0]; - rmb = mbuf[1]; - n = mbuf[7]; - if (!wide_chip) - goto not_wide; - if ((mbuf[7] & 0x60) == 0) { - goto not_wide; - } - if ((dev->global_map[c] & 0x20) == 0) { - goto not_wide; - } - atp_writeb_io(dev, c, 0x1b, 0x01); - atp_writeb_io(dev, c, 3, satn[0]); - atp_writeb_io(dev, c, 4, satn[1]); - atp_writeb_io(dev, c, 5, satn[2]); - atp_writeb_io(dev, c, 6, satn[3]); - atp_writeb_io(dev, c, 7, satn[4]); - atp_writeb_io(dev, c, 8, satn[5]); - atp_writeb_io(dev, c, 0x0f, 0); - atp_writeb_io(dev, c, 0x11, dev->id[c][i].devsp); - atp_writeb_io(dev, c, 0x12, 0); - atp_writeb_io(dev, c, 0x13, satn[6]); - atp_writeb_io(dev, c, 0x14, satn[7]); - atp_writeb_io(dev, c, 0x18, satn[8]); - - while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00) - cpu_relax(); - - if (atp_readb_io(dev, c, 0x17) != 0x11 && atp_readb_io(dev, c, 0x17) != 0x8e) - continue; - - while (atp_readb_io(dev, c, 0x17) != 0x8e) - cpu_relax(); - -try_wide: - j = 0; - atp_writeb_io(dev, c, 0x14, 0x05); - atp_writeb_io(dev, c, 0x18, 0x20); - - while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0) { - if ((atp_readb_io(dev, c, 0x1f) & 0x01) != 0) - atp_writeb_io(dev, c, 0x19, wide[j++]); - } - - while ((atp_readb_io(dev, c, 0x17) & 0x80) == 0x00) - cpu_relax(); - - j = atp_readb_io(dev, c, 0x17) & 0x0f; - if (j == 0x0f) { - goto widep_in; - } - if (j == 0x0a) { - goto widep_cmd; - } - if (j == 0x0e) { - goto try_wide; - } - continue; -widep_out: - atp_writeb_io(dev, c, 0x18, 0x20); - while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0) { - if ((atp_readb_io(dev, c, 0x1f) & 0x01) != 0) - atp_writeb_io(dev, c, 0x19, 0); - } - j = atp_readb_io(dev, c, 0x17) & 0x0f; - if (j == 0x0f) { - goto widep_in; - } - if (j == 0x0a) { - goto widep_cmd; - } - if (j == 0x0e) { - goto widep_out; - } - continue; -widep_in: - atp_writeb_io(dev, c, 0x14, 0xff); - atp_writeb_io(dev, c, 0x18, 0x20); - k = 0; -widep_in1: - j = atp_readb_io(dev, c, 0x1f); - if ((j & 0x01) != 0) { - mbuf[k++] = atp_readb_io(dev, c, 0x19); - goto widep_in1; - } - if ((j & 0x80) == 0x00) { - goto widep_in1; - } - j = atp_readb_io(dev, c, 0x17) & 0x0f; - if (j == 0x0f) { - goto widep_in; - } - if (j == 0x0a) { - goto widep_cmd; - } - if (j == 0x0e) { - goto widep_out; - } - continue; -widep_cmd: - atp_writeb_io(dev, c, 0x10, 0x30); - atp_writeb_io(dev, c, 0x14, 0x00); - atp_writeb_io(dev, c, 0x18, 0x08); - - while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00) - cpu_relax(); - - j = atp_readb_io(dev, c, 0x17); - if (j != 0x16) { - if (j == 0x4e) { - goto widep_out; - } - continue; - } - if (mbuf[0] != 0x01) { - goto not_wide; - } - if (mbuf[1] != 0x02) { - goto not_wide; - } - if (mbuf[2] != 0x03) { - goto not_wide; - } - if (mbuf[3] != 0x01) { - goto not_wide; - } - m = 1; - m = m << i; - dev->wide_id[c] |= m; -not_wide: - if ((dev->id[c][i].devtype == 0x00) || (dev->id[c][i].devtype == 0x07) || ((dev->id[c][i].devtype == 0x05) && ((n & 0x10) != 0))) { - goto set_sync; - } - continue; -set_sync: - j = 0; - if ((m & dev->wide_id[c]) != 0) { - j |= 0x01; - } - atp_writeb_io(dev, c, 0x1b, j); - atp_writeb_io(dev, c, 3, satn[0]); - atp_writeb_io(dev, c, 4, satn[1]); - atp_writeb_io(dev, c, 5, satn[2]); - atp_writeb_io(dev, c, 6, satn[3]); - atp_writeb_io(dev, c, 7, satn[4]); - atp_writeb_io(dev, c, 8, satn[5]); - atp_writeb_io(dev, c, 0x0f, 0); - atp_writeb_io(dev, c, 0x11, dev->id[c][i].devsp); - atp_writeb_io(dev, c, 0x12, 0); - atp_writeb_io(dev, c, 0x13, satn[6]); - atp_writeb_io(dev, c, 0x14, satn[7]); - atp_writeb_io(dev, c, 0x18, satn[8]); - - while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00) - cpu_relax(); - - if (atp_readb_io(dev, c, 0x17) != 0x11 && atp_readb_io(dev, c, 0x17) != 0x8e) - continue; - - while (atp_readb_io(dev, c, 0x17) != 0x8e) - cpu_relax(); - -try_sync: - j = 0; - atp_writeb_io(dev, c, 0x14, 0x06); - atp_writeb_io(dev, c, 0x18, 0x20); - - while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0) { - if ((atp_readb_io(dev, c, 0x1f) & 0x01) != 0) { - if ((m & dev->wide_id[c]) != 0) { - atp_writeb_io(dev, c, 0x19, synw[j++]); - } else { - if ((m & dev->ultra_map[c]) != 0) { - atp_writeb_io(dev, c, 0x19, synu[j++]); - } else { - atp_writeb_io(dev, c, 0x19, synn[j++]); - } - } - } - } - - while ((atp_readb_io(dev, c, 0x17) & 0x80) == 0x00) - cpu_relax(); - - j = atp_readb_io(dev, c, 0x17) & 0x0f; - if (j == 0x0f) { - goto phase_ins; - } - if (j == 0x0a) { - goto phase_cmds; - } - if (j == 0x0e) { - goto try_sync; - } - continue; -phase_outs: - atp_writeb_io(dev, c, 0x18, 0x20); - while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00) { - if ((atp_readb_io(dev, c, 0x1f) & 0x01) != 0x00) - atp_writeb_io(dev, c, 0x19, 0x00); - } - j = atp_readb_io(dev, c, 0x17); - if (j == 0x85) { - goto tar_dcons; - } - j &= 0x0f; - if (j == 0x0f) { - goto phase_ins; - } - if (j == 0x0a) { - goto phase_cmds; - } - if (j == 0x0e) { - goto phase_outs; - } - continue; -phase_ins: - atp_writeb_io(dev, c, 0x14, 0xff); - atp_writeb_io(dev, c, 0x18, 0x20); - k = 0; -phase_ins1: - j = atp_readb_io(dev, c, 0x1f); - if ((j & 0x01) != 0x00) { - mbuf[k++] = atp_readb_io(dev, c, 0x19); - goto phase_ins1; - } - if ((j & 0x80) == 0x00) { - goto phase_ins1; - } - - while ((atp_readb_io(dev, c, 0x17) & 0x80) == 0x00) - cpu_relax(); - - j = atp_readb_io(dev, c, 0x17); - if (j == 0x85) { - goto tar_dcons; - } - j &= 0x0f; - if (j == 0x0f) { - goto phase_ins; - } - if (j == 0x0a) { - goto phase_cmds; - } - if (j == 0x0e) { - goto phase_outs; - } - continue; -phase_cmds: - atp_writeb_io(dev, c, 0x10, 0x30); -tar_dcons: - atp_writeb_io(dev, c, 0x14, 0x00); - atp_writeb_io(dev, c, 0x18, 0x08); - - while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00) - cpu_relax(); - - j = atp_readb_io(dev, c, 0x17); - if (j != 0x16) { - continue; - } - if (mbuf[0] != 0x01) { - continue; - } - if (mbuf[1] != 0x03) { - continue; - } - if (mbuf[4] == 0x00) { - continue; - } - if (mbuf[3] > 0x64) { - continue; - } - if (mbuf[4] > 0x0c) { - mbuf[4] = 0x0c; - } - dev->id[c][i].devsp = mbuf[4]; - if ((mbuf[3] < 0x0d) && (rmb == 0)) { - j = 0xa0; - goto set_syn_ok; - } - if (mbuf[3] < 0x1a) { - j = 0x20; - goto set_syn_ok; - } - if (mbuf[3] < 0x33) { - j = 0x40; - goto set_syn_ok; - } - if (mbuf[3] < 0x4c) { - j = 0x50; - goto set_syn_ok; - } - j = 0x60; -set_syn_ok: - dev->id[c][i].devsp = (dev->id[c][i].devsp & 0x0f) | j; - } -} - static void atp870u_free_tables(struct Scsi_Host *host) { struct atp_unit *atp_dev = (struct atp_unit *)&host->hostdata; @@ -2030,7 +1605,7 @@ flash_ok_885: tscam(shpnt); atp_writeb_io(p, 0, 0x3a, atp_readb_io(p, 0, 0x3a) | 0x10); - is870(p, 0, p->chip_ver == 4); + is885(p, 0, p->chip_ver == 4, 0); atp_writeb_io(p, 0, 0x3a, atp_readb_io(p, 0, 0x3a) & 0xef); outb((inb(base_io + 0x3a) & 0xef), base_io + 0x3a); outb((inb(base_io + 0x3b) | 0x20), base_io + 0x3b);