[PATCH] sata_sis: slave support on SiS965

SiS965 and SiS180 chips must support slave mode,
SiS965L and SiS964 chips must not support slave mode.

SCR_STATUS for SATA ports in powerdown state fixed.
Now returning 0x0113 instead of 0x0117. Avoids problem
on detecting sata_sis controller.

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

diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
index 9d1235ba06b1fc8a3a9e3bc3bca3f92533ef2f55..9c25a1e91730c19578c624a01e953c617c24e808 100644 (file)
--- a/drivers/ata/sata_sis.c
+++ b/drivers/ata/sata_sis.c
@@ -173,7 +173,7 @@ static u32 sis_scr_cfg_read (struct ata_port *ap, unsigned int sc_reg)
        if ((pdev->device == 0x182) || (pmr & SIS_PMR_COMBINED))
                pci_read_config_dword(pdev, cfg_addr+0x10, &val2);
 
-       return val|val2;
+       return (val|val2) &  0xfffffffb; /* avoid problems with powerdowned ports */
 }
 
 static void sis_scr_cfg_write (struct ata_port *ap, unsigned int scr, u32 val)
@@ -212,7 +212,7 @@ static u32 sis_scr_read (struct ata_port *ap, unsigned int sc_reg)
        if ((pdev->device == 0x182) || (pmr & SIS_PMR_COMBINED))
                val2 = inl(ap->ioaddr.scr_addr + (sc_reg * 4) + 0x10);
 
-       return val | val2;
+       return (val | val2) &  0xfffffffb;
 }
 
 static void sis_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val)
@@ -239,7 +239,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
        static int printed_version;
        struct ata_probe_ent *probe_ent = NULL;
        int rc;
-       u32 genctl;
+       u32 genctl, val;
        struct ata_port_info pi = sis_port_info, *ppi[2] = { &pi, &pi };
        int pci_dev_busy = 0;
        u8 pmr;
@@ -285,17 +285,24 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
        if (ent->device != 0x182) {
                if ((pmr & SIS_PMR_COMBINED) == 0) {
                        dev_printk(KERN_INFO, &pdev->dev,
-                                  "Detected SiS 180/181 chipset in SATA mode\n");
+                                  "Detected SiS 180/181/964 chipset in SATA mode\n");
                        port2_start = 64;
                }
                else {
                        dev_printk(KERN_INFO, &pdev->dev,
                                   "Detected SiS 180/181 chipset in combined mode\n");
                        port2_start=0;
+                       pi.flags |= ATA_FLAG_SLAVE_POSS;
                }
        }
        else {
-               dev_printk(KERN_INFO, &pdev->dev, "Detected SiS 182 chipset\n");
+               pci_read_config_dword ( pdev, 0x6C, &val);
+               if (val & (1L << 31)) {
+                       dev_printk(KERN_INFO, &pdev->dev, "Detected SiS 182/965 chipset\n");
+                       pi.flags |= ATA_FLAG_SLAVE_POSS;
+               }
+               else
+                       dev_printk(KERN_INFO, &pdev->dev, "Detected SiS 182/965L chipset\n");
                port2_start = 0x20;
        }