Changeset 75 for trunk/src/os2ahci/ctxhook.c

Timestamp:

Feb 16, 2011, 7:10:13 PM (14 years ago)

Author:

chris

Message:

atapi.c:

• Extended workaround for incorrect direction bits to "mode sense" commands; now there's no bus lockup and subsequent port reset during boot anymore.

ahci.c:

• Fixed timeout handling -- we use milliseconds internally while the IORB uses seconds
• Replaced IORB completion code with a macro to improve IORB debug logging

ctxhook.c:

• Fixed an issue which would fail to clear a port command bit if the IORB in question was not the one that caused the port engine to stop. As a result, a subsequent sanity check caused an unecessary port reset. The result was that ejecting a CD via WPS' drive object would cause the next command to fail, a reset to occur and the tray to close again right away
• Replaced IORB completion code with a macro to improve IORB debug logging
• added spinlocks around aws_free()

os2ahci.c

• Replaced IORB completion code with a macro to improve IORB debug logging
• Improved IORB debug logging to make it easier to spot the lifetime of an IORB without having to read between the lines

os2ahci.h

• Added macro to complete an IORB including the corresponding debug log

File:

• trunk/src/os2ahci/ctxhook.c (modified) (6 diffs)

trunk/src/os2ahci/ctxhook.c

@@ -55 +55 @@
  *    given time (even if more are outstanding). This is the case for single
  *    devices or port multipliers without FIS-based command switching. Error
- *    recovery is simple because we know which command has failed and can
- *    requeue all commands, replacing the failing command with a "request
- *    sense" command to get error details.
+ *    recovery is simple because we know which command has failed and that
+ *    all other commands have not yet started executing. Thus, we can requeue
+ *    all of them, replacing the failing command with a "request sense"
+ *    command to get error details.
  *
  *  - Multiple non-NCQ commands are executed on different devices behind a
@@ -128 +129 @@
           if (aws->queued_hw) {
             if (ai->ports[p].ncq_cmds & (1UL << aws->cmd_slot)) {
-              /* NCQ commands active; force non-NCQ mode and trigger port reset */
+              /* NCQ command; force non-NCQ mode and trigger port reset */
               ai->ports[p].ncq_cmds &= ~(1UL << aws->cmd_slot);
               aws->no_ncq = 1;
               need_reset = 1;
-            } else if (aws->cmd_slot == ccs) {
-              /* this is the non-NCQ comand that failed */
+            } else {
+              /* regular command; clear cmd bit and identify problem IORB */
               ai->ports[p].reg_cmds &= ~(1UL << aws->cmd_slot);
-              problem_iorb = iorb;
+              if (aws->cmd_slot == ccs) {
+                /* this is the non-NCQ comand that failed */
+                problem_iorb = iorb;
+              }
             }
+            /* we can requeue all IORBs unconditionally (see function comment) */
             iorb_requeue(iorb);
           }
@@ -184 +189 @@
             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;
+            int (*req_sense)(IORBH _far *, int) = (ai->ports[p].devs[d].atapi) ?
+                                                   atapi_req_sense : ata_req_sense;
 
             aws->processing = 1;
@@ -214 +219 @@
   for (iorb = done_queue.root; iorb != NULL; iorb = next) {
     next = iorb->pNxtIORB;
-    if (iorb->RequestControl & IORB_ASYNC_POST) {
-      iorb->NotifyAddress(iorb);
-    }
+
+    spin_lock(drv_lock);
+    aws_free(add_workspace(iorb));
+    spin_unlock(drv_lock);
+
+    complete_iorb(iorb);
   }
 
@@ -355 +363 @@
   spin_unlock(drv_lock);
 
-  /* call notification routine on all aborted IORBs */
+  /* complete all aborted IORBs */
   for (iorb = done_queue.root; iorb != NULL; iorb = next) {
     next = iorb->pNxtIORB;
-    iorb->Status = IORB_DONE | IORB_ERROR;
+
+    spin_lock(drv_lock);
     aws_free(add_workspace(iorb));
-    if (iorb->RequestControl & IORB_ASYNC_POST) {
-      iorb->NotifyAddress(iorb);
-    }
+    spin_unlock(drv_lock);
+
+    iorb->Status = IORB_ERROR;
+    complete_iorb(iorb);
   }
 
@@ -410 +420 @@
   }
 }
+