1 files changed, 102 insertions, 6 deletions

diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index 038d49d0f2ab..e95acfac30b9 100644
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -59,11 +59,14 @@ enum {
         SATA_INT_GATE           = 0x41, /* SATA interrupt gating */
         SATA_NATIVE_MODE        = 0x42, /* Native mode enable */
         SATA_PATA_SHARING       = 0x49, /* PATA/SATA sharing func ctrl */
-
+        PATA_UDMA_TIMING        = 0xB3, /* PATA timing for DMA/ cable detect */
+        PATA_PIO_TIMING         = 0xAB, /* PATA timing register */
+        
         PORT0                   = (1 << 1),
         PORT1                   = (1 << 0),
         ALL_PORTS               = PORT0 | PORT1,
-        N_PORTS                 = 2,
+        PATA_PORT               = 2,    /* PATA is port 2 */
+        N_PORTS                 = 3,
 
         NATIVE_MODE_ALL         = (1 << 7) | (1 << 6) | (1 << 5) | (1 << 4),
 
@@ -76,6 +79,11 @@ static u32 svia_scr_read (struct ata_port *ap, unsigned int sc_reg);
 static void svia_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
 static void svia_noop_freeze(struct ata_port *ap);
 static void vt6420_error_handler(struct ata_port *ap);
+static void vt6421_sata_error_handler(struct ata_port *ap);
+static void vt6421_pata_error_handler(struct ata_port *ap);
+static void vt6421_set_pio_mode(struct ata_port *ap, struct ata_device *adev);
+static void vt6421_set_dma_mode(struct ata_port *ap, struct ata_device *adev);
+static int vt6421_port_start(struct ata_port *ap);
 
 static const struct pci_device_id svia_pci_tbl[] = {
         { PCI_VDEVICE(VIA, 0x5337), vt6420 },
@@ -142,9 +150,43 @@ static const struct ata_port_operations vt6420_sata_ops = {
         .host_stop              = ata_host_stop,
 };
 
-static const struct ata_port_operations vt6421_sata_ops = {
+static const struct ata_port_operations vt6421_pata_ops = {
         .port_disable           = ata_port_disable,
+        
+        .set_piomode            = vt6421_set_pio_mode,
+        .set_dmamode            = vt6421_set_dma_mode,
+
+        .tf_load                = ata_tf_load,
+        .tf_read                = ata_tf_read,
+        .check_status           = ata_check_status,
+        .exec_command           = ata_exec_command,
+        .dev_select             = ata_std_dev_select,
+
+        .bmdma_setup            = ata_bmdma_setup,
+        .bmdma_start            = ata_bmdma_start,
+        .bmdma_stop             = ata_bmdma_stop,
+        .bmdma_status           = ata_bmdma_status,
+
+        .qc_prep                = ata_qc_prep,
+        .qc_issue               = ata_qc_issue_prot,
+        .data_xfer              = ata_pio_data_xfer,
+
+        .freeze                 = ata_bmdma_freeze,
+        .thaw                   = ata_bmdma_thaw,
+        .error_handler          = vt6421_pata_error_handler,
+        .post_internal_cmd      = ata_bmdma_post_internal_cmd,
 
+        .irq_handler            = ata_interrupt,
+        .irq_clear              = ata_bmdma_irq_clear,
+
+        .port_start             = vt6421_port_start,
+        .port_stop              = ata_port_stop,
+        .host_stop              = ata_host_stop,
+};
+
+static const struct ata_port_operations vt6421_sata_ops = {
+        .port_disable           = ata_port_disable,
+        
         .tf_load                = ata_tf_load,
         .tf_read                = ata_tf_read,
         .check_status           = ata_check_status,
@@ -162,7 +204,7 @@ static const struct ata_port_operations vt6421_sata_ops = {
 
         .freeze                 = ata_bmdma_freeze,
         .thaw                   = ata_bmdma_thaw,
-        .error_handler          = ata_bmdma_error_handler,
+        .error_handler          = vt6421_sata_error_handler,
         .post_internal_cmd      = ata_bmdma_post_internal_cmd,
 
         .irq_handler            = ata_interrupt,
@@ -171,7 +213,7 @@ static const struct ata_port_operations vt6421_sata_ops = {
         .scr_read               = svia_scr_read,
         .scr_write              = svia_scr_write,
 
-        .port_start             = ata_port_start,
+        .port_start             = vt6421_port_start,
         .port_stop              = ata_port_stop,
         .host_stop              = ata_host_stop,
 };
@@ -289,6 +331,61 @@ static void vt6420_error_handler(struct ata_port *ap)
                                   NULL, ata_std_postreset);
 }
 
+static int vt6421_pata_prereset(struct ata_port *ap)
+{
+        struct pci_dev *pdev = to_pci_dev(ap->host->dev);
+        u8 tmp;
+
+        pci_read_config_byte(pdev, PATA_UDMA_TIMING, &tmp);
+        if (tmp & 0x10)
+                ap->cbl = ATA_CBL_PATA40;
+        else
+                ap->cbl = ATA_CBL_PATA80;
+        return 0;
+}
+
+static void vt6421_pata_error_handler(struct ata_port *ap)
+{
+        return ata_bmdma_drive_eh(ap, vt6421_pata_prereset, ata_std_softreset,
+                                  NULL, ata_std_postreset);
+}
+
+static int vt6421_sata_prereset(struct ata_port *ap)
+{
+        ap->cbl = ATA_CBL_SATA;
+        return 0;
+}
+
+static void vt6421_sata_error_handler(struct ata_port *ap)
+{
+        return ata_bmdma_drive_eh(ap, vt6421_sata_prereset, ata_std_softreset,
+                                  NULL, ata_std_postreset);
+}
+
+static void vt6421_set_pio_mode(struct ata_port *ap, struct ata_device *adev)
+{
+        struct pci_dev *pdev = to_pci_dev(ap->host->dev);
+        static const u8 pio_bits[] = { 0xA8, 0x65, 0x65, 0x31, 0x20 };
+        pci_write_config_byte(pdev, PATA_PIO_TIMING, pio_bits[adev->pio_mode - XFER_PIO_0]);
+}
+
+static void vt6421_set_dma_mode(struct ata_port *ap, struct ata_device *adev)
+{
+        struct pci_dev *pdev = to_pci_dev(ap->host->dev);
+        static const u8 udma_bits[] = { 0xEE, 0xE8, 0xE6, 0xE4, 0xE2, 0xE1, 0xE0, 0xE0 };
+        pci_write_config_byte(pdev, PATA_UDMA_TIMING, udma_bits[adev->pio_mode - XFER_UDMA_0]);
+}
+
+static int vt6421_port_start(struct ata_port *ap)
+{
+        if (ap->port_no == PATA_PORT) {
+                ap->ops = &vt6421_pata_ops;
+                ap->mwdma_mask = 0;
+                ap->flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_NO_LEGACY | ATA_FLAG_SRST;
+        }
+        return ata_port_start(ap);
+}
+
 static const unsigned int svia_bar_sizes[] = {
         8, 4, 8, 4, 16, 256
 };
@@ -511,4 +608,3 @@ static void __exit svia_exit(void)
 
 module_init(svia_init);
 module_exit(svia_exit);
-