Pull video into test branch

[linux-2.6-omap-h63xx.git] / drivers / scsi / aic94xx / aic94xx_scb.c

diff --git a/drivers/scsi/aic94xx/aic94xx_scb.c b/drivers/scsi/aic94xx/aic94xx_scb.c
index b15caf1c8fa21c2ffed74c9b1d2ed73259133ae3..75ed6b0569d1ad9243e8be51e265f7df144abbd6 100644 (file)
--- a/drivers/scsi/aic94xx/aic94xx_scb.c
+++ b/drivers/scsi/aic94xx/aic94xx_scb.c
@@ -25,6 +25,7 @@
  */
 
 #include <linux/pci.h>
+#include <scsi/scsi_host.h>
 
 #include "aic94xx.h"
 #include "aic94xx_reg.h"
@@ -412,6 +413,40 @@ void asd_invalidate_edb(struct asd_ascb *ascb, int edb_id)
        }
 }
 
+/* hard reset a phy later */
+static void do_phy_reset_later(struct work_struct *work)
+{
+       struct sas_phy *sas_phy =
+               container_of(work, struct sas_phy, reset_work);
+       int error;
+
+       ASD_DPRINTK("%s: About to hard reset phy %d\n", __FUNCTION__,
+                   sas_phy->identify.phy_identifier);
+       /* Reset device port */
+       error = sas_phy_reset(sas_phy, 1);
+       if (error)
+               ASD_DPRINTK("%s: Hard reset of phy %d failed (%d).\n",
+                           __FUNCTION__, sas_phy->identify.phy_identifier, error);
+}
+
+static void phy_reset_later(struct sas_phy *sas_phy, struct Scsi_Host *shost)
+{
+       INIT_WORK(&sas_phy->reset_work, do_phy_reset_later);
+       queue_work(shost->work_q, &sas_phy->reset_work);
+}
+
+/* start up the ABORT TASK tmf... */
+static void task_kill_later(struct asd_ascb *ascb)
+{
+       struct asd_ha_struct *asd_ha = ascb->ha;
+       struct sas_ha_struct *sas_ha = &asd_ha->sas_ha;
+       struct Scsi_Host *shost = sas_ha->core.shost;
+       struct sas_task *task = ascb->uldd_task;
+
+       INIT_WORK(&task->abort_work, sas_task_abort);
+       queue_work(shost->work_q, &task->abort_work);
+}
+
 static void escb_tasklet_complete(struct asd_ascb *ascb,
                                  struct done_list_struct *dl)
 {
@@ -439,6 +474,74 @@ static void escb_tasklet_complete(struct asd_ascb *ascb,
                            ascb->scb->header.opcode);
        }
 
+       /* Catch these before we mask off the sb_opcode bits */
+       switch (sb_opcode) {
+       case REQ_TASK_ABORT: {
+               struct asd_ascb *a, *b;
+               u16 tc_abort;
+
+               tc_abort = *((u16*)(&dl->status_block[1]));
+               tc_abort = le16_to_cpu(tc_abort);
+
+               ASD_DPRINTK("%s: REQ_TASK_ABORT, reason=0x%X\n",
+                           __FUNCTION__, dl->status_block[3]);
+
+               /* Find the pending task and abort it. */
+               list_for_each_entry_safe(a, b, &asd_ha->seq.pend_q, list)
+                       if (a->tc_index == tc_abort) {
+                               task_kill_later(a);
+                               break;
+                       }
+               goto out;
+       }
+       case REQ_DEVICE_RESET: {
+               struct Scsi_Host *shost = sas_ha->core.shost;
+               struct sas_phy *dev_phy;
+               struct asd_ascb *a;
+               u16 conn_handle;
+
+               conn_handle = *((u16*)(&dl->status_block[1]));
+               conn_handle = le16_to_cpu(conn_handle);
+
+               ASD_DPRINTK("%s: REQ_DEVICE_RESET, reason=0x%X\n", __FUNCTION__,
+                           dl->status_block[3]);
+
+               /* Kill all pending tasks and reset the device */
+               dev_phy = NULL;
+               list_for_each_entry(a, &asd_ha->seq.pend_q, list) {
+                       struct sas_task *task;
+                       struct domain_device *dev;
+                       u16 x;
+
+                       task = a->uldd_task;
+                       if (!task)
+                               continue;
+                       dev = task->dev;
+
+                       x = (unsigned long)dev->lldd_dev;
+                       if (x == conn_handle) {
+                               dev_phy = dev->port->phy;
+                               task_kill_later(a);
+                       }
+               }
+
+               /* Reset device port */
+               if (!dev_phy) {
+                       ASD_DPRINTK("%s: No pending commands; can't reset.\n",
+                                   __FUNCTION__);
+                       goto out;
+               }
+               phy_reset_later(dev_phy, shost);
+               goto out;
+       }
+       case SIGNAL_NCQ_ERROR:
+               ASD_DPRINTK("%s: SIGNAL_NCQ_ERROR\n", __FUNCTION__);
+               goto out;
+       case CLEAR_NCQ_ERROR:
+               ASD_DPRINTK("%s: CLEAR_NCQ_ERROR\n", __FUNCTION__);
+               goto out;
+       }
+
        sb_opcode &= ~DL_PHY_MASK;
 
        switch (sb_opcode) {
@@ -469,22 +572,6 @@ static void escb_tasklet_complete(struct asd_ascb *ascb,
                asd_deform_port(asd_ha, phy);
                sas_ha->notify_port_event(sas_phy, PORTE_TIMER_EVENT);
                break;
-       case REQ_TASK_ABORT:
-               ASD_DPRINTK("%s: phy%d: REQ_TASK_ABORT\n", __FUNCTION__,
-                           phy_id);
-               break;
-       case REQ_DEVICE_RESET:
-               ASD_DPRINTK("%s: phy%d: REQ_DEVICE_RESET\n", __FUNCTION__,
-                           phy_id);
-               break;
-       case SIGNAL_NCQ_ERROR:
-               ASD_DPRINTK("%s: phy%d: SIGNAL_NCQ_ERROR\n", __FUNCTION__,
-                           phy_id);
-               break;
-       case CLEAR_NCQ_ERROR:
-               ASD_DPRINTK("%s: phy%d: CLEAR_NCQ_ERROR\n", __FUNCTION__,
-                           phy_id);
-               break;
        default:
                ASD_DPRINTK("%s: phy%d: unknown event:0x%x\n", __FUNCTION__,
                            phy_id, sb_opcode);
@@ -504,7 +591,7 @@ static void escb_tasklet_complete(struct asd_ascb *ascb,
 
                break;
        }
-
+out:
        asd_invalidate_edb(ascb, edb);
 }