Changeset 74

Timestamp:

Feb 16, 2011, 3:39:48 AM (14 years ago)

Author:

chris

Message:

• ATAPI fixes; still having trouble with INQUIRY command bein sent with incorrect direction
• fixes to port reset and restart handling
• improved ATA IDENTIFY handling based on ATA reset signature

Location:

trunk/src/os2ahci

Files:

• ahci.c (modified) (5 diffs)
• atapi.c (modified) (7 diffs)
• ctxhook.c (modified) (1 diff)
• init.asm (modified) (3 diffs)
• version.h (modified) (1 diff)

trunk/src/os2ahci/ahci.c

@@ -408 +408 @@
   AHCI_PORT_CFG *pc = NULL;
   u16 *id_buf;
+  int is_ata;
   int rc;
   int p;
+  int i;
 
   spin_lock(drv_lock);
@@ -453 +455 @@
       }
 
-      /* this port has a device attached and is ready to accept commands */
+      /* this port seems to have a device attached and ready for commands */
       ddprintf("port #%d seems to be attached to a device; probing...\n", p);
-      rc = ahci_exec_polled_cmd(ai, p, 0, 500, ATA_CMD_ID_ATA,
-                                AP_VADDR, (void _far *) id_buf, 512,
-                                AP_END);
-      if (rc != 0 || id_buf[ATA_ID_CONFIG] & (1U << 15)) {
-        /* this might be an ATAPI device; run IDENTIFY_PACKET_DEVICE */
-        rc = ahci_exec_polled_cmd(ai, p, 0, 500, ATA_CMD_ID_ATAPI,
+
+      /* Get ATA(PI) identity. The so-called signature gives us a hint whether
+       * this is an ATA or an ATAPI device but we'll try both in either case;
+       * the signature will merely determine whether we're going to probe for
+       * an ATA or ATAPI device, first, in order to reduce the chance of sending
+       * the wrong command (which would result in a port reset given the way
+       * ahci_exec_polled_cmd() was implemented).
+       */
+      is_ata = readl(port_base(ai, p) + PORT_SIG) == 0x00000101UL;
+      for (i = 0; i < 2; i++) {
+        rc = ahci_exec_polled_cmd(ai, p, 0, 500,
+                                  (is_ata) ? ATA_CMD_ID_ATA : ATA_CMD_ID_ATAPI,
                                   AP_VADDR, (void _far *) id_buf, 512,
                                   AP_END);
+        if (rc == 0) {
+          break;
+        }
+
+        /* try again with ATA/ATAPI swapped */
+        is_ata = !is_ata;
       }
 
       if (rc == 0) {
         /* we have a valid IDENTIFY or IDENTIFY_PACKET response */
-        ddphex(id_buf, 512, "ATA_IDENTIFY(_PACKET) results:\n");
+        ddphex(id_buf, 512, "ATA_IDENTIFY%s results:\n", (is_ata) ? "" : "_PACKET");
         ahci_setup_device(ai, p, 0, id_buf);
       } else {
@@ -1399 +1413 @@
   int d = iorb_unit_device(iorb);
 
+  dphex(((IORB_ADAPTER_PASSTHRU _far *) iorb)->pControllerCmd,
+        ((IORB_ADAPTER_PASSTHRU _far *) iorb)->ControllerCmdLen,
+        "ahci_execute_cdb(%d.%d.%d): ", a, p, d);
+
   if (ad_infos[a].ports[p].devs[d].atapi) {
     ahci_exec_iorb(iorb, 0, atapi_execute_cdb);
@@ -1418 +1436 @@
   dphex(((IORB_ADAPTER_PASSTHRU _far *) iorb)->pControllerCmd,
         ((IORB_ADAPTER_PASSTHRU _far *) iorb)->ControllerCmdLen,
-        "ahci_execute_cdb(%d.%d.%d)", a, p, d);
+        "ahci_execute_cdb(%d.%d.%d): ", a, p, d);
 
   if (ad_infos[a].ports[p].devs[d].atapi) {
@@ -1461 +1479 @@
     ai->ports[p].devs[d].atapi_16  = (id_buf[ATA_ID_CONFIG] & 0x0001U) != 0;
     ai->ports[p].devs[d].dev_type  = (id_buf[ATA_ID_CONFIG] & 0x1f00U) >> 8;
+    ai->ports[p].devs[d].ncq_max   = 1;
 
   } else {

trunk/src/os2ahci/atapi.c

@@ -24 +24 @@
 #include "ata.h"
 #include "atapi.h"
+
+/* need this for the SCSI status block */
+#include <scsi.h>
 
 /* -------------------------- macros and constants ------------------------- */
@@ -147 +150 @@
   u8 cdb[ATAPI_MAX_CDB_LEN];
   u16 cdb_len;
+  int old_debug;
 
   if (pt->ControllerCmdLen > ATAPI_MAX_CDB_LEN) {
@@ -155 +159 @@
   atapi_pad_cdb(pt->pControllerCmd, pt->ControllerCmdLen,
                 (u8 _far *) cdb, (u16 _far *) &cdb_len);
+
+  if (cdb[0] == 0x12) {
+    /* Some buggy entity asks for a SCSI INQUIRY command during boot without
+     * the flag PT_DIRECTION_IN which causes a timeout and port reset. The
+     * easiest way around this is to hack the flag PT_DIRECTION_IN into the
+     * request because SCSI INQUIRY commands are always device -> host.
+     */
+    pt->Flags |= PT_DIRECTION_IN;
+    old_debug = debug;
+    debug = 2;
+  }
 
   /* we do not perform the S/G limitation recovery loop here:
@@ -175 +190 @@
   }
   
+  if (cdb[0] == 0x12) {
+    debug = old_debug;
+  }
+
   return(rc);
 }
@@ -190 +209 @@
 int atapi_req_sense(IORBH _far *iorb, int slot)
 {
+  SCSI_STATUS_BLOCK _far *ssb;
   ADD_WORKSPACE _far *aws = add_workspace(iorb);
   int rc;
   u8 cdb[ATAPI_MIN_CDB_LEN];
   ATAPI_CDB_6 _far *pcdb = (ATAPI_CDB_6 _far *) cdb;
-  
+
+  if ((iorb->RequestControl & IORB_REQ_STATUSBLOCK) &&
+      iorb->StatusBlockLen >= sizeof(*ssb) && iorb->pStatusBlock != 0) {
+
+    /* don't request sense data if caller asked us not to; the flag
+     * STATUS_DISABLE_REQEST_SENSE is not defined in the old DDK we've been
+     * using so we'll use the hard-coded value (0x0008) */
+    ssb = (SCSI_STATUS_BLOCK _far *) (((u32) iorb & 0xffff0000U) +
+                                       (u16) iorb->pStatusBlock);
+    if (ssb->Flags & 0x0008U) {
+      /* set a generic error code and skip automatic sense code handling */
+      iorb_seterr(iorb, IOERR_DEVICE_NONSPECIFIC);
+      return(-1);
+    }
+  }
+
   /* allocate sense buffer in ADD workspace */
-  aws->buf = malloc(ATAPI_SENSE_LEN);
-  if (aws->buf == NULL) {
+  if ((aws->buf = malloc(ATAPI_SENSE_LEN)) == NULL) {
     iorb_seterr(iorb, IOERR_CMD_SW_RESOURCE);
     return(-1);
@@ -238 +272 @@
 static void atapi_req_sense_pp(IORBH _far *iorb)
 {
+  SCSI_STATUS_BLOCK _far *ssb;
   ADD_WORKSPACE _far *aws = add_workspace(iorb);
   ATAPI_SENSE_DATA *psd = (ATAPI_SENSE_DATA *) aws->buf;
 
-  dphex(psd, sizeof(psd), "sense buffer:\n");
+  dphex(psd, sizeof(*psd), "sense buffer:\n");
+
+  if ((iorb->RequestControl & IORB_REQ_STATUSBLOCK) &&
+      iorb->StatusBlockLen >= sizeof(*ssb) && iorb->pStatusBlock != 0) {
+
+    /* copy sense data to IORB */
+    ssb = (SCSI_STATUS_BLOCK _far *) (((u32) iorb & 0xffff0000U) +
+                                       (u16) iorb->pStatusBlock);
+    ssb->AdapterErrorCode = 0;
+    ssb->TargetStatus = SCSI_STAT_CHECKCOND;
+    ssb->ResidualLength = 0;
+    memset(ssb->AdapterDiagInfo, 0x00, sizeof(ssb->AdapterDiagInfo));
+
+    if (ssb->SenseData != NULL) {
+      memcpy(ssb->SenseData, psd, max(ssb->ReqSenseLen, ATAPI_SENSE_LEN));
+      ssb->Flags != STATUS_SENSEDATA_VALID;
+    }
+  }
 
   /* map sense data to some IOERR_ value */
@@ -248 +300 @@
   case ASENSE_NO_SENSE:
   case ASENSE_RECOVERED_ERROR:
-    /* no error */
+    /* no error; this shouldn't happen because we'll only call
+     * atapi_req_sense() if we received an error interrupt */
+    iorb_seterr(iorb, IOERR_DEVICE_NONSPECIFIC);
     break;
 

trunk/src/os2ahci/ctxhook.c

@@ -143 +143 @@
         /* sanity check: issued command bitmaps should be 0 now */
         if (ai->ports[p].ncq_cmds != 0 || ai->ports[p].reg_cmds != 0) {
-          dprintf("warning: commands issued not 0 (%08lx/%08lx)\n",
+          dprintf("warning: commands issued not 0 (%08lx/%08lx); resetting...\n",
                   ai->ports[p].ncq_cmds, ai->ports[p].reg_cmds);
+          need_reset = 1;
         }
 

trunk/src/os2ahci/init.asm

@@ -51 +51 @@
 
 _DATA           SEGMENT WORD PUBLIC 'DATA'
-readl_dbg_fmt   db      "readl(%04x:%04x) = 0x%08lx [addr %% 0x80 = 0x%02x]"
+readl_dbg_fmt   db      "readl(%04x:%04x) = 0x%08lx"
                 db      10, 0
-writel_dbg_fmt  db      "writel(%04x:%04x, 0x%08lx) [addr %% 0x80 = 0x%02x]"
+writel_dbg_fmt  db      "writel(%04x:%04x, 0x%08lx)"
                 db      10, 0
 _DATA           ENDS
@@ -143 +143 @@
                 JB      no_debug
                 PUSH    EDX             ; save value read from MMIO port
-                MOV     BX, AX          ; addr & 0x7f (port reg index)
-                AND     BX, 7FH
-                PUSH    BX
                 PUSH    EDX             ; value read from MMIO address
                 PUSH    AX              ; offset of MMIO address
@@ -187 +184 @@
                 CMP     _debug, 3
                 JB      no_debug2
-                MOV     BX, AX          ; addr & 0x7f (port reg index)
-                AND     BX, 7FH
-                PUSH    BX
                 PUSH    EDX             ; value written to MMIO address
                 PUSH    AX              ; offset of MMIO address

trunk/src/os2ahci/version.h

@@ -6 +6 @@
 
 
-#define VERSION            100       /* driver version (2 implied decimals) */
+#define VERSION            101       /* driver version (2 implied decimals) */
 
 /* BLDLEVEL information (in C source modules added via macro