From: Tejun Heo <htejun@gmail.com>
To: jgarzik@pobox.com, alan@lxorguk.ukuu.org.uk, davej@redhat.com,
linux-ide@vger.kernel.org
Cc: Tejun Heo <htejun@gmail.com>
Subject: [PATCH 7/9] libata: use dummy port for stolen legacy ports
Date: Sat, 5 Aug 2006 06:01:33 +0900 [thread overview]
Message-ID: <11547252931805-git-send-email-htejun@gmail.com> (raw)
In-Reply-To: <11547252923301-git-send-email-htejun@gmail.com>
Use dummy port for stolen legacy ports. This makes ap->port_no always
equal ap->hard_port_no.
Signed-off-by: Tejun Heo <htejun@gmail.com>
---
drivers/scsi/libata-bmdma.c | 41 +++++++++++++++++------------------------
drivers/scsi/libata-core.c | 2 --
2 files changed, 17 insertions(+), 26 deletions(-)
521e56e4ce188a588e4457527734edddbcd8ebb1
diff --git a/drivers/scsi/libata-bmdma.c b/drivers/scsi/libata-bmdma.c
index d43dc9a..c4cd578 100644
--- a/drivers/scsi/libata-bmdma.c
+++ b/drivers/scsi/libata-bmdma.c
@@ -898,50 +898,43 @@ static struct ata_probe_ent *ata_pci_ini
struct ata_probe_ent *probe_ent;
unsigned long bmdma = pci_resource_start(pdev, 4);
- int port_num = 0;
-
probe_ent = ata_probe_ent_alloc(pci_dev_to_dev(pdev), port[0]);
if (!probe_ent)
return NULL;
- probe_ent->legacy_mode = 1;
- probe_ent->hard_port_no = 0;
+ probe_ent->n_ports = 2;
probe_ent->private_data = port[0]->private_data;
if (port_mask & ATA_PORT_PRIMARY) {
probe_ent->irq = 14;
- probe_ent->port[port_num].cmd_addr = ATA_PRIMARY_CMD;
- probe_ent->port[port_num].altstatus_addr =
- probe_ent->port[port_num].ctl_addr = ATA_PRIMARY_CTL;
+ probe_ent->port[0].cmd_addr = ATA_PRIMARY_CMD;
+ probe_ent->port[0].altstatus_addr =
+ probe_ent->port[0].ctl_addr = ATA_PRIMARY_CTL;
if (bmdma) {
probe_ent->port[0].bmdma_addr = bmdma;
if (inb(bmdma + 2) & 0x80)
probe_ent->host_set_flags |= ATA_HOST_SIMPLEX;
}
- ata_std_ports(&probe_ent->port[port_num]);
- port_num ++;
- }
+ ata_std_ports(&probe_ent->port[0]);
+ } else
+ probe_ent->dummy_port_mask |= ATA_PORT_PRIMARY;
+
if (port_mask & ATA_PORT_SECONDARY) {
- if (port_num == 1)
+ if (probe_ent->irq)
probe_ent->irq2 = 15;
- else {
- /* Secondary only. IRQ 15 only and "first" port is port 1 */
+ else
probe_ent->irq = 15;
- probe_ent->hard_port_no = 1;
- }
- probe_ent->port[port_num].cmd_addr = ATA_SECONDARY_CMD;
- probe_ent->port[port_num].altstatus_addr =
- probe_ent->port[port_num].ctl_addr = ATA_SECONDARY_CTL;
+ probe_ent->port[1].cmd_addr = ATA_SECONDARY_CMD;
+ probe_ent->port[1].altstatus_addr =
+ probe_ent->port[1].ctl_addr = ATA_SECONDARY_CTL;
if (bmdma) {
- probe_ent->port[port_num].bmdma_addr = bmdma + 8;
+ probe_ent->port[1].bmdma_addr = bmdma + 8;
if (inb(bmdma + 10) & 0x80)
probe_ent->host_set_flags |= ATA_HOST_SIMPLEX;
}
- ata_std_ports(&probe_ent->port[port_num]);
- port_num ++;
- }
-
- probe_ent->n_ports = port_num;
+ ata_std_ports(&probe_ent->port[1]);
+ } else
+ probe_ent->dummy_port_mask |= ATA_PORT_SECONDARY;
return probe_ent;
}
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 8818c84..453dce0 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -5245,8 +5245,6 @@ static void ata_port_init(struct ata_por
ap->dev = ent->dev;
ap->port_no = port_no;
ap->hard_port_no = port_no;
- if (ent->legacy_mode)
- ap->hard_port_no += ent->hard_port_no;
ap->pio_mask = ent->pio_mask;
ap->mwdma_mask = ent->mwdma_mask;
ap->udma_mask = ent->udma_mask;
--
1.3.2
next prev parent reply other threads:[~2006-08-04 21:01 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-04 21:01 [PATCHSET] libata: improve initialization and legacy handling, take#2 Tejun Heo
2006-08-04 21:01 ` [PATCH 1/9] [libata] some function renaming Tejun Heo
2006-08-09 4:24 ` Jeff Garzik
2006-08-09 4:25 ` Jeff Garzik
2006-08-04 21:01 ` [PATCH 3/9] libata: implement per-dev xfermask Tejun Heo
2006-08-05 13:38 ` Alan Cox
2006-08-06 14:41 ` Tejun Heo
2006-08-06 15:56 ` Alan Cox
2006-08-06 16:08 ` Tejun Heo
2006-08-09 4:30 ` Jeff Garzik
2006-08-04 21:01 ` Tejun Heo [this message]
2006-08-04 21:01 ` [PATCH 4/9] libata: rework legacy handling to remove much of the cruft Tejun Heo
2006-08-09 4:27 ` Jeff Garzik
2006-08-04 21:01 ` [PATCH 2/9] [libata] Kill 'count' var in ata_device_add() Tejun Heo
2006-08-04 21:01 ` [PATCH 6/9] libata: implement dummy port Tejun Heo
2006-08-04 21:01 ` [PATCH 5/9] libata: fix several bugs in reworked legacy handling Tejun Heo
2006-08-09 4:28 ` Jeff Garzik
2006-08-04 21:01 ` [PATCH 9/9] libata: kill unused hard_port_no and legacy_mode Tejun Heo
2006-08-09 4:29 ` Jeff Garzik
2006-08-04 21:01 ` [PATCH 8/9] libata: replace ap->hard_port_no with ap->port_no Tejun Heo
2006-08-04 21:05 ` [PATCHSET] libata: improve initialization and legacy handling, take#2 Dave Jones
2006-08-04 21:13 ` Tejun Heo
-- strict thread matches above, loose matches on Subject: below --
2006-08-10 8:16 [PATCHSET] libata: improve initialization and legacy handling, take#3 Tejun Heo
2006-08-10 8:16 ` [PATCH 7/9] libata: use dummy port for stolen legacy ports Tejun Heo
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=11547252931805-git-send-email-htejun@gmail.com \
--to=htejun@gmail.com \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=davej@redhat.com \
--cc=jgarzik@pobox.com \
--cc=linux-ide@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 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.