Changeset 71 for trunk/src/os2ahci/ahci.c

Timestamp:

Feb 15, 2011, 1:18:21 PM (14 years ago)

Author:

chris

Message:

• Added minimum NCQ depth for SATA devices which don't support NCQ at all
• Removed ATAPI devices from the flush cache queue as they caused timeouts with a DVD drive in an HP test box
• Various cosmetic changes to debug levels, etc.

File:

• trunk/src/os2ahci/ahci.c (modified) (5 diffs)

trunk/src/os2ahci/ahci.c

@@ -553 +553 @@
 
   /* enable interrupts on PCI-level (PCI 2.3 added a feature to disable ints) */
-  pci_enable_int(ai->bus, ai->dev_func);
+  /* pci_enable_int(ai->bus, ai->dev_func); */
 
   return(0);
@@ -1103 +1103 @@
 int ahci_flush_cache(AD_INFO *ai, int p, int d)
 {
-  dprintf("flushing cache on %d.%d.%d\n", ad_no(ai), p, d);
-  return(ahci_exec_polled_cmd(ai, p, d, 30000,
-                              ai->ports[p].devs[d].lba48 ? ATA_CMD_FLUSH_EXT
-                                                         : ATA_CMD_FLUSH,
-                              AP_END));
+  if (!ai->ports[p].devs[d].atapi) {
+    dprintf("flushing cache on %d.%d.%d\n", ad_no(ai), p, d);
+    return(ahci_exec_polled_cmd(ai, p, d, 30000,
+                                ai->ports[p].devs[d].lba48 ? ATA_CMD_FLUSH_EXT
+                                                           : ATA_CMD_FLUSH,
+                                AP_END));
+  }
 }
 
@@ -1397 +1399 @@
   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);
@@ -1471 +1469 @@
       dprintf("NCQ off for a:%d p:%d\n", (int) ad_no(ai), p);
     } else {
-      ai->ports[p].devs[d].ncq_max = id_buf[ATA_ID_QUEUE_DEPTH] & 0x001fU;
+      ai->ports[p].devs[d].ncq_max = max(1, id_buf[ATA_ID_QUEUE_DEPTH] & 0x001fU);
       dprintf("NCQ max=%d for a:%d p:%d\n", ai->ports[p].devs[d].ncq_max, (int) ad_no(ai), p);
     }
@@ -1518 +1516 @@
   if (ai == ad_infos && p == 7 &&
       ai->pci->vendor == 0x8086 && ai->pci->device == 0x2829 &&
-      !memcmp(ds.DevDescriptName, "VBOX HARDDISK", 13)) {
+      !memcmp(ata_dev_name(id_buf), "VBOX HARDDISK", 13)) {
     /* running inside virtualbox */
     pci_hack_virtualbox();