VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / scsi / ata_piix.c

diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
index a6588b0..c030c0a 100644 (file)
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@ -57,6 +57,7 @@ enum {
        ich5_pata               = 0,
        ich5_sata               = 1,
        piix4_pata              = 2,
+       ich6_sata               = 3,
 };
 
 static int piix_init_one (struct pci_dev *pdev,
@@ -91,10 +92,8 @@ static struct pci_device_id piix_pci_tbl[] = {
         * and enhanced mode, with queueing and other fancy stuff.
         * This is distinguished by PCI class code.
         */
-       { 0x8086, 0x2651, PCI_ANY_ID, PCI_ANY_ID,
-         PCI_CLASS_STORAGE_IDE << 8, 0xffff00, ich5_sata },
-       { 0x8086, 0x2652, PCI_ANY_ID, PCI_ANY_ID,
-         PCI_CLASS_STORAGE_IDE << 8, 0xffff00, ich5_sata },
+       { 0x8086, 0x2651, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata },
+       { 0x8086, 0x2652, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata },
 
        { }     /* terminate list */
 };
@@ -138,10 +137,13 @@ static struct ata_port_operations piix_pata_ops = {
 
        .bmdma_setup            = ata_bmdma_setup_pio,
        .bmdma_start            = ata_bmdma_start_pio,
-       .fill_sg                = ata_fill_sg,
+       .qc_prep                = ata_qc_prep,
+       .qc_issue               = ata_qc_issue_prot,
+
        .eng_timeout            = ata_eng_timeout,
 
        .irq_handler            = ata_interrupt,
+       .irq_clear              = ata_bmdma_irq_clear,
 
        .port_start             = ata_port_start,
        .port_stop              = ata_port_stop,
@@ -161,10 +163,13 @@ static struct ata_port_operations piix_sata_ops = {
 
        .bmdma_setup            = ata_bmdma_setup_pio,
        .bmdma_start            = ata_bmdma_start_pio,
-       .fill_sg                = ata_fill_sg,
+       .qc_prep                = ata_qc_prep,
+       .qc_issue               = ata_qc_issue_prot,
+
        .eng_timeout            = ata_eng_timeout,
 
        .irq_handler            = ata_interrupt,
+       .irq_clear              = ata_bmdma_irq_clear,
 
        .port_start             = ata_port_start,
        .port_stop              = ata_port_stop,
@@ -199,6 +204,17 @@ static struct ata_port_info piix_port_info[] = {
                .udma_mask      = ATA_UDMA_MASK_40C, /* FIXME: cbl det */
                .port_ops       = &piix_pata_ops,
        },
+
+       /* ich6_sata */
+       {
+               .sht            = &piix_sht,
+               .host_flags     = ATA_FLAG_SATA | ATA_FLAG_SRST |
+                                 PIIX_FLAG_COMBINED | PIIX_FLAG_CHECKINTR |
+                                 ATA_FLAG_SLAVE_POSS,
+               .pio_mask       = 0x03, /* pio3-4 */
+               .udma_mask      = 0x7f, /* udma0-6 ; FIXME */
+               .port_ops       = &piix_sata_ops,
+       },
 };
 
 static struct pci_bits piix_enable_bits[] = {
@@ -327,13 +343,6 @@ static int piix_sata_probe (struct ata_port *ap)
 
 static void piix_sata_phy_reset(struct ata_port *ap)
 {
-       if (!pci_test_config_bits(ap->host_set->pdev,
-                                 &piix_enable_bits[ap->port_no])) {
-               ata_port_disable(ap);
-               printk(KERN_INFO "ata%u: port disabled. ignoring.\n", ap->id);
-               return;
-       }
-
        if (!piix_sata_probe(ap)) {
                ata_port_disable(ap);
                printk(KERN_INFO "ata%u: SATA port has no device.\n", ap->id);