Changeset 13 for trunk

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)
• Makefile (moved) (moved from trunk/src/Makefile )
• ahci.c (moved) (moved from trunk/src/ahci.c ) (10 diffs)
• ahci.h (moved) (moved from trunk/src/ahci.h )
• ata.c (moved) (moved from trunk/src/ata.c ) (10 diffs)
• ata.h (moved) (moved from trunk/src/ata.h ) (1 diff)
• atapi.c (moved) (moved from trunk/src/atapi.c ) (1 diff)
• atapi.h (moved) (moved from trunk/src/atapi.h )
• ctxhook.c (moved) (moved from trunk/src/ctxhook.c )
• init.asm (moved) (moved from trunk/src/init.asm ) (3 diffs)
• install.cmd (moved) (moved from trunk/src/install.cmd )
• libc.c (moved) (moved from trunk/src/libc.c ) (6 diffs)
• os2ahci.c (moved) (moved from trunk/src/os2ahci.c ) (16 diffs)
• os2ahci.def (moved) (moved from trunk/src/os2ahci.def )
• os2ahci.h (moved) (moved from trunk/src/os2ahci.h ) (5 diffs)
• os2ahci.sym (moved) (moved from trunk/src/os2ahci.sym )
• pci.c (moved) (moved from trunk/src/pci.c ) (4 diffs)
• wmakefile (moved) (moved from trunk/src/wmakefile )

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

trunk/src/os2ahci/ata.c

@@ -99 +99 @@
 
     case AP_WRITE:
-      ahci_flags |= AHCI_CMD_WRITE;
+      if (va_arg(va, u16) != 0) {
+        ahci_flags |= AHCI_CMD_WRITE;
+      }
       break;
 
@@ -126 +128 @@
       ata_cmd.lba_h = va_arg(va, u16);
       break;
-
+    
     case AP_DEVICE:
       /* ATA device byte */
@@ -147 +149 @@
 
     case AP_ATAPI_CMD:
+      /* ATAPI command */
       atapi_cmd = va_arg(va, void _far *);
       atapi_cmd_len = va_arg(va, u16);
       ahci_flags |= AHCI_CMD_ATAPI;
+      break;
+
+    case AP_ATA_CMD:
+      /* ATA command "pass-through" */
+      memcpy(&ata_cmd, va_arg(va, void _far *), sizeof(ATA_CMD));
       break;
 
@@ -236 +244 @@
         return(i - 1);
       }
-      ddprintf("s/g list element: addr = 0x%08lx, size = 0x%04lx\n", sg_addr, chunk);
       cmd_tbl->sg_list[n].addr = sg_addr;
       cmd_tbl->sg_list[n].size = chunk - 1;
@@ -515 +522 @@
     sg_cnt = io->cSGList - sg_indx;
 
