1 files changed, 74 insertions, 40 deletions

diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c
index 6d43ba79e154..2f1de6ec044c 100644
--- a/drivers/ata/sata_qstor.c
+++ b/drivers/ata/sata_qstor.c
@@ -103,7 +103,7 @@ enum {
         QS_DMA_BOUNDARY         = ~0UL
 };
 
-typedef enum { qs_state_idle, qs_state_pkt, qs_state_mmio } qs_state_t;
+typedef enum { qs_state_mmio, qs_state_pkt } qs_state_t;
 
 struct qs_port_priv {
         u8                      *pkt;
@@ -116,14 +116,15 @@ static int qs_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val);
 static int qs_ata_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
 static int qs_port_start(struct ata_port *ap);
 static void qs_host_stop(struct ata_host *host);
-static void qs_phy_reset(struct ata_port *ap);
 static void qs_qc_prep(struct ata_queued_cmd *qc);
 static unsigned int qs_qc_issue(struct ata_queued_cmd *qc);
 static int qs_check_atapi_dma(struct ata_queued_cmd *qc);
 static void qs_bmdma_stop(struct ata_queued_cmd *qc);
 static u8 qs_bmdma_status(struct ata_port *ap);
 static void qs_irq_clear(struct ata_port *ap);
-static void qs_eng_timeout(struct ata_port *ap);
+static void qs_freeze(struct ata_port *ap);
+static void qs_thaw(struct ata_port *ap);
+static void qs_error_handler(struct ata_port *ap);
 
 static struct scsi_host_template qs_ata_sht = {
         .module                 = THIS_MODULE,
@@ -150,11 +151,12 @@ static const struct ata_port_operations qs_ata_ops = {
         .check_atapi_dma        = qs_check_atapi_dma,
         .exec_command           = ata_exec_command,
         .dev_select             = ata_std_dev_select,
-        .phy_reset              = qs_phy_reset,
         .qc_prep                = qs_qc_prep,
         .qc_issue               = qs_qc_issue,
         .data_xfer              = ata_data_xfer,
-        .eng_timeout            = qs_eng_timeout,
+        .freeze                 = qs_freeze,
+        .thaw                   = qs_thaw,
+        .error_handler          = qs_error_handler,
         .irq_clear              = qs_irq_clear,
         .irq_on                 = ata_irq_on,
         .scr_read               = qs_scr_read,
@@ -169,8 +171,6 @@ static const struct ata_port_info qs_port_info[] = {
         /* board_2068_idx */
         {
                 .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-                                  ATA_FLAG_SATA_RESET |
-                                  //FIXME ATA_FLAG_SRST |
                                   ATA_FLAG_MMIO | ATA_FLAG_PIO_POLLING,
                 .pio_mask       = 0x10, /* pio4 */
                 .udma_mask      = ATA_UDMA6,
@@ -219,7 +219,9 @@ static void qs_irq_clear(struct ata_port *ap)
 static inline void qs_enter_reg_mode(struct ata_port *ap)
 {
         u8 __iomem *chan = qs_mmio_base(ap->host) + (ap->port_no * 0x4000);
+        struct qs_port_priv *pp = ap->private_data;
 
+        pp->state = qs_state_mmio;
         writeb(QS_CTR0_REG, chan + QS_CCT_CTR0);
         readb(chan + QS_CCT_CTR0);        /* flush */
 }
@@ -233,23 +235,28 @@ static inline void qs_reset_channel_logic(struct ata_port *ap)
         qs_enter_reg_mode(ap);
 }
 
-static void qs_phy_reset(struct ata_port *ap)
+static void qs_freeze(struct ata_port *ap)
 {
-        struct qs_port_priv *pp = ap->private_data;
+        u8 __iomem *mmio_base = qs_mmio_base(ap->host);
 
-        pp->state = qs_state_idle;
-        qs_reset_channel_logic(ap);
-        sata_phy_reset(ap);
+        writeb(0, mmio_base + QS_HCT_CTRL); /* disable host interrupts */
+        qs_enter_reg_mode(ap);
 }
 
-static void qs_eng_timeout(struct ata_port *ap)
+static void qs_thaw(struct ata_port *ap)
 {
-        struct qs_port_priv *pp = ap->private_data;
+        u8 __iomem *mmio_base = qs_mmio_base(ap->host);
+
+        qs_enter_reg_mode(ap);
+        writeb(1, mmio_base + QS_HCT_CTRL); /* enable host interrupts */
+}
+
+static int qs_prereset(struct ata_link *link, unsigned long deadline)
+{
+        struct ata_port *ap = link->ap;
 
-        if (pp->state != qs_state_idle) /* healthy paranoia */
-                pp->state = qs_state_mmio;
         qs_reset_channel_logic(ap);
-        ata_eng_timeout(ap);
+        return ata_std_prereset(link, deadline);
 }
 
 static int qs_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val)
@@ -260,6 +267,13 @@ static int qs_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val)
         return 0;
 }
 
