Changeset 65 for trunk

Timestamp:

Dec 21, 2010, 6:06:19 PM (15 years ago)

Author:

root

Message:

added padding to ATAPI CDBs

Location:

trunk/src/os2ahci

Files:

• atapi.c (modified) (9 diffs)
• atapi.h (modified) (3 diffs)

trunk/src/os2ahci/atapi.c

@@ -32 +32 @@
 
 static void atapi_req_sense_pp      (IORBH _far *iorb);
-
 
 /* ------------------------ global/static variables ------------------------ */
@@ -94 +93 @@
                  AP_DEVICE,    0x4000,
                  AP_FEATURES,  ATAPI_FEAT_DMA | ATAPI_FEAT_DMA_TO_HOST,
-                 AP_SECTOR_28, ATAPI_LBA_DMA,
                  AP_END);
 
@@ -145 +143 @@
   IORB_ADAPTER_PASSTHRU _far *pt = (IORB_ADAPTER_PASSTHRU _far *) iorb;
   int rc;
+  u8 cdb[ATAPI_MAX_CDB_LEN] = {0};
+  u16 cdb_len;
+
+  if (pt->ControllerCmdLen > ATAPI_MAX_CDB_LEN) {
+    ioerb_seterr(IOERR_CMD_SYNTAX);
+    return -1;
+  }
+  /* AHCI requires 12 or 16 byte commands; for now, we pad them
+   * since I have no idea what to do with commands that do not
+   * have a 12 or 16 byte equivalent */
+  memcpy(cdb, pt->pControllerCmd, pt->ControllerCmdLen);
+  cdb_len = max(ATAPI_MIN_CDB_LEN, pt->ControllerCmdLen);
 
   /* we do not perform the S/G limitation recovery loop here:
@@ -154 +164 @@
                iorb_unit_device(iorb),
                slot, ATA_CMD_PACKET,
-               AP_ATAPI_CMD, (void _far *) pt->pControllerCmd, 
-                             pt->ControllerCmdLen,
+               AP_ATAPI_CMD, (void _far *) cdb, cdb_len,
                AP_SGLIST,    pt->pSGList, pt->cSGList,
                /* TODO: do we have to clear DMA_TO_HOST bit for
@@ -161 +170 @@
                 */
                AP_FEATURES,  ATAPI_FEAT_DMA | ATAPI_FEAT_DMA_TO_HOST,
-               AP_SECTOR_28, ATAPI_LBA_DMA,
                AP_END);
 
@@ -184 +192 @@
 {
   ADD_WORKSPACE _far *aws = add_workspace(iorb);
-  ATAPI_CDB_6 cdb;
   int rc;
+  u8 cdb[ATAPI_MIN_CDB_LEN];
+  ATAPI_CDB_6 *pcdb; = (ATAPI_CDB_6*) cdb;
   
   /* allocate sense buffer in ADD workspace */
@@ -196 +205 @@
 
   /* prepare request sense command */
-  memset(&cdb, 0x00, sizeof(cdb));
-  cdb.cmd = ATAPI_CMD_REQUEST_SENSE;
-  cdb.trans_len = (u8) ATAPI_SENSE_LEN;
+  memset(cdb, 0x00, sizeof(cdb));
+  pcdb->cmd = ATAPI_CMD_REQUEST_SENSE;
+  pcdb->trans_len = (u8) ATAPI_SENSE_LEN;
   
   aws->ppfunc = atapi_req_sense_pp;
@@ -206 +215 @@
                slot,
                ATA_CMD_PACKET,
-               AP_ATAPI_CMD, (void _far*) &cdb, sizeof(cdb),
+               AP_ATAPI_CMD, (void _far*) cdb, sizeof(cdb),
                AP_VADDR, (void _far *) aws->buf, ATAPI_SENSE_LEN,
                AP_FEATURES,  ATAPI_FEAT_DMA,
-               AP_SECTOR_28, ATAPI_LBA_DMA,
                AP_END);
 
   if (rc > 0) {
-    /* should never happen - we got 64 bytes here */
     iorb_seterr(iorb, IOERR_CMD_SGLIST_BAD);
 
@@ -281 +288 @@
 
 }
+

trunk/src/os2ahci/atapi.h

@@ -22 +22 @@
 
 /* -------------------------- macros and constants ------------------------- */
+
+#define ATAPI_MIN_CDB_LEN   12   /* minimum ATAPI CDB len acc to AHCI spec */
+#define ATAPI_MAX_CDB_LEN   16
 
 /******************************************************************************
@@ -68 +71 @@
 #define ATAPI_FEAT_DMA             0x0001
 #define ATAPI_FEAT_DMA_TO_HOST     0x0004
-
-#define ATAPI_LBA_DMA              ((u32)0xffff << 8)
 
 /******************************************************************************
@@ -152 +153 @@
   u8   lun;            /* SCSI lun (ignored) */
   u8   resvd[2];
-  u8   trans_len;      /* trasnfer length */
+  u8   trans_len;      /* transfer length */
   u8   control;
 } ATAPI_CDB_6;