aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2007-01-25 05:40:05 -0500
committerJeff Garzik <jeff@garzik.org>2007-01-25 17:26:01 -0500
commitb2a8bbe67d73631c71492fd60b757fc50a87f182 (patch)
treeb6a04a5ce8eee52a18fc690a9a1e1f7c1f93ded2 /drivers/ata
parent0291f95fdb5fcd91cc077aafabea2c5b109fa8a8 (diff)
libata: implement ATA_FLAG_IGN_SIMPLEX and use it in sata_uli
Some uli controllers have stuck SIMPLEX bit which can't be cleared with ata_pci_clear_simplex(), but the controller is capable of doing DMAs on both channels simultaneously. Implement ATA_FLAG_IGN_SIMPLEX which makes libata ignore the simplex bit and use it in sata_uli. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/libata-sff.c12
-rw-r--r--drivers/ata/sata_uli.c3
2 files changed, 10 insertions, 5 deletions
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 623cec914c9b..114fa81deb83 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -870,7 +870,8 @@ ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port, int
870 pci_resource_start(pdev, 1) | ATA_PCI_CTL_OFS; 870 pci_resource_start(pdev, 1) | ATA_PCI_CTL_OFS;
871 bmdma = pci_resource_start(pdev, 4); 871 bmdma = pci_resource_start(pdev, 4);
872 if (bmdma) { 872 if (bmdma) {
873 if (inb(bmdma + 2) & 0x80) 873 if ((!(port[p]->flags & ATA_FLAG_IGN_SIMPLEX)) &&
874 (inb(bmdma + 2) & 0x80))
874 probe_ent->_host_flags |= ATA_HOST_SIMPLEX; 875 probe_ent->_host_flags |= ATA_HOST_SIMPLEX;
875 probe_ent->port[p].bmdma_addr = bmdma; 876 probe_ent->port[p].bmdma_addr = bmdma;
876 } 877 }
@@ -886,7 +887,8 @@ ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port, int
886 bmdma = pci_resource_start(pdev, 4); 887 bmdma = pci_resource_start(pdev, 4);
887 if (bmdma) { 888 if (bmdma) {
888 bmdma += 8; 889 bmdma += 8;
889 if(inb(bmdma + 2) & 0x80) 890 if ((!(port[p]->flags & ATA_FLAG_IGN_SIMPLEX)) &&
891 (inb(bmdma + 2) & 0x80))
890 probe_ent->_host_flags |= ATA_HOST_SIMPLEX; 892 probe_ent->_host_flags |= ATA_HOST_SIMPLEX;
891 probe_ent->port[p].bmdma_addr = bmdma; 893 probe_ent->port[p].bmdma_addr = bmdma;
892 } 894 }
@@ -920,7 +922,8 @@ static struct ata_probe_ent *ata_pci_init_legacy_port(struct pci_dev *pdev,
920 probe_ent->port[0].ctl_addr = ATA_PRIMARY_CTL; 922 probe_ent->port[0].ctl_addr = ATA_PRIMARY_CTL;
921 if (bmdma) { 923 if (bmdma) {
922 probe_ent->port[0].bmdma_addr = bmdma; 924 probe_ent->port[0].bmdma_addr = bmdma;
923 if (inb(bmdma + 2) & 0x80) 925 if ((!(port[0]->flags & ATA_FLAG_IGN_SIMPLEX)) &&
926 (inb(bmdma + 2) & 0x80))
924 probe_ent->_host_flags |= ATA_HOST_SIMPLEX; 927 probe_ent->_host_flags |= ATA_HOST_SIMPLEX;
925 } 928 }
926 ata_std_ports(&probe_ent->port[0]); 929 ata_std_ports(&probe_ent->port[0]);
@@ -937,7 +940,8 @@ static struct ata_probe_ent *ata_pci_init_legacy_port(struct pci_dev *pdev,
937 probe_ent->port[1].ctl_addr = ATA_SECONDARY_CTL; 940 probe_ent->port[1].ctl_addr = ATA_SECONDARY_CTL;
938 if (bmdma) { 941 if (bmdma) {
939 probe_ent->port[1].bmdma_addr = bmdma + 8; 942 probe_ent->port[1].bmdma_addr = bmdma + 8;
940 if (inb(bmdma + 10) & 0x80) 943 if ((!(port[1]->flags & ATA_FLAG_IGN_SIMPLEX)) &&
944 (inb(bmdma + 10) & 0x80))
941 probe_ent->_host_flags |= ATA_HOST_SIMPLEX; 945 probe_ent->_host_flags |= ATA_HOST_SIMPLEX;
942 } 946 }
943 ata_std_ports(&probe_ent->port[1]); 947 ata_std_ports(&probe_ent->port[1]);
diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c
index 5c603ca3a50a..a43aec62d505 100644
--- a/drivers/ata/sata_uli.c
+++ b/drivers/ata/sata_uli.c
@@ -128,7 +128,8 @@ static const struct ata_port_operations uli_ops = {
128 128
129static struct ata_port_info uli_port_info = { 129static struct ata_port_info uli_port_info = {
130 .sht = &uli_sht, 130 .sht = &uli_sht,
131 .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, 131 .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
132 ATA_FLAG_IGN_SIMPLEX,
132 .pio_mask = 0x1f, /* pio0-4 */ 133 .pio_mask = 0x1f, /* pio0-4 */
133 .udma_mask = 0x7f, /* udma0-6 */ 134 .udma_mask = 0x7f, /* udma0-6 */
134 .port_ops = &uli_ops, 135 .port_ops = &uli_ops,