+static void qs_error_handler(struct ata_port *ap)
+{
+        qs_enter_reg_mode(ap);
+        ata_do_eh(ap, qs_prereset, ata_std_softreset, NULL,
+                  ata_std_postreset);
+}
+
 static int qs_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val)
 {
         if (sc_reg > SCR_CONTROL)
@@ -358,7 +372,6 @@ static unsigned int qs_qc_issue(struct ata_queued_cmd *qc)
 
         switch (qc->tf.protocol) {
         case ATA_PROT_DMA:
-
                 pp->state = qs_state_pkt;
                 qs_packet_start(qc);
                 return 0;
@@ -375,6 +388,26 @@ static unsigned int qs_qc_issue(struct ata_queued_cmd *qc)
         return ata_qc_issue_prot(qc);
 }
 
+static void qs_do_or_die(struct ata_queued_cmd *qc, u8 status)
+{
+        qc->err_mask |= ac_err_mask(status);
+
+        if (!qc->err_mask) {
+                ata_qc_complete(qc);
+        } else {
+                struct ata_port    *ap  = qc->ap;
+                struct ata_eh_info *ehi = &ap->link.eh_info;
+
+                ata_ehi_clear_desc(ehi);
+                ata_ehi_push_desc(ehi, "status 0x%02X", status);
+
+                if (qc->err_mask == AC_ERR_DEV)
+                        ata_port_abort(ap);
+                else
+                        ata_port_freeze(ap);
+        }
+}
+
 static inline unsigned int qs_intr_pkt(struct ata_host *host)
 {
         unsigned int handled = 0;
@@ -406,10 +439,8 @@ static inline unsigned int qs_intr_pkt(struct ata_host *host)
                                         switch (sHST) {
                                         case 0: /* successful CPB */
                                         case 3: /* device error */
-                                                pp->state = qs_state_idle;
                                                 qs_enter_reg_mode(qc->ap);
-                                                qc->err_mask |= ac_err_mask(sDST);
-                                                ata_qc_complete(qc);
+                                                qs_do_or_die(qc, sDST);
                                                 break;
                                         default:
                                                 break;
@@ -431,25 +462,27 @@ static inline unsigned int qs_intr_mmio(struct ata_host *host)
                 if (ap &&
                     !(ap->flags & ATA_FLAG_DISABLED)) {
                         struct ata_queued_cmd *qc;
-                        struct qs_port_priv *pp = ap->private_data;
-                        if (!pp || pp->state != qs_state_mmio)
-                                continue;
+                        struct qs_port_priv *pp;
                         qc = ata_qc_from_tag(ap, ap->link.active_tag);
-                        if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING))) {
-
-                                /* check main status, clearing INTRQ */
-                                u8 status = ata_check_status(ap);
-                                if ((status & ATA_BUSY))
-                                        continue;
-                                DPRINTK("ata%u: protocol %d (dev_stat 0x%X)\n",
-                                        ap->print_id, qc->tf.protocol, status);
-
-                                /* complete taskfile transaction */
-                                pp->state = qs_state_idle;
-                                qc->err_mask |= ac_err_mask(status);
-                                ata_qc_complete(qc);
+                        if (!qc || !(qc->flags & ATA_QCFLAG_ACTIVE)) {
+                                /*
+                                 * The qstor hardware generates spurious
+                                 * interrupts from time to time when switching
+                                 * in and out of packet mode.
+                                 * There's no obvious way to know if we're
+                                 * here now due to that, so just ack the irq
+                                 * and pretend we knew it was ours.. (ugh).
+                                 * This does not affect packet mode.
+                                 */
+                                ata_check_status(ap);
                                 handled = 1;
+                                continue;
                         }
+                        pp = ap->private_data;
+                        if (!pp || pp->state != qs_state_mmio)
+                                continue;
+                        if (!(qc->tf.flags & ATA_TFLAG_POLLING))
+                                handled |= ata_host_intr(ap, qc);
                 }
         }
         return handled;
@@ -459,12 +492,13 @@ static irqreturn_t qs_intr(int irq, void *dev_instance)
 {
         struct ata_host *host = dev_instance;
         unsigned int handled = 0;
+        unsigned long flags;
 
         VPRINTK("ENTER\n");
 
-        spin_lock(&host->lock);
+        spin_lock_irqsave(&host->lock, flags);
         handled  = qs_intr_pkt(host) | qs_intr_mmio(host);
-        spin_unlock(&host->lock);
+        spin_unlock_irqrestore(&host->lock, flags);
 
         VPRINTK("EXIT\n");
 
@@ -501,7 +535,6 @@ static int qs_port_start(struct ata_port *ap)
         rc = ata_port_start(ap);
         if (rc)
                 return rc;
-        qs_enter_reg_mode(ap);
         pp = devm_kzalloc(dev, sizeof(*pp), GFP_KERNEL);
         if (!pp)
                 return -ENOMEM;
@@ -512,6 +545,7 @@ static int qs_port_start(struct ata_port *ap)
         memset(pp->pkt, 0, QS_PKT_BYTES);
         ap->private_data = pp;
 
+        qs_enter_reg_mode(ap);
         addr = (u64)pp->pkt_dma;
         writel((u32) addr,        chan + QS_CCF_CPBA);
         writel((u32)(addr >> 32), chan + QS_CCF_CPBA + 4);