From: Ondrej Zary <linux@rainbow-software.org>
To: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>, linux-scsi@vger.kernel.org
Subject: [PATCH 50/52] atp870u: Introduce atp880_init()
Date: Tue, 17 Nov 2015 19:24:26 +0100 [thread overview]
Message-ID: <1447784668-23713-51-git-send-email-linux@rainbow-software.org> (raw)
In-Reply-To: <1447784668-23713-1-git-send-email-linux@rainbow-software.org>
Move 880-specific init code to a separate function atp880_init()
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
---
drivers/scsi/atp870u.c | 174 ++++++++++++++++++++++++------------------------
1 file changed, 88 insertions(+), 86 deletions(-)
diff --git a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.c
index 3c66539..c1fd9fb 100644
--- a/drivers/scsi/atp870u.c
+++ b/drivers/scsi/atp870u.c
@@ -1249,6 +1249,91 @@ static void atp_set_host_id(struct atp_unit *atp, u8 c, u8 host_id)
atp_writeb_io(atp, c, 0x11, 0x20);
}
+static void atp880_init(struct Scsi_Host *shpnt)
+{
+ struct atp_unit *atpdev = shost_priv(shpnt);
+ struct pci_dev *pdev = atpdev->pdev;
+ unsigned char k, m, host_id;
+ unsigned int n;
+
+ pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 0x80);
+
+ atpdev->ioport[0] = shpnt->io_port + 0x40;
+ atpdev->pciport[0] = shpnt->io_port + 0x28;
+
+ host_id = atp_readb_base(atpdev, 0x39) >> 4;
+
+ dev_info(&pdev->dev, "ACARD AEC-67160 PCI Ultra3 LVD Host Adapter: IO:%lx, IRQ:%d.\n",
+ shpnt->io_port, shpnt->irq);
+ atpdev->host_id[0] = host_id;
+
+ atpdev->global_map[0] = atp_readb_base(atpdev, 0x35);
+ atpdev->ultra_map[0] = atp_readw_base(atpdev, 0x3c);
+
+ n = 0x3f09;
+ while (n < 0x4000) {
+ m = 0;
+ atp_writew_base(atpdev, 0x34, n);
+ n += 0x0002;
+ if (atp_readb_base(atpdev, 0x30) == 0xff)
+ break;
+
+ atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x30);
+ atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x31);
+ atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x32);
+ atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x33);
+ atp_writew_base(atpdev, 0x34, n);
+ n += 0x0002;
+ atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x30);
+ atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x31);
+ atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x32);
+ atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x33);
+ atp_writew_base(atpdev, 0x34, n);
+ n += 0x0002;
+ atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x30);
+ atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x31);
+ atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x32);
+ atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x33);
+ atp_writew_base(atpdev, 0x34, n);
+ n += 0x0002;
+ atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x30);
+ atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x31);
+ atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x32);
+ atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x33);
+ n += 0x0018;
+ }
+ atp_writew_base(atpdev, 0x34, 0);
+ atpdev->ultra_map[0] = 0;
+ atpdev->async[0] = 0;
+ for (k = 0; k < 16; k++) {
+ n = 1 << k;
+ if (atpdev->sp[0][k] > 1)
+ atpdev->ultra_map[0] |= n;
+ else
+ if (atpdev->sp[0][k] == 0)
+ atpdev->async[0] |= n;
+ }
+ atpdev->async[0] = ~(atpdev->async[0]);
+ atp_writeb_base(atpdev, 0x35, atpdev->global_map[0]);
+
+ k = atp_readb_base(atpdev, 0x38) & 0x80;
+ atp_writeb_base(atpdev, 0x38, k);
+ atp_writeb_base(atpdev, 0x3b, 0x20);
+ mdelay(32);
+ atp_writeb_base(atpdev, 0x3b, 0);
+ mdelay(32);
+ atp_readb_io(atpdev, 0, 0x1b);
+ atp_readb_io(atpdev, 0, 0x17);
+
+ atp_set_host_id(atpdev, 0, host_id);
+
+ tscam(shpnt, true, atp_readb_base(atpdev, 0x22));
+ atp_is(atpdev, 0, true, atp_readb_base(atpdev, 0x3f) & 0x40);
+ atp_writeb_base(atpdev, 0x38, 0xb0);
+ shpnt->max_id = 16;
+ shpnt->this_id = host_id;
+}
+
/* return non-zero on detection */
static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{
@@ -1304,92 +1389,9 @@ static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
goto unregister;
}
- if (is880(atpdev)) {
- pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 0x80);//JCC082803
-
- atpdev->ioport[0] = shpnt->io_port + 0x40;
- atpdev->pciport[0] = shpnt->io_port + 0x28;
-
- host_id = atp_readb_base(atpdev, 0x39);
- host_id >>= 0x04;
-
- printk(KERN_INFO " ACARD AEC-67160 PCI Ultra3 LVD Host Adapter:"
- " IO:%lx, IRQ:%d.\n", shpnt->io_port, shpnt->irq);
- atpdev->host_id[0] = host_id;
-
- atpdev->global_map[0] = atp_readb_base(atpdev, 0x35);
- atpdev->ultra_map[0] = atp_readw_base(atpdev, 0x3c);
-
- n = 0x3f09;
-next_fblk_880:
- if (n >= 0x4000)
- goto flash_ok_880;
-
- m = 0;
- atp_writew_base(atpdev, 0x34, n);
- n += 0x0002;
- if (atp_readb_base(atpdev, 0x30) == 0xff)
- goto flash_ok_880;
-
- atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x30);
- atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x31);
- atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x32);
- atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x33);
- atp_writew_base(atpdev, 0x34, n);
- n += 0x0002;
- atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x30);
- atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x31);
- atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x32);
- atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x33);
- atp_writew_base(atpdev, 0x34, n);
- n += 0x0002;
- atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x30);
- atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x31);
- atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x32);
- atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x33);
- atp_writew_base(atpdev, 0x34, n);
- n += 0x0002;
- atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x30);
- atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x31);
- atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x32);
- atpdev->sp[0][m++] = atp_readb_base(atpdev, 0x33);
- n += 0x0018;
- goto next_fblk_880;
-flash_ok_880:
- atp_writew_base(atpdev, 0x34, 0);
- atpdev->ultra_map[0] = 0;
- atpdev->async[0] = 0;
- for (k = 0; k < 16; k++) {
- n = 1;
- n = n << k;
- if (atpdev->sp[0][k] > 1) {
- atpdev->ultra_map[0] |= n;
- } else {
- if (atpdev->sp[0][k] == 0)
- atpdev->async[0] |= n;
- }
- }
- atpdev->async[0] = ~(atpdev->async[0]);
- atp_writeb_base(atpdev, 0x35, atpdev->global_map[0]);
-
-
- k = atp_readb_base(atpdev, 0x38) & 0x80;
- atp_writeb_base(atpdev, 0x38, k);
- atp_writeb_base(atpdev, 0x3b, 0x20);
- mdelay(32);
- atp_writeb_base(atpdev, 0x3b, 0);
- mdelay(32);
- atp_readb_io(atpdev, 0, 0x1b);
- atp_readb_io(atpdev, 0, 0x17);
-
- atp_set_host_id(atpdev, 0, host_id);
-
- tscam(shpnt, true, atp_readb_base(atpdev, 0x22));
- atp_is(atpdev, 0, true, atp_readb_base(atpdev, 0x3f) & 0x40);
- atp_writeb_base(atpdev, 0x38, 0xb0);
- shpnt->max_id = 16;
- shpnt->this_id = host_id;
- } else if (is885(atpdev)) {
+ if (is880(atpdev))
+ atp880_init(shpnt);
+ else if (is885(atpdev)) {
printk(KERN_INFO " ACARD AEC-67162 PCI Ultra3 LVD Host Adapter: IO:%lx, IRQ:%d.\n"
, shpnt->io_port, shpnt->irq);
--
Ondrej Zary
next prev parent reply other threads:[~2015-11-17 18:35 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-17 18:23 [PATCH 00/52] [resend] atp870u: Major rework Ondrej Zary
2015-11-17 18:23 ` [PATCH 01/52] atp870u: Remove workport Ondrej Zary
2015-11-17 18:23 ` [PATCH 02/52] atp870u: Remove tmport1 Ondrej Zary
2015-11-17 18:23 ` [PATCH 03/52] atp870u: Untangle tmport Ondrej Zary
2015-11-17 18:23 ` [PATCH 04/52] atp870u: Untangle tmport #2 Ondrej Zary
2015-11-17 18:23 ` [PATCH 05/52] atp870u: Untangle tmport #3 Ondrej Zary
2015-11-17 18:23 ` [PATCH 06/52] atp870u: Untangle tmport #4 Ondrej Zary
2015-11-17 18:23 ` [PATCH 07/52] atp870u: Untangle tmport #5 Ondrej Zary
2015-11-17 18:23 ` [PATCH 08/52] atp870u: Untangle tmport #6 Ondrej Zary
2015-11-17 18:23 ` [PATCH 09/52] atp870u: Untangle tmport #7 Ondrej Zary
2015-11-17 18:23 ` [PATCH 10/52] atp870u: Untangle tmport #8 Ondrej Zary
2015-11-17 18:23 ` [PATCH 11/52] atp870u: Untangle tmpcip Ondrej Zary
2015-11-17 18:23 ` [PATCH 12/52] atp870u: Untangle tmpcip #2 Ondrej Zary
2015-11-17 18:23 ` [PATCH 13/52] atp870u: Remove ugly gotos Ondrej Zary
2015-11-17 18:23 ` [PATCH 14/52] atp870u: Remove ugly gotos #2 Ondrej Zary
2015-11-17 18:23 ` [PATCH 15/52] atp870u: Remove ugly gotos #3 Ondrej Zary
2015-11-17 18:23 ` [PATCH 16/52] atp870u: Remove ugly gotos #4 Ondrej Zary
2015-11-17 18:23 ` [PATCH 17/52] atp870u: Remove ugly gotos #5 Ondrej Zary
2015-11-17 18:23 ` [PATCH 18/52] atp870u: Introduce HW access wrappers Ondrej Zary
2015-11-17 18:23 ` [PATCH 19/52] atp870u: Convert is870() to use wrappers Ondrej Zary
2015-11-17 18:23 ` [PATCH 20/52] atp870u: Convert is880() " Ondrej Zary
2015-11-17 18:23 ` [PATCH 21/52] atp870u: Convert is885() " Ondrej Zary
2015-11-17 18:23 ` [PATCH 22/52] atp870u: Unify code format in is870(), is880() and is885() Ondrej Zary
2015-11-17 18:23 ` [PATCH 23/52] atp870u: Add channel parameter to is870() and is880() Ondrej Zary
2015-11-17 18:24 ` [PATCH 24/52] atp870u: Move chip-specific lines out of is880() and is885() Ondrej Zary
2015-11-17 18:24 ` [PATCH 25/52] atp870u: Remove is880() Ondrej Zary
2015-11-17 18:24 ` [PATCH 26/52] atp870u: Add wide_chip parameter to is870() and is885() Ondrej Zary
2015-11-17 18:24 ` [PATCH 27/52] atp870u: Add remaining 870 support to is885() Ondrej Zary
2015-11-17 18:24 ` [PATCH 28/52] atp870u: Move 870-specific code out of is870() Ondrej Zary
2015-11-17 18:24 ` [PATCH 29/52] atp870u: Remove is870() Ondrej Zary
2015-11-17 18:24 ` [PATCH 30/52] atp870u: Rename is885() to atp_is() Ondrej Zary
2015-11-17 18:24 ` [PATCH 31/52] atp870u: Convert remaining in[bwl] and out[bwl] to wrappers Ondrej Zary
2015-11-17 18:24 ` [PATCH 32/52] atp870u: Replace port 0x80 delay by udelay Ondrej Zary
2015-11-17 18:24 ` [PATCH 33/52] atp870u: Fix incorrect writeb_io access to register 0x3a Ondrej Zary
2015-11-17 18:24 ` [PATCH 34/52] atp870u: Introduce atp_set_host_id Ondrej Zary
2015-11-17 18:24 ` [PATCH 35/52] atp870u: Reduce log spam on module load/unload Ondrej Zary
2015-11-17 18:24 ` [PATCH 36/52] atp870u: Remove empty tscam_885() Ondrej Zary
2015-11-17 18:24 ` [PATCH 37/52] atp870u: Use module_pci_driver Ondrej Zary
2015-11-17 18:24 ` [PATCH 38/52] atp870u: Use n_io_port in request_region and release_region Ondrej Zary
2015-11-17 18:24 ` [PATCH 39/52] atp870u: Remove useless and broken card counting Ondrej Zary
2015-11-17 18:24 ` [PATCH 40/52] atp870u: Remove unused irq from struct atp_unit Ondrej Zary
2015-11-17 18:24 ` [PATCH 41/52] atp870u: Improve _probe() Ondrej Zary
2015-11-17 18:24 ` [PATCH 42/52] atp870u: Improve unsupported chip detection Ondrej Zary
2015-11-17 18:24 ` [PATCH 43/52] atp870u: Remove chip_ver from struct atp_unit Ondrej Zary
2015-11-17 18:24 ` [PATCH 44/52] atp870u: Simplify _probe() Ondrej Zary
2015-11-17 18:24 ` [PATCH 45/52] atp870u: Introduce is880(), is885() and remove dev_id Ondrej Zary
2015-11-17 18:24 ` [PATCH 46/52] atp870u: Use pci_request_regions Ondrej Zary
2015-11-17 18:24 ` [PATCH 47/52] atp870u: Request IRQ later, remove weird locking Ondrej Zary
2015-11-17 18:24 ` [PATCH 48/52] atp870u: Remove scam_on from struct atp_unit Ondrej Zary
2015-11-17 18:24 ` [PATCH 49/52] atp870u: Initialize tables earlier Ondrej Zary
2015-11-17 18:24 ` Ondrej Zary [this message]
2015-11-17 18:24 ` [PATCH 51/52] atp870u: Introduce atp885_init() Ondrej Zary
2015-11-17 18:24 ` [PATCH 52/52] atp870u: Introduce atp870_init() Ondrej Zary
2015-11-19 17:10 ` [PATCH 00/52] [resend] atp870u: Major rework Martin K. Petersen
-- strict thread matches above, loose matches on Subject: below --
2015-07-26 20:24 [PATCH 00/52] " Ondrej Zary
2015-07-26 20:24 ` [PATCH 50/52] atp870u: Introduce atp880_init() Ondrej Zary
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1447784668-23713-51-git-send-email-linux@rainbow-software.org \
--to=linux@rainbow-software.org \
--cc=hch@lst.de \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.