Changeset 13 for trunk/src/os2ahci/os2ahci.c

Timestamp:

Sep 14, 2010, 10:07:59 AM (15 years ago)

Author:

root

Message:

latest NCQ changes from Christian

Location:

trunk/src/os2ahci

Files:

• . (added)
• os2ahci.c (moved) (moved from trunk/src/os2ahci.c ) (16 diffs)

trunk/src/os2ahci/os2ahci.c

@@ -32 +32 @@
       goto init_fail;                                     \
     }                                                     \
-    value = (type) strtol((s) + 2,                        \
-                          (const char _far* _far*) &_ep,  \
-                          radix);                         \
+    value = (type) strtol((s) + 2, &_ep, radix);          \
     s = _ep;                                              \
   }
-
-
-/* MT: got to fix include paths... */
-#ifndef IOCM_EXECUTE_ATA
-#define IOCM_EXECUTE_ATA 0x0003 
-#endif
 
 /* ------------------------ typedefs and structures ------------------------ */
@@ -84 +76 @@
 
 /* apapter/port-specific options saved when parsing the command line */
-int             link_speed[MAX_AD][AHCI_MAX_PORTS];
+u8              link_speed[MAX_AD][AHCI_MAX_PORTS];
+u8              disable_ncq[MAX_AD][AHCI_MAX_PORTS];
 
 static char     init_msg[] = "OS2AHCI driver version %d.%02d\n";
@@ -123 +116 @@
   DDD_PARM_LIST _far *ddd_pl = (DDD_PARM_LIST _far *) req->InitArgs;
   APIRET rmrc;
+  PSEL p;
   char _far *cmd_line;
+  char _far *ep;
   char _far *s;
   int adapter_index;
@@ -159 +154 @@
       s++;
       switch(tolower(*s)) {
+
+      case 'c':
+        /* set COM port base address for debug messages */
+        drv_parm_int(s, com_base, u16, 16);
+        break;
 
       case 'd':
@@ -210 +210 @@
         break;
 
+      case 'n':
+        /* disable NCQ on this port */
+        drv_parm_int(s, disable_ncq[adapter_index][port_index], u8, 10);
+        break;
+
       default:
         cprintf("invalid option: /%c\n", *s);
@@ -382 +387 @@
  * - This function is expected to be called with the spinlock aquired
  *
- * - The handler functions are free to process more than one IORB (i.e.
- *   command queuing). The idea is that the root IORB (and potential next
- *   IORBs) are marked as "processing" which keeps trigger_engine() from
- *   touching this IORB queue until all of those IORBs have completed
- *   processing and have been removed from the queue.
- *
  * - Adapters can be flagged as 'busy' which means no new IORBs are sent (they
  *   just remain in the queue). This can be used to release the driver-level
@@ -394 +393 @@
  *   need to invoke trigger_engine() after resetting the busy flag.
  *
- *   - Handlers that use the adapter 'busy' flag when processing driver-level
- *     IORBs don't need to protect themselves against new IORBs on the driver
- *     level because those will always be queued at the end of the driver-
- *     level queue (there are no driver-level priority IORBs).
+ * - Driver-level IORBs are not synchronized by adapter-level 'busy' flags.
+ *   However, the driver-level queue is worked "one entry at a time" which
+ *   means that no new IORBs will be queued on the driver-level queue until
+ *   the head element has completed processing. This means that driver-
+ *   level IORB handlers don't need to protect against each other. But they
+ *   they do need to keep in mind interference with port-level IORBs:
+ *
+ *   - Driver-level IORB handlers must obtain the spinlock and/or flag all
+ *     adapters as 'busy' which are affected by the driver-level IORB
+ *
+ *   - Driver-level IORB handlers must not access the hardware of a
+ *     particular adapter if it's flagged as 'busy'
  */
 int trigger_engine_1(void)
 {
   IORBH _far *iorb;
+  IORBH _far *next;
   int iorbs_sent = 0;
   int a;
@@ -422 +430 @@
     }
     for (p = 0; p <= ai->port_max; p++) {
-      if ((iorb = ai->ports[p].iorb_queue.root) != NULL &&
-          !add_workspace(iorb)->processing) {
-        send_iorb(iorb);
-        iorbs_sent++;
+      /* send all queued IORBs on this port */
+      next = NULL;
+      for (iorb = ai->ports[p].iorb_queue.root; iorb != NULL; iorb = next) {
+        next = iorb->pNxtIORB;
+        if (!add_workspace(iorb)->processing) {
+          send_iorb(iorb);
+          iorbs_sent++;
+        }
       }
     }
@@ -447 +459 @@
    * invocations of trigger_engine() (e.g. at interrupt time) will ignore this
    * IORB.
-   *
-   * NOTE: Handler functions are free to look at follow-up IORBs in order to
-   *       queue them to the hardware (native command queueing). If they
-   *       choose to do so, they must mark those IORBs as "processing" as
-   *       well.
    */
   add_workspace(iorb)->processing = 1;
@@ -511 +518 @@
      * use interrupts, timers and context hooks instead of polling).
      */
-    dprintf("leaving initialization mode\n");
-    spin_lock(drv_lock);
     if (!init_complete) {
+      dprintf("leaving initialization mode\n");
+      spin_lock(drv_lock);
       for (a = 0; a < ad_info_cnt; a++) {
         ahci_complete_init(ad_infos + a);
       }
       init_complete = 1;
-    }
-    spin_unlock(drv_lock);
+      spin_unlock(drv_lock);
+    }
     iorb_done(iorb);
     break;
