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

Timestamp:

Dec 23, 2010, 11:06:03 PM (15 years ago)

Author:

chris

Message:

• Added code to dprintf TF_DATA register in restart_ctxhook
• Cleaned up aws_free() calls; in a nutshell, aws_free() will always be called when IORBs complete (successfully or with an error) and this is now verified; redundant invocations of aws_free() have been removed.
• atapi_req_sense_pp() now sets the iorb_workspace(iorb)->complete = 1

File:

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

trunk/src/os2ahci/ctxhook.c

@@ -117 +117 @@
         need_reset = 0;
 
+        dprintf("port %d, TF_DATA: 0x%lx\n", p, readl(port_mmio + PORT_TFDATA));
+
         /* get "current command slot"; only valid if there are no NCQ cmds */
         ccs = (int) ((readl(port_mmio + PORT_CMD) >> 8) & 0x0f);
 
-       for (iorb = ai->ports[p].iorb_queue.root; iorb != NULL; iorb = next) {
+        for (iorb = ai->ports[p].iorb_queue.root; iorb != NULL; iorb = next) {
           ADD_WORKSPACE _far *aws = add_workspace(iorb);
           next = iorb->pNxtIORB;
@@ -285 +287 @@
 
     /* move IORB to the local 'done' queue */
-    aws_free(add_workspace(iorb));
     iorb_queue_del(&abort_queue, iorb);
     iorb_queue_add(&done_queue, iorb);
@@ -331 +332 @@
           if (add_workspace(iorb)->queued_hw) {
             /* this IORB had already been queued to HW when we reset the port */
-            aws_free(add_workspace(iorb));
             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.
                */
-              memset(&iorb->ADDWorkSpace, sizeof(iorb->ADDWorkSpace), 0x00);
+              requeue_iorb(iorn);
 
             } else {
@@ -356 +356 @@
     next = iorb->pNxtIORB;
     iorb->Status = IORB_DONE | IORB_ERROR;
+    aws_free(add_workspace(iorb));
     if (iorb->RequestControl & IORB_ASYNC_POST) {
       iorb->NotifyAddress(iorb);