libata: PATA-mode fixes for sis_sata

Changed PATA handler for PATA-ports used by sata_sis.
This patch was originally submitted by Jeff Garzik.

Added PCI-ID 1180 for SiS966 Controller in pata_sis.
The 1180 mode is fully compatible to other SiS PATA-controller.

The PCI-ID 1183 is SATA in PATA-emulation, but not fully compatible
to SiS5513/5518. sata_sis.c is forwarding this ID to pata_sis.
1183 is not working if simply added to pata_sis.
This handling fixes issues with SiS968.

Signed-off-by: Uwe Koziolek <uwe.koziolek@gmx.net>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

3 files changed, 64 insertions, 23 deletions

diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index ec3ae9375015..cfe4ec6eb3d5 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -560,6 +560,40 @@ static const struct ata_port_operations sis_133_ops = {
         .port_start             = ata_port_start,
 };
 
+static const struct ata_port_operations sis_133_for_sata_ops = {
+        .port_disable           = ata_port_disable,
+        .set_piomode            = sis_133_set_piomode,
+        .set_dmamode            = sis_133_set_dmamode,
+        .mode_filter            = ata_pci_default_filter,
+
+        .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,
+
+        .freeze                 = ata_bmdma_freeze,
+        .thaw                   = ata_bmdma_thaw,
+        .error_handler          = ata_bmdma_error_handler,
+        .post_internal_cmd      = ata_bmdma_post_internal_cmd,
+        .cable_detect           = sis_133_cable_detect,
+
+        .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_data_xfer,
+
+        .irq_handler            = ata_interrupt,
+        .irq_clear              = ata_bmdma_irq_clear,
+        .irq_on                 = ata_irq_on,
+        .irq_ack                = ata_irq_ack,
+
+        .port_start             = ata_port_start,
+};
+
 static const struct ata_port_operations sis_133_early_ops = {
         .port_disable           = ata_port_disable,
         .set_piomode            = sis_100_set_piomode,
@@ -733,13 +767,20 @@ static const struct ata_port_info sis_info100_early = {
         .pio_mask       = 0x1f, /* pio0-4 */
         .port_ops       = &sis_66_ops,
 };
-const struct ata_port_info sis_info133 = {
+static const struct ata_port_info sis_info133 = {
         .sht            = &sis_sht,
         .flags          = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
         .pio_mask       = 0x1f, /* pio0-4 */
         .udma_mask      = ATA_UDMA6,
         .port_ops       = &sis_133_ops,
 };
+const struct ata_port_info sis_info133_for_sata = {
+        .sht            = &sis_sht,
+        .flags          = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
+        .pio_mask       = 0x1f, /* pio0-4 */
+        .udma_mask      = ATA_UDMA6,
+        .port_ops       = &sis_133_for_sata_ops,
+};
 static const struct ata_port_info sis_info133_early = {
         .sht            = &sis_sht,
         .flags          = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
@@ -749,7 +790,7 @@ static const struct ata_port_info sis_info133_early = {
 };
 
 /* Privately shared with the SiS180 SATA driver, not for use elsewhere */
-EXPORT_SYMBOL_GPL(sis_info133);
+EXPORT_SYMBOL_GPL(sis_info133_for_sata);
 
 static void sis_fixup(struct pci_dev *pdev, struct sis_chipset *sis)
 {
@@ -975,6 +1016,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 static const struct pci_device_id sis_pci_tbl[] = {
         { PCI_VDEVICE(SI, 0x5513), },   /* SiS 5513 */
         { PCI_VDEVICE(SI, 0x5518), },   /* SiS 5518 */
+        { PCI_VDEVICE(SI, 0x1180), },   /* SiS 1180 */
 
         { }
 };
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
index 221099d1d08f..f111c984a359 100644
--- a/drivers/ata/sata_sis.c
+++ b/drivers/ata/sata_sis.c
@@ -72,8 +72,8 @@ static const struct pci_device_id sis_pci_tbl[] = {
         { PCI_VDEVICE(SI, 0x0181), sis_180 },           /* SiS 964/180 */
         { PCI_VDEVICE(SI, 0x0182), sis_180 },           /* SiS 965/965L */
         { PCI_VDEVICE(SI, 0x0183), sis_180 },           /* SiS 965/965L */
-        { PCI_VDEVICE(SI, 0x1182), sis_180 },           /* SiS 966/966L */
-        { PCI_VDEVICE(SI, 0x1183), sis_180 },           /* SiS 966/966L */
+        { PCI_VDEVICE(SI, 0x1182), sis_180 },           /* SiS 966/680 */
+        { PCI_VDEVICE(SI, 0x1183), sis_180 },           /* SiS 966/966L/968/680 */
 
         { }     /* terminate list */
 };
@@ -161,7 +161,6 @@ static unsigned int get_scr_cfg_addr(struct ata_port *ap, unsigned int sc_reg)
                         case 0x0182:
                         case 0x0183:
                         case 0x1182:
-                        case 0x1183:
                                 addr += SIS182_SATA1_OFS;
                                 break;
                 }
@@ -183,8 +182,8 @@ static u32 sis_scr_cfg_read (struct ata_port *ap, unsigned int sc_reg)
 
         pci_read_config_dword(pdev, cfg_addr, &val);
 
-        if ((pdev->device == 0x0182) || (pdev->device == 0x0183) || (pdev->device == 0x1182) ||
-            (pdev->device == 0x1183) || (pmr & SIS_PMR_COMBINED))
+        if ((pdev->device == 0x0182) || (pdev->device == 0x0183) ||
+            (pdev->device == 0x1182) || (pmr & SIS_PMR_COMBINED))
                 pci_read_config_dword(pdev, cfg_addr+0x10, &val2);
 
         return (val|val2) &  0xfffffffb; /* avoid problems with powerdowned ports */
@@ -203,8 +202,8 @@ static void sis_scr_cfg_write (struct ata_port *ap, unsigned int sc_reg, u32 val
 
         pci_write_config_dword(pdev, cfg_addr, val);
 
-        if ((pdev->device == 0x0182) || (pdev->device == 0x0183) || (pdev->device == 0x1182) ||
-            (pdev->device == 0x1183) || (pmr & SIS_PMR_COMBINED))
+        if ((pdev->device == 0x0182) || (pdev->device == 0x0183) ||
+            (pdev->device == 0x1182) || (pmr & SIS_PMR_COMBINED))
                 pci_write_config_dword(pdev, cfg_addr+0x10, val);
 }
 
@@ -224,8 +223,8 @@ static u32 sis_scr_read (struct ata_port *ap, unsigned int sc_reg)
 
         val = ioread32(ap->ioaddr.scr_addr + (sc_reg * 4));
 
-        if ((pdev->device == 0x0182) || (pdev->device == 0x0183) || (pdev->device == 0x1182) ||
-            (pdev->device == 0x1183) || (pmr & SIS_PMR_COMBINED))
+        if ((pdev->device == 0x0182) || (pdev->device == 0x0183) ||
+            (pdev->device == 0x1182) || (pmr & SIS_PMR_COMBINED))
                 val2 = ioread32(ap->ioaddr.scr_addr + (sc_reg * 4) + 0x10);
 
         return (val | val2) &  0xfffffffb;
@@ -245,8 +244,8 @@ static void sis_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val)
                 sis_scr_cfg_write(ap, sc_reg, val);
         else {
                 iowrite32(val, ap->ioaddr.scr_addr + (sc_reg * 4));
-                if ((pdev->device == 0x0182) || (pdev->device == 0x0183) || (pdev->device == 0x1182) ||
-                    (pdev->device == 0x1183) || (pmr & SIS_PMR_COMBINED))
+                if ((pdev->device == 0x0182) || (pdev->device == 0x0183) ||
+                    (pdev->device == 0x1182) || (pmr & SIS_PMR_COMBINED))
                         iowrite32(val, ap->ioaddr.scr_addr + (sc_reg * 4)+0x10);
         }
 }
@@ -293,11 +292,11 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                 /* The PATA-handling is provided by pata_sis */
                 switch (pmr & 0x30) {
                 case 0x10:
-                        ppi[1] = &sis_info133;
+                        ppi[1] = &sis_info133_for_sata;
                         break;
 
                 case 0x30:
-                        ppi[0] = &sis_info133;
+                        ppi[0] = &sis_info133_for_sata;
                         break;
                 }
                 if ((pmr & SIS_PMR_COMBINED) == 0) {
@@ -324,14 +323,14 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                 break;
 
         case 0x1182:
+                dev_printk(KERN_INFO, &pdev->dev, "Detected SiS 1182/966/680 SATA controller\n");
+                pi.flags |= ATA_FLAG_SLAVE_POSS;
+                break;
+
         case 0x1183:
-                pci_read_config_dword(pdev, 0x64, &val);
-                if (val & 0x10000000) {
-                        dev_printk(KERN_INFO, &pdev->dev, "Detected SiS 1182/1183/966L SATA controller\n");
-                } else {
-                        dev_printk(KERN_INFO, &pdev->dev, "Detected SiS 1182/1183/966 SATA controller\n");
-                        pi.flags |= ATA_FLAG_SLAVE_POSS;
-                }
+                dev_printk(KERN_INFO, &pdev->dev, "Detected SiS 1183/966/966L/968/680 controller in PATA mode\n");
+                ppi[0] = &sis_info133_for_sata;
+                ppi[1] = &sis_info133_for_sata;
                 break;
         }
 
diff --git a/drivers/ata/sis.h b/drivers/ata/sis.h
index 0f2208d8d5ef..f7f3eebe666c 100644
--- a/drivers/ata/sis.h
+++ b/drivers/ata/sis.h
@@ -2,4 +2,4 @@
 struct ata_port_info;
 
 /* pata_sis.c */
-extern const struct ata_port_info sis_info133;
+extern const struct ata_port_info sis_info133_for_sata;