Changeset 13 for trunk/src/os2ahci/ata.c

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)
• ata.c (moved) (moved from trunk/src/ata.c ) (10 diffs)

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