[PATCH] SATA: fix and enable sata-sil

sata_sil:  it's a widely deployed chipset.  Now that we've fixed it, let
users use it.

sata_via:  Disk detection via SATA phy registers appear problematic.
Until that problem is identified and fixed, used the old PATA detection
code -- that was used in 2.6.4 -- instead.

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 9bb7e738504a9b5f284e9ac8793675478444014a..1d5b589f1d98ad85a3e63f5f680c1690cade464c 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -443,7 +443,7 @@ config SCSI_SATA_PROMISE
 
 config SCSI_SATA_SIL
        tristate "Silicon Image SATA support"
-       depends on SCSI_SATA && PCI && BROKEN
+       depends on SCSI_SATA && PCI && EXPERIMENTAL
        help
          This option enables support for Silicon Image Serial ATA.
 

diff --git a/drivers/scsi/sata_via.c b/drivers/scsi/sata_via.c
index 770f5a825f2f180d10928bc0369590eeb428bc01..819290973c8ae112cb65c60f970b47549b3ad413 100644 (file)
--- a/drivers/scsi/sata_via.c
+++ b/drivers/scsi/sata_via.c
@@ -205,7 +205,7 @@ static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
        INIT_LIST_HEAD(&probe_ent->node);
        probe_ent->pdev = pdev;
        probe_ent->sht = &svia_sht;
-       probe_ent->host_flags = ATA_FLAG_SATA | ATA_FLAG_SATA_RESET |
+       probe_ent->host_flags = ATA_FLAG_SATA | ATA_FLAG_SRST |
                                ATA_FLAG_NO_LEGACY;
        probe_ent->port_ops = &svia_sata_ops;
        probe_ent->n_ports = 2;