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

Timestamp:

Jun 21, 2011, 2:39:30 PM (14 years ago)

Author:

Markus Thielen

Message:

contains CMs changes for unaligned buffers; removed unused stack var; let driver continue boot on unknown command line switch

File:

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

trunk/src/os2ahci/atapi.c

@@ -80 +80 @@
   int rc;
 
+  if (io->BlockCount == 0) {
+    /* NOP; return -1 without error in IORB to indicate success */
+    return(-1);
+  }
+
+  if (add_workspace(iorb)->unaligned) {
+    /* unaligned S/G addresses present; need to use double buffers */
+    return(atapi_read_unaligned(iorb, slot));
+  }
+
   /* translate read command to SCSI/ATAPI READ12 command.
    * READ12 seems to be the most supported READ variant - according to MMC,
@@ -112 +122 @@
   if (rc == 0) {
     add_workspace(iorb)->blocks = count;
+    add_workspace(iorb)->ppfunc = ata_read_pp;
+
+  } else if (rc > 0) {
+    iorb_seterr(iorb, IOERR_CMD_SGLIST_BAD);
+
+  } else if (rc == ATA_CMD_UNALIGNED_ADDR) {
+    /* unaligned S/G addresses detected; need to use double buffers */
+    add_workspace(iorb)->unaligned = 1;
+    return(atapi_read_unaligned(iorb, slot));
+
+  } else {
+    iorb_seterr(iorb, IOERR_CMD_ADD_SOFTWARE_FAILURE);
+  }
+
+  return(rc);
+}
+
+/******************************************************************************
+ * Read sectors from AHCI device with unaligned S/G element addresses. AHCI
+ * only allows aligned S/G addresses while OS/2 doesn't have these kind of
+ * restrictions. This doesn't happen very often but when it does, we need to
+ * use a transfer buffer and copy the data manually.
+ */
+int atapi_read_unaligned(IORBH _far *iorb, int slot)
+{
+  IORB_EXECUTEIO _far *io = (IORB_EXECUTEIO _far *) iorb;
+  ADD_WORKSPACE _far *aws = add_workspace(iorb);
+  ATAPI_CDB_12 cdb;
+  AD_INFO *ai = ad_infos + iorb_unit_adapter(iorb);
+  int p = iorb_unit_port(iorb);
+  int d = iorb_unit_device(iorb);
+  int rc;
+
+  /* translate read command to SCSI/ATAPI READ12 command.
+   * READ12 seems to be the most supported READ variant - according to MMC,
+   * and it's enough even for BluRay.
+   */
+  memset(&cdb, 0x00, sizeof(cdb));
+  cdb.cmd = ATAPI_CMD_READ_12;
+  SET_CDB_32(cdb.lba, io->RBA + io->BlocksXferred);
+  SET_CDB_32(cdb.trans_len, 1);
+
+  /* allocate transfer buffer */
+  if ((aws->buf = malloc(io->BlockSize)) == NULL) {
+    iorb_seterr(iorb, IOERR_CMD_SW_RESOURCE);
+    return(-1);
+  }
+
+  rc = ata_cmd(ai, p, d, slot, ATA_CMD_PACKET,
+               AP_ATAPI_CMD, (void _far *) &cdb, sizeof(cdb),
+               AP_VADDR,     (void _far *) aws->buf, (u16) io->BlockSize,
+               AP_DEVICE,    0x40,
+               AP_FEATURES,  ATAPI_FEAT_DMA | ATAPI_FEAT_DMA_TO_HOST,
+               AP_END);
+
+  if (rc == 0) {
+    add_workspace(iorb)->blocks = 1;
     add_workspace(iorb)->ppfunc = ata_read_pp;