[PATCH] ahci: convert to new probing mechanism and add hotplug support

[linux-2.6] / drivers / scsi / ahci.c

diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index 8493b021cc07b19156d7dd69e9a62fad1c5f934a..e261b37c2e48b48f4d48fc2fdd1ed360fd7f33c2 100644 (file)
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -136,6 +136,7 @@ enum {
        PORT_IRQ_FREEZE         = PORT_IRQ_HBUS_ERR |
                                  PORT_IRQ_IF_ERR |
                                  PORT_IRQ_CONNECT |
+                                 PORT_IRQ_PHYRDY |
                                  PORT_IRQ_UNK_FIS,
        PORT_IRQ_ERROR          = PORT_IRQ_FREEZE |
                                  PORT_IRQ_TF_ERR |
@@ -200,7 +201,6 @@ static void ahci_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
 static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
 static unsigned int ahci_qc_issue(struct ata_queued_cmd *qc);
 static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs *regs);
-static int ahci_probe_reset(struct ata_port *ap, unsigned int *classes);
 static void ahci_irq_clear(struct ata_port *ap);
 static int ahci_port_start(struct ata_port *ap);
 static void ahci_port_stop(struct ata_port *ap);
@@ -228,6 +228,7 @@ static struct scsi_host_template ahci_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = AHCI_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+       .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
 
@@ -240,8 +241,6 @@ static const struct ata_port_operations ahci_ops = {
 
        .tf_read                = ahci_tf_read,
 
-       .probe_reset            = ahci_probe_reset,
-
        .qc_prep                = ahci_qc_prep,
        .qc_issue               = ahci_qc_issue,
 
@@ -266,7 +265,8 @@ static const struct ata_port_info ahci_port_info[] = {
        {
                .sht            = &ahci_sht,
                .host_flags     = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-                                 ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA,
+                                 ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |
+                                 ATA_FLAG_SKIP_D2H_BSY,
                .pio_mask       = 0x1f, /* pio0-4 */
                .udma_mask      = 0x7f, /* udma0-6 ; FIXME */
                .port_ops       = &ahci_ops,
@@ -276,6 +276,7 @@ static const struct ata_port_info ahci_port_info[] = {
                .sht            = &ahci_sht,
                .host_flags     = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
                                  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |
+                                 ATA_FLAG_SKIP_D2H_BSY |
                                  AHCI_FLAG_RESET_NEEDS_CLO,
                .pio_mask       = 0x1f, /* pio0-4 */
                .udma_mask      = 0x7f, /* udma0-6 ; FIXME */
@@ -568,6 +569,17 @@ static int ahci_clo(struct ata_port *ap)
        return 0;
 }
 
+static int ahci_prereset(struct ata_port *ap)
+{
+       if ((ap->flags & AHCI_FLAG_RESET_NEEDS_CLO) &&
+           (ata_busy_wait(ap, ATA_BUSY, 1000) & ATA_BUSY)) {
+               /* ATA_BUSY hasn't cleared, so send a CLO */
+               ahci_clo(ap);
+       }
+
+       return ata_std_prereset(ap);
+}
+
 static int ahci_softreset(struct ata_port *ap, unsigned int *class)
 {
        struct ahci_port_priv *pp = ap->private_data;
@@ -677,12 +689,22 @@ static int ahci_softreset(struct ata_port *ap, unsigned int *class)
 
 static int ahci_hardreset(struct ata_port *ap, unsigned int *class)
 {
+       struct ahci_port_priv *pp = ap->private_data;
+       u8 *d2h_fis = pp->rx_fis + RX_FIS_D2H_REG;
+       struct ata_taskfile tf;
        int rc;
 
        DPRINTK("ENTER\n");
 
        ahci_stop_engine(ap);
+
+       /* clear D2H reception area to properly wait for D2H FIS */
+       ata_tf_init(ap->device, &tf);
+       tf.command = 0xff;
+       ata_tf_to_fis(&tf, d2h_fis, 0);
+
        rc = sata_std_hardreset(ap, class);
+
        ahci_start_engine(ap);
 
        if (rc == 0 && ata_port_online(ap))
@@ -713,19 +735,6 @@ static void ahci_postreset(struct ata_port *ap, unsigned int *class)
        }
 }
 
-static int ahci_probe_reset(struct ata_port *ap, unsigned int *classes)
-{
-       if ((ap->flags & AHCI_FLAG_RESET_NEEDS_CLO) &&
-           (ata_busy_wait(ap, ATA_BUSY, 1000) & ATA_BUSY)) {
-               /* ATA_BUSY hasn't cleared, so send a CLO */
-               ahci_clo(ap);
-       }
-
-       return ata_drive_probe_reset(ap, ata_std_probeinit,
-                                    ahci_softreset, ahci_hardreset,
-                                    ahci_postreset, classes);
-}
-
 static u8 ahci_check_status(struct ata_port *ap)
 {
        void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr;
@@ -838,8 +847,7 @@ static void ahci_error_intr(struct ata_port *ap, u32 irq_stat)
        }
 
        if (irq_stat & (PORT_IRQ_CONNECT | PORT_IRQ_PHYRDY)) {
-               err_mask |= AC_ERR_ATA_BUS;
-               action |= ATA_EH_SOFTRESET;
+               ata_ehi_hotplugged(ehi);
                ata_ehi_push_desc(ehi, ", %s", irq_stat & PORT_IRQ_CONNECT ?
                        "connection status changed" : "PHY RDY changed");
        }
@@ -1026,7 +1034,7 @@ static void ahci_error_handler(struct ata_port *ap)
        }
 
        /* perform recovery */
-       ata_do_eh(ap, ata_std_prereset, ahci_softreset, ahci_hardreset,
+       ata_do_eh(ap, ahci_prereset, ahci_softreset, ahci_hardreset,
                  ahci_postreset);
 }
 
@@ -1388,21 +1396,17 @@ static void ahci_remove_one (struct pci_dev *pdev)
        struct device *dev = pci_dev_to_dev(pdev);
        struct ata_host_set *host_set = dev_get_drvdata(dev);
        struct ahci_host_priv *hpriv = host_set->private_data;
-       struct ata_port *ap;
        unsigned int i;
        int have_msi;
 
-       for (i = 0; i < host_set->n_ports; i++) {
-               ap = host_set->ports[i];
-
-               scsi_remove_host(ap->host);
-       }
+       for (i = 0; i < host_set->n_ports; i++)
+               ata_port_detach(host_set->ports[i]);
 
        have_msi = hpriv->flags & AHCI_FLAG_MSI;
        free_irq(host_set->irq, host_set);
 
        for (i = 0; i < host_set->n_ports; i++) {
-               ap = host_set->ports[i];
+               struct ata_port *ap = host_set->ports[i];
 
                ata_scsi_release(ap->host);
                scsi_host_put(ap->host);