Changeset 74 for trunk/src/os2ahci/atapi.c

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

File:

• trunk/src/os2ahci/atapi.c (modified) (7 diffs)

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;