-    if (sector >= (1UL << 28) || count > 256) {
+    if (sector >= (1UL << 28) || count > 256 || add_workspace(iorb)->is_ncq) {
       /* need LBA48 for this command */
       if (!ai->ports[p].devs[d].lba48) {
@@ -521 +528 @@
         return(-1);
       }
-      rc = ata_cmd(ai, p, d, slot, ATA_CMD_READ_EXT,
-                   AP_SECTOR_48, (u32) sector, (u16) 0,
-                   AP_COUNT,     (u16) count,
-                   AP_SGLIST,    io->pSGList + sg_indx, (u16) sg_cnt,
-                   AP_DEVICE,    0x4000,
-                   AP_END);
+      if (add_workspace(iorb)->is_ncq) {
+        /* use NCQ read; count goes into feature register, tag into count! */
+        rc = ata_cmd(ai, p, d, slot, ATA_CMD_FPDMA_READ,
+                     AP_SECTOR_48, (u32) sector, (u16) 0,
+                     AP_FEATURES,  (u16) count,
+                     AP_COUNT,     (u16) slot, /* tag = slot */
+                     AP_SGLIST,    io->pSGList + sg_indx, (u16) sg_cnt,
+                     AP_DEVICE,    0x4000,
+                     AP_END);
+      } else {
+        rc = ata_cmd(ai, p, d, slot, ATA_CMD_READ_EXT,
+                     AP_SECTOR_48, (u32) sector, (u16) 0,
+                     AP_COUNT,     (u16) count,
+                     AP_SGLIST,    io->pSGList + sg_indx, (u16) sg_cnt,
+                     AP_DEVICE,    0x4000,
+                     AP_END);
+      }
+
     } else {
       rc = ata_cmd(ai, p, d, slot, ATA_CMD_READ,
@@ -630 +649 @@
     sg_cnt = io->cSGList - sg_indx;
 
-    if (sector >= (1UL << 28) || count > 256) {
+    if (sector >= (1UL << 28) || count > 256 || add_workspace(iorb)->is_ncq) {
       /* need LBA48 for this command */
       if (!ai->ports[p].devs[d].lba48) {
@@ -636 +655 @@
         return(-1);
       }
-      rc = ata_cmd(ai, p, d, slot, ATA_CMD_WRITE_EXT,
-                   AP_SECTOR_48, (u32) sector, (u16) 0,
-                   AP_COUNT,     (u16) count,
-                   AP_SGLIST,    io->pSGList + sg_indx, (u16) sg_cnt,
-                   AP_DEVICE,    0x4000,
-                   AP_WRITE,
-                   AP_END);
+      if (add_workspace(iorb)->is_ncq) {
+        /* use NCQ write; count goes into feature register, tag into count! */
+        rc = ata_cmd(ai, p, d, slot, ATA_CMD_FPDMA_WRITE,
+                     AP_SECTOR_48, (u32) sector, (u16) 0,
+                     AP_FEATURES,  (u16) count,
+                     AP_COUNT,     (u16) slot, /* tag = slot */
+                     AP_SGLIST,    io->pSGList + sg_indx, (u16) sg_cnt,
+                     AP_DEVICE,    0xc000,   /* force unit access (FUA) */
+                     AP_WRITE,     1,
+                     AP_END);
+      } else {
+        rc = ata_cmd(ai, p, d, slot, ATA_CMD_WRITE_EXT,
+                     AP_SECTOR_48, (u32) sector, (u16) 0,
+                     AP_COUNT,     (u16) count,
+                     AP_SGLIST,    io->pSGList + sg_indx, (u16) sg_cnt,
+                     AP_DEVICE,    0x4000,
+                     AP_WRITE,     1,
+                     AP_END);
+      }
+      
     } else {
       rc = ata_cmd(ai, p, d, slot, ATA_CMD_WRITE,
@@ -699 +731 @@
 int ata_execute_ata(IORBH _far *iorb, int slot)
 {
-  iorb_seterr(iorb, IOERR_CMD_NOT_SUPPORTED);
-  return(-1);
+  IORB_ADAPTER_PASSTHRU _far *apt = (IORB_ADAPTER_PASSTHRU _far *) iorb;
+  AD_INFO *ai = ad_infos + iorb_unit_adapter(iorb);
+  int p = iorb_unit_port(iorb);
+  int d = iorb_unit_device(iorb);
+  int rc;
+
+  if (apt->ControllerCmdLen != sizeof(ATA_CMD)) {
+    iorb_seterr(iorb, IOERR_CMD_SYNTAX);
+    return(-1);
+  }
+
+  rc = ata_cmd(ai, p, d, slot, 0,
+               AP_SGLIST,   apt->pSGList, apt->ppSGLIST,
+               AP_ATA_CMD,  apt->pControllerCmd,
+               AP_WRITE,    !(apt->Flags & PT_DIRECTION_IN),
+               AP_END);
+
+  return(rc);
 }
 
@@ -745 +793 @@
   }
 
-  /* TBD: fill in SCSI sense buffer in IORB */
-
   /* Return an error to indicate there's no HW command to be submitted and
    * that the IORB can be completed "as is" (the upstream code expects the

trunk/src/os2ahci/ata.h

@@ -389 +389 @@
  */
 typedef enum {
-  AP_FEATURES,     /* [u16]              ATA command features (read: flags) */
-  AP_COUNT,        /* [u16]              number of sectors (0 = 65536)      */
-  AP_SECTOR_28,    /* [u32]              28-bit sector address              */
-  AP_SECTOR_48,    /* [u32, u16]         48-bit sector address              */
-  AP_DEVICE,       /* [u16]              ATA command "device" field (LSB ignored) */
-  AP_SGLIST,       /* [void _far *, u16] buffer S/G (SCATGATENTRY/count)    */
-  AP_VADDR,        /* [void _far *, u16] buffer virtual address (buf/len)   */
-  AP_WRITE,        /* []                 indicates a DMA write operation    */
-  AP_AHCI_FLAGS,   /* [u16]              AHCI command header flags          */
-  AP_ATAPI_CMD,    /* [void _far *, u16] ATAPI command (CDB) and length     */
-  AP_END           /* []                 end of variable argument list      */
+  AP_FEATURES,     /* [u16]               ATA command features (read: flags) */
+  AP_COUNT,        /* [u16]               number of sectors (0 = 65536)      */
+  AP_SECTOR_28,    /* [u32]               28-bit sector address              */
+  AP_SECTOR_48,    /* [u32, u16]          48-bit sector address              */
+  AP_DEVICE,       /* [u16]               ATA cmd "device" field (LSB masked) */
+  AP_SGLIST,       /* [void _far *, u16]  buffer S/G (SCATGATENTRY/count)    */
+  AP_VADDR,        /* [void _far *, u16]  buffer virtual address (buf/len)   */
+  AP_WRITE,        /* [u16]               if != 0, data is written to device */
+  AP_AHCI_FLAGS,   /* [u16]               AHCI command header flags          */
+  AP_ATAPI_CMD,    /* [void _far *, u16]  ATAPI command (CDB) and length     */
+  AP_ATA_CMD,      /* [void _far *]       ATA command (fixed len)            */
+  AP_END           /* []                  end of variable argument list      */
 } ATA_PARM;
 

trunk/src/os2ahci/atapi.c

@@ -89 +89 @@
 
 /******************************************************************************
- * Request sense information.
+ * Request sense information for a failed command.
+ *
+ * NOTE: This function must be called right after an ATAPI command has failed
+ *       and before any other commands are queued on the corresponding device.
+ *       This function is typically called in the port restart context hook
+ *       which is triggered by an AHCI error interrupt.
+ *
  */
 int atapi_req_sense(IORBH _far *iorb, int slot)

trunk/src/os2ahci/init.asm

@@ -158 +158 @@
 
 
-; Write long value to MMIO address;  need to do this here to get real
+; Write long value to MMIO address; need to do this here to get real
 ; 32-bit operations because at least the AHCI device in VirtualBox doesn't
 ; seem to support reading 32-bit MMIO registers in two 16-bit steps and the
@@ -182 +182 @@
                 ; print debug message if debug level is 3+
                 CMP     _debug, 3
-                JB      no_debug2
+                JB      no_debug
                 MOV     BX, AX          ; addr & 0x7f (port reg index)
                 AND     BX, 7FH
@@ -193 +193 @@
                 ADD     SP, 12
 
-no_debug2:      LEAVE
+no_debug:       LEAVE
                 RET
 _writel         ENDP

trunk/src/os2ahci/libc.c

@@ -27 +27 @@
                                        * for printing custom messages via
                                        * DevHelp_Save_Message() */
-
-#define COM_BASE              0x03f8  /* base address of COM port (COM1) */
 
 /* heap management constants */
@@ -54 +52 @@
 
 /* ------------------------ global/static variables ------------------------ */
+
+/* debug COM port base address */
+u16 com_base = 0x03f8;
 
 static char  hex_digits[] = "0123456789abcdef";
@@ -99 +100 @@
 
   for (i = 0; com1_init_sequence[i].reg != -1; i++) {
-    u16 port = COM_BASE + com1_init_sequence[i].reg;
+    u16 port = com_base + com1_init_sequence[i].reg;
     u8  data = com1_init_sequence[i].data;
     _asm {
@@ -248 +249 @@
      * The C equivalent would look like this:
      *
-     *   while (!(inp(COM_BASE + 5) & 0x20));
-     *   outp(COM_BASE, *s);
+     *   while (!(inp(com_base + 5) & 0x20));
+     *   outp(com_base, *s);
      */
 
     _asm {
       /* wait until COM transmitter is idle */
-      mov  dx, COM_BASE + 5;
+      mov  dx, com_base;
+      add  dx, 5;
     transmitter_not_idle:
       in   al, dx;
@@ -261 +263 @@
 
       /* output character to be sent */
-      mov  dx, COM_BASE;
+      mov  dx, com_base;
       mov  bx, s;
       mov  al, [bx];
@@ -655 +657 @@
 int disable(void)
 {
-  int rc = 0;
+  int rc;
 
   _asm {

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

trunk/src/os2ahci/os2ahci.h

@@ -261 +261 @@
   IORB_QUEUE    iorb_queue;            /* IORB queue for this port */
   unsigned      dev_max   : 4;         /* maximum device number on this port (0-15) */
-  unsigned      cmd_slot  : 4;         /* current command slot index (using round-
+  unsigned      cmd_slot  : 5;         /* current command slot index (using round-
                                         * robin indexes to prevent starvation) */
 
@@ -284 +284 @@
   PCI_ID       *pci;                   /* pointer to corresponding PCI ID */
 
-  unsigned      port_max : 4;          /* maximum port number (0-31) */
-  unsigned      cmd_max : 4;           /* maximum cmd slot number (0-31) */
+  unsigned      port_max : 5;          /* maximum port number (0-31) */
+  unsigned      cmd_max : 5;           /* maximum cmd slot number (0-31) */
   unsigned      port_scan_done : 1;    /* if != 0, port scan already done */
   unsigned      busy : 1;              /* if != 0, adapter is busy */
@@ -327 +327 @@
   unsigned      is_ncq        : 1;     /* should use native command queueing */
   unsigned      complete      : 1;     /* IORB has completed processing */
-  unsigned      cmd_slot      : 4;     /* AHCI command slot for this IORB */
+  unsigned      cmd_slot      : 5;     /* AHCI command slot for this IORB */
 } ADD_WORKSPACE;
 
@@ -452 +452 @@
 extern int           init_complete; /* if != 0, initialization has completed */
 
+extern u16           com_base;      /* debug COM port base address */
+
 /* port restart context hook and input data */
 extern ULONG         restart_ctxhook_h;
@@ -465 +467 @@
 
 /* apapter/port-specific options saved when parsing the command line */
-extern int           link_speed[MAX_AD][AHCI_MAX_PORTS];
-
+extern u8            link_speed[MAX_AD][AHCI_MAX_PORTS];
+extern u8            disable_ncq[MAX_AD][AHCI_MAX_PORTS];
+

trunk/src/os2ahci/pci.c

@@ -483 +483 @@
   UCHAR dev_func  = data->find_class.dev_func;
   ULONG val;
+  UCHAR rc;
   SEL gdt[PORT_DMA_BUF_SEGS + 1];
   char tmp[40];
@@ -829 +830 @@
 {
   void (_far *func)(void);
-  unsigned short prot_idc_DS;
   RP_GENIOCTL ioctl;
 
@@ -867 +867 @@
   func = oemhlp.ProtIDCEntry;
 
-  /* MT: the Watcom inline assembler does not support struct member reference,
-   * so we have to pass it in a stack variable
-   */
-  prot_idc_DS = oemhlp.ProtIDC_DS;
-
   _asm {
     push ds;
@@ -882 +877 @@
     pop  es
     lea  bx, ioctl;
-    mov  ds, prot_idc_DS;
+    mov  ds, oemhlp.ProtIDC_DS;
     call dword ptr [func];