Changeset 121 for trunk

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

Location:

trunk/src/os2ahci

Files:

• ahci.c (modified) (1 diff)
• ata.c (modified) (1 diff)
• ctxhook.c (modified) (3 diffs)
• os2ahci.c (modified) (1 diff)
• os2ahci.h (modified) (2 diffs)
• version.h (modified) (1 diff)

trunk/src/os2ahci/ahci.c

@@ -1122 +1122 @@
   if (func(iorb, 0) == 0) {
     /* successfully prepared cmd; issue cmd and wait for completion */
-    ddprintf("executing polled cmd...");
+    ddprintf("executing polled cmd on slot 0...");
     writel(port_mmio + PORT_CMD_ISSUE, 1);
     timeout /= 10;

trunk/src/os2ahci/ata.c

@@ -278 +278 @@
 
   if (debug >= 2) {
-    printf("ATA command for %d.%d.%d:\n", ad_no(ai), p, d);
+    printf("ATA command for %d.%d.%d, slot %d:\n", ad_no(ai), p, d, slot);
     phex(cmd_hdr, offsetof(AHCI_CMD_HDR, reserved), "cmd_hdr:   ");
     phex(&ata_cmd, sizeof(ata_cmd), "ata_cmd:   ");

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);
 

trunk/src/os2ahci/os2ahci.c

@@ -1248 +1248 @@
   u16 no_ncq = aws->no_ncq;
   u16 unaligned = aws->unaligned;
+  u16 retries = aws->retries;
 
   aws_free(aws);
   memset(aws, 0x00, sizeof(*aws));
+
   aws->no_ncq = no_ncq;
   aws->unaligned = unaligned;
+  aws->retries = retries;
 }
 

trunk/src/os2ahci/os2ahci.h

@@ -82 +82 @@
 /* default command timeout (can be overwritten in the IORB) */
 #define DEFAULT_TIMEOUT  30000
+
+/* Maximum number of retries for commands in the restart/reset context hooks.
+ *
+ * Please note that the corresponding variable in the ADD workspace is a bit
+ * field, thus increasing this value means increasing the size of the bit
+ * field. At the time of writing this comment the 'retries' variable was 2
+ * bits wide (i.e. a maximum number of 3 retries) and there was exactly one
+ * bit left before the ADD workspace structure would become too large...
+ */
+#define MAX_RETRIES          3
 
 /* max/min macros */
@@ -354 +364 @@
   unsigned      complete      : 1;     /* IORB has completed processing */
   unsigned      unaligned     : 1;     /* unaligned S/G; need to use transfer buffer */
+  unsigned      retries       : 2;     /* number of retries for this command */
   unsigned      cmd_slot      : 5;     /* AHCI command slot for this IORB */
 } ADD_WORKSPACE;

trunk/src/os2ahci/version.h

@@ -14 +14 @@
 
 
-#define VERSION            118       /* driver version (2 implied decimals) */
+#define VERSION            119       /* driver version (2 implied decimals) */