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

trunk/src/os2ahci/ahci.c

@@ -858 +858 @@
   AD_INFO *ai = ad_infos + iorb_unit_adapter(iorb);
   P_INFO *port = ai->ports + iorb_unit_port(iorb);
-  ULONG timeout = (iorb->Timeout > 0) ? iorb->Timeout : DEFAULT_TIMEOUT;
+  ULONG timeout = (iorb->Timeout > 0) ? iorb->Timeout * 1000 : DEFAULT_TIMEOUT;
   u8 _far *port_mmio = port_base(ai, iorb_unit_port(iorb));
   u16 cmd_max = ai->cmd_max;
@@ -1257 +1257 @@
     next = iorb->pNxtIORB;
     if (aws->queued_hw && (done_mask & (1UL << aws->cmd_slot))) {
-      /* this command has completed */
+      /* this hardware command has completed */
+      ai->ports[p].ncq_cmds &= ~(1UL << aws->cmd_slot);
+      ai->ports[p].reg_cmds &= ~(1UL << aws->cmd_slot);
+
+      /* call post-processing function, if any */
       if (aws->ppfunc != NULL) {
         aws->ppfunc(iorb);
@@ -1268 +1272 @@
         iorb_queue_del(&ai->ports[p].iorb_queue, iorb);
         iorb_queue_add(&done_queue, iorb);
+        aws_free(add_workspace(iorb));
       }
-
-      /* clear corresponding bit in issued command bitmaps */
-      ai->ports[p].ncq_cmds &= ~(1UL << aws->cmd_slot);
-      ai->ports[p].reg_cmds &= ~(1UL << aws->cmd_slot);
     }
   }
@@ -1278 +1279 @@
   spin_unlock(drv_lock);
 
-  /* call notification routines for all IORBs in the done queue */
+  /* complete all IORBs in the done queue */
   for (iorb = done_queue.root; iorb != NULL; iorb = next) {
     next = iorb->pNxtIORB;
-    iorb->Status = IORB_DONE;
-    aws_free(add_workspace(iorb));
-    if (iorb->RequestControl & IORB_ASYNC_POST) {
-      iorb->NotifyAddress(iorb);
-    }
+    complete_iorb(iorb);
   }
 }