From: Ondrej Zary <linux@rainbow-software.org>
To: linux-scsi@vger.kernel.org
Subject: [PATCH 52/52] atp870u: Introduce atp870_init()
Date: Sun, 26 Jul 2015 22:24:59 +0200 [thread overview]
Message-ID: <1437942299-26674-53-git-send-email-linux@rainbow-software.org> (raw)
In-Reply-To: <1437942299-26674-1-git-send-email-linux@rainbow-software.org>
Move 870-specific init code to a separate function atp870_init()
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
---
drivers/scsi/atp870u.c | 104 +++++++++++++++++++++++++-----------------------
1 file changed, 54 insertions(+), 50 deletions(-)
diff --git a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.c
index 584b90f..8b52a9d 100644
--- a/drivers/scsi/atp870u.c
+++ b/drivers/scsi/atp870u.c
@@ -1249,6 +1249,57 @@ static void atp_set_host_id(struct atp_unit *atp, u8 c, u8 host_id)
atp_writeb_io(atp, c, 0x11, 0x20);
}
+static void atp870_init(struct Scsi_Host *shpnt)
+{
+ struct atp_unit *atpdev = shost_priv(shpnt);
+ struct pci_dev *pdev = atpdev->pdev;
+ unsigned char k, host_id;
+ u8 scam_on;
+ bool wide_chip =
+ (pdev->device == PCI_DEVICE_ID_ARTOP_AEC7610 &&
+ pdev->revision == 4) ||
+ (pdev->device == PCI_DEVICE_ID_ARTOP_AEC7612UW) ||
+ (pdev->device == PCI_DEVICE_ID_ARTOP_AEC7612SUW);
+
+ pci_read_config_byte(pdev, 0x49, &host_id);
+
+ dev_info(&pdev->dev, "ACARD AEC-671X PCI Ultra/W SCSI-2/3 Host Adapter: IO:%lx, IRQ:%d.\n",
+ shpnt->io_port, shpnt->irq);
+
+ atpdev->ioport[0] = shpnt->io_port;
+ atpdev->pciport[0] = shpnt->io_port + 0x20;
+ host_id &= 0x07;
+ atpdev->host_id[0] = host_id;
+ scam_on = atp_readb_pci(atpdev, 0, 2);
+ atpdev->global_map[0] = atp_readb_base(atpdev, 0x2d);
+ atpdev->ultra_map[0] = atp_readw_base(atpdev, 0x2e);
+
+ if (atpdev->ultra_map[0] == 0) {
+ scam_on = 0x00;
+ atpdev->global_map[0] = 0x20;
+ atpdev->ultra_map[0] = 0xffff;
+ }
+
+ if (pdev->revision > 0x07) /* check if atp876 chip */
+ atp_writeb_base(atpdev, 0x3e, 0x00); /* enable terminator */
+
+ k = (atp_readb_base(atpdev, 0x3a) & 0xf3) | 0x10;
+ atp_writeb_base(atpdev, 0x3a, k);
+ atp_writeb_base(atpdev, 0x3a, k & 0xdf);
+ mdelay(32);
+ atp_writeb_base(atpdev, 0x3a, k);
+ mdelay(32);
+ atp_set_host_id(atpdev, 0, host_id);
+
+ tscam(shpnt, wide_chip, scam_on);
+ atp_writeb_base(atpdev, 0x3a, atp_readb_base(atpdev, 0x3a) | 0x10);
+ atp_is(atpdev, 0, wide_chip, 0);
+ atp_writeb_base(atpdev, 0x3a, atp_readb_base(atpdev, 0x3a) & 0xef);
+ atp_writeb_base(atpdev, 0x3b, atp_readb_base(atpdev, 0x3b) | 0x20);
+ shpnt->max_id = wide_chip ? 16 : 8;
+ shpnt->this_id = host_id;
+}
+
static void atp880_init(struct Scsi_Host *shpnt)
{
struct atp_unit *atpdev = shost_priv(shpnt);
@@ -1445,9 +1496,6 @@ static void atp885_init(struct Scsi_Host *shpnt)
/* return non-zero on detection */
static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{
- unsigned char k;
- unsigned int error;
- unsigned char host_id;
struct Scsi_Host *shpnt = NULL;
struct atp_unit *atpdev;
int err;
@@ -1500,53 +1548,9 @@ static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
atp880_init(shpnt);
else if (is885(atpdev))
atp885_init(shpnt);
- else {
- u8 scam_on;
- bool wide_chip =
- (ent->device == PCI_DEVICE_ID_ARTOP_AEC7610 &&
- pdev->revision == 4) ||
- (ent->device == PCI_DEVICE_ID_ARTOP_AEC7612UW) ||
- (ent->device == PCI_DEVICE_ID_ARTOP_AEC7612SUW);
- error = pci_read_config_byte(pdev, 0x49, &host_id);
-
- printk(KERN_INFO " ACARD AEC-671X PCI Ultra/W SCSI-2/3 Host Adapter: "
- "IO:%lx, IRQ:%d.\n", shpnt->io_port, shpnt->irq);
-
- atpdev->ioport[0] = shpnt->io_port;
- atpdev->pciport[0] = shpnt->io_port + 0x20;
- host_id &= 0x07;
- atpdev->host_id[0] = host_id;
- scam_on = atp_readb_pci(atpdev, 0, 2);
- atpdev->global_map[0] = atp_readb_base(atpdev, 0x2d);
- atpdev->ultra_map[0] = atp_readw_base(atpdev, 0x2e);
-
- if (atpdev->ultra_map[0] == 0) {
- scam_on = 0x00;
- atpdev->global_map[0] = 0x20;
- atpdev->ultra_map[0] = 0xffff;
- }
-
- if (pdev->revision > 0x07) /* check if atp876 chip then enable terminator */
- atp_writeb_base(atpdev, 0x3e, 0x00);
-
- k = (atp_readb_base(atpdev, 0x3a) & 0xf3) | 0x10;
- atp_writeb_base(atpdev, 0x3a, k);
- atp_writeb_base(atpdev, 0x3a, k & 0xdf);
- mdelay(32);
- atp_writeb_base(atpdev, 0x3a, k);
- mdelay(32);
- atp_set_host_id(atpdev, 0, host_id);
-
-
- tscam(shpnt, wide_chip, scam_on);
- atp_writeb_base(atpdev, 0x3a, atp_readb_base(atpdev, 0x3a) | 0x10);
- atp_is(atpdev, 0, wide_chip, 0);
- atp_writeb_base(atpdev, 0x3a, atp_readb_base(atpdev, 0x3a) & 0xef);
- atp_writeb_base(atpdev, 0x3b, atp_readb_base(atpdev, 0x3b) | 0x20);
- shpnt->max_id = wide_chip ? 16 : 8;
- shpnt->this_id = host_id;
-
- }
+ else
+ atp870_init(shpnt);
+
err = request_irq(shpnt->irq, atp870u_intr_handle, IRQF_SHARED, "atp870u", shpnt);
if (err) {
dev_err(&pdev->dev, "Unable to allocate IRQ %d.\n", shpnt->irq);
--
Ondrej Zary
next prev parent reply other threads:[~2015-07-26 20:55 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-26 20:24 [PATCH 00/52] atp870u: Major rework Ondrej Zary
2015-07-26 20:24 ` [PATCH 01/52] atp870u: Remove workport Ondrej Zary
2015-07-26 20:24 ` [PATCH 02/52] atp870u: Remove tmport1 Ondrej Zary
2015-07-26 20:24 ` [PATCH 03/52] atp870u: Untangle tmport Ondrej Zary
2015-07-26 20:24 ` [PATCH 04/52] atp870u: Untangle tmport #2 Ondrej Zary
2015-07-26 20:24 ` [PATCH 05/52] atp870u: Untangle tmport #3 Ondrej Zary
2015-07-26 20:24 ` [PATCH 06/52] atp870u: Untangle tmport #4 Ondrej Zary
2015-07-26 20:24 ` [PATCH 07/52] atp870u: Untangle tmport #5 Ondrej Zary
2015-07-26 20:24 ` [PATCH 08/52] atp870u: Untangle tmport #6 Ondrej Zary
2015-07-26 20:24 ` [PATCH 09/52] atp870u: Untangle tmport #7 Ondrej Zary
2015-07-26 20:24 ` [PATCH 10/52] atp870u: Untangle tmport #8 Ondrej Zary
2015-07-26 20:24 ` [PATCH 11/52] atp870u: Untangle tmpcip Ondrej Zary
2015-07-26 20:24 ` [PATCH 12/52] atp870u: Untangle tmpcip #2 Ondrej Zary
2015-07-26 20:24 ` [PATCH 13/52] atp870u: Remove ugly gotos Ondrej Zary
2015-07-26 20:24 ` [PATCH 14/52] atp870u: Remove ugly gotos #2 Ondrej Zary
2015-07-26 20:24 ` [PATCH 15/52] atp870u: Remove ugly gotos #3 Ondrej Zary
2015-07-26 20:24 ` [PATCH 16/52] atp870u: Remove ugly gotos #4 Ondrej Zary
2015-07-26 20:24 ` [PATCH 17/52] atp870u: Remove ugly gotos #5 Ondrej Zary
2015-07-26 20:24 ` [PATCH 18/52] atp870u: Introduce HW access wrappers Ondrej Zary
2015-07-26 20:24 ` [PATCH 19/52] atp870u: Convert is870() to use wrappers Ondrej Zary
2015-07-26 20:24 ` [PATCH 20/52] atp870u: Convert is880() " Ondrej Zary
2015-07-26 20:24 ` [PATCH 21/52] atp870u: Convert is885() " Ondrej Zary
2015-07-26 20:24 ` [PATCH 22/52] atp870u: Unify code format in is870(), is880() and is885() Ondrej Zary
2015-07-26 20:24 ` [PATCH 23/52] atp870u: Add channel parameter to is870() and is880() Ondrej Zary
2015-07-26 20:24 ` [PATCH 24/52] atp870u: Move chip-specific lines out of is880() and is885() Ondrej Zary
2015-07-26 20:24 ` [PATCH 25/52] atp870u: Remove is880() Ondrej Zary
2015-07-26 20:24 ` [PATCH 26/52] atp870u: Add wide_chip parameter to is870() and is885() Ondrej Zary
2015-07-26 20:24 ` [PATCH 27/52] atp870u: Add remaining 870 support to is885() Ondrej Zary
2015-07-26 20:24 ` [PATCH 28/52] atp870u: Move 870-specific code out of is870() Ondrej Zary
2015-07-26 20:24 ` [PATCH 29/52] atp870u: Remove is870() Ondrej Zary
2015-07-26 20:24 ` [PATCH 30/52] atp870u: Rename is885() to atp_is() Ondrej Zary
2015-07-26 20:24 ` [PATCH 31/52] atp870u: Convert remaining in[bwl] and out[bwl] to wrappers Ondrej Zary
2015-07-26 20:24 ` [PATCH 32/52] atp870u: Replace port 0x80 delay by udelay Ondrej Zary
2015-07-26 20:24 ` [PATCH 33/52] atp870u: Fix incorrect writeb_io access to register 0x3a Ondrej Zary
2015-07-26 20:24 ` [PATCH 34/52] atp870u: Introduce atp_set_host_id Ondrej Zary
2015-07-26 20:24 ` [PATCH 35/52] atp870u: Reduce log spam on module load/unload Ondrej Zary
2015-07-26 20:24 ` [PATCH 36/52] atp870u: Remove empty tscam_885() Ondrej Zary
2015-07-26 20:24 ` [PATCH 37/52] atp870u: Use module_pci_driver Ondrej Zary
2015-07-26 20:24 ` [PATCH 38/52] atp870u: Use n_io_port in request_region and release_region Ondrej Zary
2015-07-26 20:24 ` [PATCH 39/52] atp870u: Remove useless and broken card counting Ondrej Zary
2015-07-26 20:24 ` [PATCH 40/52] atp870u: Remove unused irq from struct atp_unit Ondrej Zary
2015-07-26 20:24 ` [PATCH 41/52] atp870u: Improve _probe() Ondrej Zary
2015-07-26 20:24 ` [PATCH 42/52] atp870u: Improve unsupported chip detection Ondrej Zary
2015-07-26 20:24 ` [PATCH 43/52] atp870u: Remove chip_ver from struct atp_unit Ondrej Zary
2015-07-26 20:24 ` [PATCH 44/52] atp870u: Simplify _probe() Ondrej Zary
2015-07-26 20:24 ` [PATCH 45/52] atp870u: Introduce is880(), is885() and remove dev_id Ondrej Zary
2015-07-26 20:24 ` [PATCH 46/52] atp870u: Use pci_request_regions Ondrej Zary
2015-07-26 20:24 ` [PATCH 47/52] atp870u: Request IRQ later, remove weird locking Ondrej Zary
2015-07-26 20:24 ` [PATCH 48/52] atp870u: Remove scam_on from struct atp_unit Ondrej Zary
2015-07-26 20:24 ` [PATCH 49/52] atp870u: Initialize tables earlier Ondrej Zary
2015-07-26 20:24 ` [PATCH 50/52] atp870u: Introduce atp880_init() Ondrej Zary
2015-07-26 20:24 ` [PATCH 51/52] atp870u: Introduce atp885_init() Ondrej Zary
2015-07-26 20:24 ` Ondrej Zary [this message]
2015-07-27 8:56 ` [PATCH 00/52] atp870u: Major rework Hannes Reinecke
2015-10-04 7:57 ` Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2015-11-17 18:23 [PATCH 00/52] [resend] " Ondrej Zary
2015-11-17 18:24 ` [PATCH 52/52] atp870u: Introduce atp870_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=1437942299-26674-53-git-send-email-linux@rainbow-software.org \
--to=linux@rainbow-software.org \
--cc=linux-scsi@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).