@@ -540 +547 @@
 void iocc_device_control(IORBH _far *iorb)
 {
-  AD_INFO *ai;
+  AD_INFO *ai = ad_infos + iorb_unit_adapter(iorb);
   IORBH _far *ptr;
   IORBH _far *next = NULL;
-  int a = iorb_unit_adapter(iorb);
   int p = iorb_unit_port(iorb);
   int d = iorb_unit_device(iorb);
@@ -551 +557 @@
   case IOCM_ABORT:
     /* abort all pending commands on specified port and device */
-    ai = ad_infos + a;
     spin_lock(drv_lock);
     for (ptr = ai->ports[p].iorb_queue.root; ptr != NULL; ptr = next) {
@@ -762 +767 @@
             ui->UnitHandle   = iorb_unit(a, p, d);
             ui->UnitType     = ad_info->ports[p].devs[d].dev_type;
-            ui->QueuingCount = AHCI_MAX_CMDS;
+            ui->QueuingCount = ad_info->ports[p].devs[d].ncq_max;;
             if (ad_info->ports[p].devs[d].removable) {
               ui->UnitFlags |= UF_REMOVABLE;
@@ -865 +870 @@
 
   case IOCM_EXECUTE_CDB:
+    add_workspace(iorb)->idempotent = 0;
     ahci_execute_cdb(iorb);
     break;
 
   case IOCM_EXECUTE_ATA:
+    add_workspace(iorb)->idempotent = 0;
     ahci_execute_ata(iorb);
     break;
@@ -900 +907 @@
   }
 
-  ddprintf("IORB queued:  %d/%d (queue = %Fp, IORB = %Fp)\n",
-           iorb->CommandCode, iorb->CommandModifier, queue, iorb);
+  dprintf("IORB queued:  %d/%d (queue = %Fp, IORB = %Fp)\n",
+          iorb->CommandCode, iorb->CommandModifier, queue, iorb);
 }
 
@@ -931 +938 @@
 
   if (found) {
-    ddprintf("IORB removed: %d/%d (queue = %Fp, IORB = %Fp) - %04x/%04x\n",
-             iorb->CommandCode, iorb->CommandModifier, queue, iorb,
-             iorb->Status, iorb->ErrorCode);
+    dprintf("IORB removed: %d/%d (queue = %Fp, IORB = %Fp) - %04x/%04x\n",
+            iorb->CommandCode, iorb->CommandModifier, queue, iorb,
+            iorb->Status, iorb->ErrorCode);
   } else {
-    ddprintf("IORB %Fp not found in queue %Fp\n", iorb, queue);
+    dprintf("IORB %Fp not found in queue %Fp\n", iorb, queue);
   }