Changeset 13 for trunk/src/os2ahci/ahci.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)
• ahci.c (moved) (moved from trunk/src/ahci.c ) (10 diffs)

trunk/src/os2ahci/ahci.c

@@ -171 +171 @@
         if (val & HOST_CAP_EMS)        printf(" ems");
         if (val & HOST_CAP_SXS)        printf(" sxs");
-        printf(" ports:%d", (val & 0x1f) + 1);
+        printf(" cmd_slots:%d", (u16) ((val >> 8) & 0x1f) + 1);
+        printf(" ports:%d",     (u16) (val & 0x1f) + 1);
 
       } else if (i == HOST_CTL) {
@@ -829 +830 @@
   ULONG timeout = (iorb->Timeout > 0) ? iorb->Timeout : DEFAULT_TIMEOUT;
   u8 _far *port_mmio = port_base(ai, iorb_unit_port(iorb));
+  u16 cmd_max = ai->cmd_max;
   int i;
 
   /* determine whether this will be an NCQ request */
-  aws->is_ncq = ((ai->cap & HOST_CAP_NCQ) && ncq_capable && !aws->no_ncq);
-
-  /* NCQ disabled temporarily until non-NCQ commands are fully working */
   aws->is_ncq = 0;
-
-  /* check whether adapter is available */
+  if (ncq_capable && port->devs[iorb_unit_device(iorb)].ncq_max > 1 &&
+      (ai->cap & HOST_CAP_NCQ) && !aws->no_ncq && init_complete) {
+
+    /* We can make this an NCQ request; limit command slots to the maximum
+     * NCQ tag number reported by the device - 1. Why "minus one"? I seem to
+     * recall an issue related to using all 32 tag numbers but can't quite
+     * pinpoint it right now. One less won't make much of a difference...
+     */
+    aws->is_ncq = 1;
+    if ((cmd_max = port->devs[iorb_unit_device(iorb)].ncq_max - 1) > ai->cmd_max) {
+      cmd_max = ai->cmd_max;
+    }
+    ddprintf("NCQ command; cmd_max = %d->%d\n", (u16) ai->cmd_max, cmd_max);
+  }
+
+  /* make sure adapter is available */
   spin_lock(drv_lock);
   if (!ai->busy) {
@@ -849 +862 @@
     }
 
-    /* prevent NCQ/regular command mix */
-    if (aws->is_ncq && port->reg_cmds == 0 ||
-        !aws->is_ncq && port->ncq_cmds == 0) {
+    /* make sure we don't mix NCQ and regular commands */
+    if (aws->is_ncq && port->reg_cmds == 0 || !aws->is_ncq && port->ncq_cmds == 0) {
 
       /* Find next available command slot. We use a simple round-robin 
@@ -858 +870 @@
        */
       cmds = (aws->is_ncq) ? &port->ncq_cmds : &port->reg_cmds;
-      for (i = 0; i <= ai->cmd_max; i++) {
+      for (i = 0; i <= cmd_max; i++) {
+        if (++(port->cmd_slot) > cmd_max) {
+          port->cmd_slot = 0;
+        }
         if ((*cmds & (1UL << port->cmd_slot)) == 0) {
           break;
-        }
-        if (++(port->cmd_slot) > ai->cmd_max) {
-          port->cmd_slot = 0;
         }
       }
@@ -895 +907 @@
         readl(port_mmio + PORT_CMD_ISSUE); /* flush */
 
-        /* make sure next cmd won't use the same slot to prevent starvation */
-        if (++(port->cmd_slot) > ai->cmd_max) {
-          port->cmd_slot = 0;
-        }
         spin_unlock(drv_lock);
         return;
@@ -916 +924 @@
  *
  *  - We need to restore the BIOS configuration after we're done with this
- *    command because someone might still call int 13 routines; sending
+ *    command because someone might still call int 13h routines; sending
  *    asynchronous commands and waiting for interrupts to indicate completion
  *    won't work in such a scenario.
@@ -1226 +1234 @@
   u8 _far *port_mmio = port_base(ai, p);
   int reset_port = 0;
+  u32 tmp;
 
   /* Handle adapter and interface errors. Those typically require a port
@@ -1336 +1345 @@
   dphex(((IORB_ADAPTER_PASSTHRU _far *) iorb)->pControllerCmd,
         ((IORB_ADAPTER_PASSTHRU _far *) iorb)->ControllerCmdLen,
-        "ahci_execute_cdb(%d.%d.%d)", (int) iorb_unit_adapter(iorb),
-        (int) iorb_unit_port(iorb), (int) iorb_unit_device(iorb));
+        "ahci_execute_cdb(%d.%d.%d)", a, p, d);
   
   if (ad_infos[a].ports[p].devs[d].atapi) {
@@ -1358 +1366 @@
   dphex(((IORB_ADAPTER_PASSTHRU _far *) iorb)->pControllerCmd,
         ((IORB_ADAPTER_PASSTHRU _far *) iorb)->ControllerCmdLen,
-        "ahci_execute_cdb(%d.%d.%d)", (int) iorb_unit_adapter(iorb),
-        (int) iorb_unit_port(iorb), (int) iorb_unit_device(iorb));
+        "ahci_execute_cdb(%d.%d.%d)", a, p, d);
   
   if (ad_infos[a].ports[p].devs[d].atapi) {
@@ -1403 +1410 @@
   } else {
     /* complete ATA-specific device information */
-    ai->ports[p].devs[d].ncq_max   = id_buf[ATA_ID_QUEUE_DEPTH] & 0x001fU;
-    if (id_buf[ATA_ID_CFS_ENABLE_2] & 0x40) {
+    if (!disable_ncq[ad_no(ai)][p]) {
+      ai->ports[p].devs[d].ncq_max = id_buf[ATA_ID_QUEUE_DEPTH] & 0x001fU;
+    }
+    if (id_buf[ATA_ID_CFS_ENABLE_2] & 0x0400U) {
       ai->ports[p].devs[d].lba48   = 1;
     }