Changeset 66

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

Location:

trunk/src/os2ahci

Files:

• ahci.c (modified) (4 diffs)
• ata.c (modified) (2 diffs)
• atapi.c (modified) (1 diff)
• ctxhook.c (modified) (4 diffs)
• libc.c (modified) (1 diff)

trunk/src/os2ahci/ahci.c

@@ -235 +235 @@
   if (ai->pci->vendor == PCI_VENDOR_ID_JMICRON &&
       ai->pci->device == 0x2361 && ai->port_map != 1) {
-    dprintf("JMB361 has only one port, port_map 0x%x -> 0x%x\n", ai->port_map, 1);
+    dprintf("JMB361 has only one port, port_map 0x%lx -> 0x%lx\n", ai->port_map, 1);
     ai->port_map = 1;
   }
@@ -1029 +1029 @@
 
   if (add_workspace(iorb)->complete | (iorb->Status | IORB_ERROR)) {
-    aws_free(add_workspace(iorb));
     iorb_done(iorb);
   }
@@ -1230 +1229 @@
 
       if (aws->complete) {
-        /* this IORB is complete */
-        aws_free(aws);
-
-        /* move IORB to our temporary done queue */
+        /* this IORB is complete; move IORB to our temporary done queue */
         iorb_queue_del(&ai->ports[p].iorb_queue, iorb);
         iorb_queue_add(&done_queue, iorb);
@@ -1250 +1246 @@
     next = iorb->pNxtIORB;
     iorb->Status = IORB_DONE;
+    aws_free(iorb_workspace(iorb));
     if (iorb->RequestControl & IORB_ASYNC_POST) {
       iorb->NotifyAddress(iorb);

trunk/src/os2ahci/ata.c

@@ -422 +422 @@
 
   if (rc != 0) {
-    free(aws->buf);
     iorb_seterr(iorb, IOERR_CMD_ADD_SOFTWARE_FAILURE);
   }
@@ -636 +635 @@
     iorb_requeue(iorb);
   }
-
 }
 

trunk/src/os2ahci/atapi.c

@@ -284 +284 @@
   }
 
-  /* free sense buffer */
-  aws_free(aws);
-
-}
-
+  /* mark IORB as complete */
+  aws->complete = 1;
+}
+

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

trunk/src/os2ahci/libc.c

@@ -95 +95 @@
 /******************************************************************************
  * Initialize COM1 to 115200,n,8,1
+ *
+ * NOTE: Something is wrong with this code, or the init sequence, but we never
+ *       got around to fixing it because it works fine on Virtualbox, and on
+ *       physical machines we tend to have the kernel debugger running on the
+ *       same port simply because serial ports are not that plenty on PCs
+ *       these days, thus KDB will set port parameters for us. This is going
+ *       to be fixed eventually...
  */
 void init_com1(void)