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

Timestamp:

Aug 31, 2011, 11:23:46 PM (14 years ago)

Author:

cjm

Message:

OS2AHCI Version 1.19
====================

• Added retry counters to all commands (IORBs) in order to prevent infinite retry loops. This was necessary because Virtualbox 4.x doesn't seem to set the "current command index" in specific ATAPI error situations, causing the failing command to be retried indefinitely instead of asking for a sense buffer

• Minor changes to debug logging

File:

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

trunk/src/os2ahci/ctxhook.c

@@ -128 +128 @@
         /* get "current command slot"; only valid if there are no NCQ cmds */
         ccs = (int) ((readl(port_mmio + PORT_CMD) >> 8) & 0x0f);
+        ddprintf(" PORT_CMD      = 0x%x\n", ccs);
 
         for (iorb = ai->ports[p].iorb_queue.root; iorb != NULL; iorb = next) {
@@ -143 +144 @@
               ai->ports[p].reg_cmds &= ~(1UL << aws->cmd_slot);
               if (aws->cmd_slot == ccs) {
-                /* this is the non-NCQ comand that failed */
+                /* this is the non-NCQ command that failed */
                 problem_iorb = iorb;
               }
             }
             /* we can requeue all IORBs unconditionally (see function comment) */
-            iorb_requeue(iorb);
+            if (aws->retries++ < MAX_RETRIES) {
+              iorb_requeue(iorb);
+
+            } else {
+              /* retry count exceeded; consider IORB aborted */
+              iorb_seterr(iorb, IOERR_CMD_ABORTED);
+              iorb_queue_del(&ai->ports[p].iorb_queue, iorb);
+              iorb_queue_add(&done_queue, iorb);
+              if (iorb == problem_iorb) {
+                /* no further analysis -- we're done with this one */
+                problem_iorb = NULL;
+              }
+            }
           }
         }
@@ -352 +365 @@
         /* retry or abort all remaining active commands on this port */
         for (iorb = ai->ports[p].iorb_queue.root; iorb != NULL; iorb = next) {
+          ADD_WORKSPACE _far *aws = add_workspace(iorb);
           next = iorb->pNxtIORB;
-          if (add_workspace(iorb)->queued_hw) {
+
+          if (aws->queued_hw) {
             /* this IORB had already been queued to HW when we reset the port */
-            if (add_workspace(iorb)->idempotent) {
-              /* We can retry this IORB; just reset its status and it will be
-               * picked up by subsequent trigger_engine() calls.
-               */
+            if (aws->idempotent && aws->retries++ < MAX_RETRIES) {
+              /* we can retry this IORB */
               iorb_requeue(iorb);