sata_sis: Support for PATA supports

This is quick rework of the patch Uwe proposed but using Kconfig not
ifdefs and user selection to sort out PATA support. Instead of ifdefs and
requiring the user to select both drivers the SATA driver selects the
PATA one.

For neatness I've also moved the extern into the function that uses it.

Signed-off-by: Alan Cox
Signed-off-by: Jeff Garzik <jeff@garzik.org>

3 files changed, 33 insertions, 12 deletions

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index ea102c089222..9e101aa638d1 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -116,11 +116,14 @@ config SATA_SIL24
           If unsure, say N.
 
 config SATA_SIS
-        tristate "SiS 964/180 SATA support"
+        tristate "SiS 964/965/966/180 SATA support"
         depends on PCI
+        select PATA_SIS
         help
-          This option enables support for SiS Serial ATA 964/180.
-
+          This option enables support for SiS Serial ATA on 
+          SiS 964/965/966/180 and Parallel ATA on SiS 180.
+          The PATA support for SiS 180 requires additionally to
+          enable the PATA_SIS driver in the config.
           If unsure, say N.
 
 config SATA_ULI
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index d9486fcd59f2..6746f3fb0876 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -796,6 +796,8 @@ static struct ata_port_info sis_info133_early = {
         .port_ops       = &sis_133_early_ops,
 };
 
+/* Privately shared with the SiS180 SATA driver, not for use elsewhere */
+EXPORT_SYMBOL_GPL(sis_info133);
 
 static void sis_fixup(struct pci_dev *pdev, struct sis_chipset *sis)
 {
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
index c90fb1319dfe..a915822ae63c 100644
--- a/drivers/ata/sata_sis.c
+++ b/drivers/ata/sata_sis.c
@@ -138,22 +138,25 @@ static struct ata_port_info sis_port_info = {
         .port_ops       = &sis_ops,
 };
 
-
 MODULE_AUTHOR("Uwe Koziolek");
 MODULE_DESCRIPTION("low-level driver for Silicon Integratad Systems SATA controller");
 MODULE_LICENSE("GPL");
 MODULE_DEVICE_TABLE(pci, sis_pci_tbl);
 MODULE_VERSION(DRV_VERSION);
 
-static unsigned int get_scr_cfg_addr(unsigned int port_no, unsigned int sc_reg, struct pci_dev *pdev)
+static unsigned int get_scr_cfg_addr(struct ata_port *ap, unsigned int sc_reg)
 {
+        struct pci_dev *pdev = to_pci_dev(ap->host->dev);
         unsigned int addr = SIS_SCR_BASE + (4 * sc_reg);
+        u8 pmr;
 
-        if (port_no)  {
+        if (ap->port_no)  {
                 switch (pdev->device) {
                         case 0x0180:
                         case 0x0181:
-                                addr += SIS180_SATA1_OFS;
+                                pci_read_config_byte(pdev, SIS_PMR, &pmr);
+                                if ((pmr & SIS_PMR_COMBINED) == 0)
+                                        addr += SIS180_SATA1_OFS;
                                 break;
 
                         case 0x0182:
@@ -170,7 +173,7 @@ static unsigned int get_scr_cfg_addr(unsigned int port_no, unsigned int sc_reg,
 static u32 sis_scr_cfg_read (struct ata_port *ap, unsigned int sc_reg)
 {
         struct pci_dev *pdev = to_pci_dev(ap->host->dev);
-        unsigned int cfg_addr = get_scr_cfg_addr(ap->port_no, sc_reg, pdev);
+        unsigned int cfg_addr = get_scr_cfg_addr(ap, sc_reg);
         u32 val, val2 = 0;
         u8 pmr;
 
@@ -188,13 +191,13 @@ static u32 sis_scr_cfg_read (struct ata_port *ap, unsigned int sc_reg)
         return (val|val2) &  0xfffffffb; /* avoid problems with powerdowned ports */
 }
 
-static void sis_scr_cfg_write (struct ata_port *ap, unsigned int scr, u32 val)
+static void sis_scr_cfg_write (struct ata_port *ap, unsigned int sc_reg, u32 val)
 {
         struct pci_dev *pdev = to_pci_dev(ap->host->dev);
-        unsigned int cfg_addr = get_scr_cfg_addr(ap->port_no, scr, pdev);
+        unsigned int cfg_addr = get_scr_cfg_addr(ap, sc_reg);
         u8 pmr;
 
-        if (scr == SCR_ERROR) /* doesn't exist in PCI cfg space */
+        if (sc_reg == SCR_ERROR) /* doesn't exist in PCI cfg space */
                 return;
 
         pci_read_config_byte(pdev, SIS_PMR, &pmr);
@@ -251,6 +254,9 @@ static void sis_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val)
 
 static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 {
+        /* Provided by the PATA driver */
+        extern struct ata_port_info sis_info133;
+
         static int printed_version;
         struct ata_probe_ent *probe_ent = NULL;
         int rc;
@@ -300,6 +306,17 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         switch (ent->device) {
         case 0x0180:
         case 0x0181:
+
+                /* The PATA-handling is provided by pata_sis */
+                switch (pmr & 0x30) {
+                case 0x10:
+                        ppi[1] = &sis_info133;
+                        break;
+                        
+                case 0x30:
+                        ppi[0] = &sis_info133;
+                        break;
+                }
                 if ((pmr & SIS_PMR_COMBINED) == 0) {
                         dev_printk(KERN_INFO, &pdev->dev,
                                    "Detected SiS 180/181/964 chipset in SATA mode\n");
@@ -379,4 +396,3 @@ static void __exit sis_exit(void)
 
 module_init(sis_init);
 module_exit(sis_exit);
-