Changeset 75 for trunk/src/os2ahci/os2ahci.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/os2ahci.c (modified) (4 diffs)

trunk/src/os2ahci/os2ahci.c

@@ -375 +375 @@
         /* unit handle outside of the allowed range */
         dprintf("warning: IORB for %d.%d.%d out of range\n", a, p, d);
-        iorb->Status = IORB_ERROR | IORB_DONE;
+        iorb->Status = IORB_ERROR;
         iorb->ErrorCode = IOERR_CMD_SYNTAX;
-        if (iorb->RequestControl & IORB_ASYNC_POST) {
-          iorb->NotifyAddress(iorb);
-        }
+        complete_iorb(iorb);
         continue;
       }
@@ -964 +962 @@
   }
 
-  ddprintf("IORB queued:  %d/%d (queue = %Fp, IORB = %Fp)\n",
-           iorb->CommandCode, iorb->CommandModifier, queue, iorb);
+  if (debug) {
+    /* determine queue type (local, driver, abort or port) and minimum debug
+     * level; otherwise, queue debug prints can become really confusing.
+     */
+    char *queue_type;
+    int min_debug = 1;
+
+    if ((u32) queue >> 16 == (u32) (void _far *) &queue >> 16) {
+      /* this queue is on the stack */
+      queue_type = "local";
+      min_debug = 2;
+
+    } else if (queue == &driver_queue) {
+      queue_type = "driver";
+
+    } else if (queue == &abort_queue) {
+      queue_type = "abort";
+      min_debug = 2;
+
+    } else {
+      queue_type = "port";
+    }
+
+    if (debug >= min_debug) {
+      printf("IORB %Fp queued (cmd = %d/%d, queue = %Fp [%s], timeout = %ld)\n",
+             iorb, iorb->CommandCode, iorb->CommandModifier, queue, queue_type,
+             iorb->Timeout);
+    }
+  }
 }
 
@@ -995 +1020 @@
 
   if (found) {
-    ddprintf("IORB removed: %d/%d (queue = %Fp, IORB = %Fp) - %04x/%04x\n",
-             iorb->CommandCode, iorb->CommandModifier, queue, iorb,
-             iorb->Status, iorb->ErrorCode);
+    ddprintf("IORB %Fp removed (queue = %Fp)\n", iorb, queue);
   } else {
     dprintf("IORB %Fp not found in queue %Fp\n", iorb, queue);
@@ -1049 +1072 @@
   spin_unlock(drv_lock);
 
-  /* notify caller, if requested */
-  iorb->Status |= IORB_DONE;
-  if (iorb->RequestControl & IORB_ASYNC_POST) {
-    iorb->NotifyAddress(iorb);
-  }
+  complete_iorb(iorb);
 }