Changeset 8 for trunk/src/ctxhook.c

Timestamp:

Sep 10, 2010, 11:30:39 AM (15 years ago)

Author:

markus

Message:

latest changes by Christian

File:

• trunk/src/ctxhook.c (modified) (9 diffs)

trunk/src/ctxhook.c

@@ -82 +82 @@
 void restart_ctxhook(ULONG parm)
 {
+  IORB_QUEUE done_queue;
   AD_INFO *ai;
   IORBH _far *problem_iorb;
@@ -92 +93 @@
   int a;
   int p;
-  int d;
 
   dprintf("restart_ctxhook() started\n");
+  memset(&done_queue, 0x00, sizeof(done_queue));
+
   spin_lock(drv_lock);
 
@@ -108 +110 @@
     for (p = 0; p <= ai->port_max; p++) {
       if (ports_to_restart[a] & (1UL << p)) {
+        ports_to_restart[a] &= ~(1UL << p);
 
         /* restart this port */
-        ports_to_restart[a] &= ~(1UL << p);
         port_mmio = port_base(ai, p);
         problem_iorb = NULL;
@@ -124 +126 @@
           if (aws->queued_hw) {
             if (ai->ports[p].ncq_cmds != 0) {
+              /* NCQ commands active; force non-NCQ mode and trigger port reset */
+              aws->no_ncq = 1;
               need_reset = 1;
             } else if (aws->cmd_slot == ccs) {
@@ -129 +133 @@
               problem_iorb = iorb;
             }
-
-            /* requeue this command with the 'no_ncq' flag set */
-            aws_free(aws);
-            memset(&iorb->ADDWorkSpace, sizeof(iorb->ADDWorkSpace), 0x00);
-            aws->no_ncq = 1;
+            iorb_requeue(iorb);
 
             /* remove requeued command from the issued command bitmaps */
@@ -166 +166 @@
         ai->busy = 0;
 
-        /* reset port status */
-        ai->ports[p].cmd_slot = 0;
+        /* reset internal port status */
         ai->ports[p].ncq_cmds = 0;
         ai->ports[p].reg_cmds = 0;
-
-        if (!need_reset && problem_iorb != NULL) {
-          /* request sense data for the failing command in cmd slot #0 */
-          ADD_WORKSPACE _far *aws = add_workspace(problem_iorb);
-          aws->processing = 1;
-          aws->queued_hw = 1;
-          d = iorb_unit_device(problem_iorb);
-          if (ai->ports[p].devs[d].atapi) {
-            atapi_req_sense(problem_iorb, 0);
+        ai->ports[p].cmd_slot = 0;
+
+        if (problem_iorb != NULL) {
+          /* get details about the error that caused this IORB to fail */
+          if (need_reset) {
+            /* no way to retrieve error details after a reset */
+            iorb_seterr(problem_iorb, IOERR_DEVICE_NONSPECIFIC);
+            iorb_queue_del(&ai->ports[p].iorb_queue, problem_iorb);
+            iorb_queue_add(&done_queue, problem_iorb);
+
           } else {
-            ata_req_sense(problem_iorb, 0);
+            /* get sense information */
+            ADD_WORKSPACE _far *aws = add_workspace(problem_iorb);
+            int d = iorb_unit_device(problem_iorb);
+            int (*req_sense)(IORBH _far *, int) = 
+              (ai->ports[p].devs[d].atapi) ? atapi_req_sense : ata_req_sense;
+
+            aws->processing = 1;
+            aws->queued_hw = 1;
+
+            if (req_sense(problem_iorb, 0) == 0) {
+              /* execute request sense on slot #0 before anything else comes along */
+              ai->ports[p].reg_cmds = 1;
+              writel(port_mmio + PORT_CMD_ISSUE, 1);
+              readl(port_mmio); /* flush */
+
+            } else {
+              /* IORB is expected to contain the error code; just move to done queue */
+              iorb_queue_del(&ai->ports[p].iorb_queue, problem_iorb);
+              iorb_queue_add(&done_queue, problem_iorb);
+            }
           }
-          ai->ports[p].reg_cmds = 1;
-          writel(port_mmio + PORT_CMD_ISSUE, 1);
-          readl(port_mmio); /* flush */
         }
       }
@@ -190 +206 @@
   }
 
+  spin_unlock(drv_lock);
+
+  /* call notification routine on all IORBs which have completed */
+  for (iorb = done_queue.root; iorb != NULL; iorb = next) {
+    next = iorb->pNxtIORB;
+    if (iorb->RequestControl & IORB_ASYNC_POST) {
+      iorb->NotifyAddress(iorb);
+    }
+  }
+
   /* restart engine to resume IORB processing */
+  spin_lock(drv_lock);
   trigger_engine();
   spin_unlock(drv_lock);
@@ -283 +310 @@
     for (p = 0; p <= ai->port_max; p++) {
       if (ports_to_reset[a] & (1UL << p)) {
+        ports_to_reset[a] &= ~(1UL << p);
+
         /* Reset this port. Since this is a rather slow operation, we'll
          * release the spinlock while doing so. The adapter is marked as
@@ -288 +317 @@
          * interfering. 
          */
-        ports_to_reset[a] &= ~(1UL << p);
         ai->busy = 1;
         spin_unlock(drv_lock);