Commit be456b77 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Jeff Garzik

pata_artop: fix UDMA5 for AEC6280[R] and UDMA6 for AEC6880[R]

Maximum supported UDMA mode for AEC6280[R] is UDMA5 (not UDMA4)
and for AEC6880[R] it is UDMA6 (not UDMA5):

* Fix the problem by adding missing struct ata_port_info to artop_init_one().

* Use the right naming (s/626/628/).

* Bump driver version.

Fixes IDE->libata regression, problem was never present in IDE aec62xx driver.

Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent ac2b0437
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
* pata_artop.c - ARTOP ATA controller driver * pata_artop.c - ARTOP ATA controller driver
* *
* (C) 2006 Red Hat <alan@redhat.com> * (C) 2006 Red Hat <alan@redhat.com>
* (C) 2007 Bartlomiej Zolnierkiewicz
* *
* Based in part on drivers/ide/pci/aec62xx.c * Based in part on drivers/ide/pci/aec62xx.c
* Copyright (C) 1999-2002 Andre Hedrick <andre@linux-ide.org> * Copyright (C) 1999-2002 Andre Hedrick <andre@linux-ide.org>
...@@ -28,7 +29,7 @@ ...@@ -28,7 +29,7 @@
#include <linux/ata.h> #include <linux/ata.h>
#define DRV_NAME "pata_artop" #define DRV_NAME "pata_artop"
#define DRV_VERSION "0.4.3" #define DRV_VERSION "0.4.4"
/* /*
* The ARTOP has 33 Mhz and "over clocked" timing tables. Until we * The ARTOP has 33 Mhz and "over clocked" timing tables. Until we
...@@ -430,7 +431,7 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -430,7 +431,7 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id)
.udma_mask = ATA_UDMA4, .udma_mask = ATA_UDMA4,
.port_ops = &artop6260_ops, .port_ops = &artop6260_ops,
}; };
static const struct ata_port_info info_626x_fast = { static const struct ata_port_info info_628x = {
.sht = &artop_sht, .sht = &artop_sht,
.flags = ATA_FLAG_SLAVE_POSS, .flags = ATA_FLAG_SLAVE_POSS,
.pio_mask = 0x1f, /* pio0-4 */ .pio_mask = 0x1f, /* pio0-4 */
...@@ -438,6 +439,14 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -438,6 +439,14 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id)
.udma_mask = ATA_UDMA5, .udma_mask = ATA_UDMA5,
.port_ops = &artop6260_ops, .port_ops = &artop6260_ops,
}; };
static const struct ata_port_info info_628x_fast = {
.sht = &artop_sht,
.flags = ATA_FLAG_SLAVE_POSS,
.pio_mask = 0x1f, /* pio0-4 */
.mwdma_mask = 0x07, /* mwdma0-2 */
.udma_mask = ATA_UDMA6,
.port_ops = &artop6260_ops,
};
const struct ata_port_info *ppi[] = { NULL, NULL }; const struct ata_port_info *ppi[] = { NULL, NULL };
if (!printed_version++) if (!printed_version++)
...@@ -455,13 +464,13 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -455,13 +464,13 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id)
} }
else if (id->driver_data == 1) /* 6260 */ else if (id->driver_data == 1) /* 6260 */
ppi[0] = &info_626x; ppi[0] = &info_626x;
else if (id->driver_data == 2) { /* 6260 or 6260 + fast */ else if (id->driver_data == 2) { /* 6280 or 6280 + fast */
unsigned long io = pci_resource_start(pdev, 4); unsigned long io = pci_resource_start(pdev, 4);
u8 reg; u8 reg;
ppi[0] = &info_626x; ppi[0] = &info_628x;
if (inb(io) & 0x10) if (inb(io) & 0x10)
ppi[0] = &info_626x_fast; ppi[0] = &info_628x_fast;
/* Mac systems come up with some registers not set as we /* Mac systems come up with some registers not set as we
will need them */ will need them */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment