Changeset 74 for trunk/src/os2ahci/ahci.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/ahci.c (modified) (5 diffs)

trunk/src/os2ahci/ahci.c

@@ -408 +408 @@
   AHCI_PORT_CFG *pc = NULL;
   u16 *id_buf;
+  int is_ata;
   int rc;
   int p;
+  int i;
 
   spin_lock(drv_lock);
@@ -453 +455 @@
       }
 
-      /* this port has a device attached and is ready to accept commands */
+      /* this port seems to have a device attached and ready for commands */
       ddprintf("port #%d seems to be attached to a device; probing...\n", p);
-      rc = ahci_exec_polled_cmd(ai, p, 0, 500, ATA_CMD_ID_ATA,
-                                AP_VADDR, (void _far *) id_buf, 512,
-                                AP_END);
-      if (rc != 0 || id_buf[ATA_ID_CONFIG] & (1U << 15)) {
-        /* this might be an ATAPI device; run IDENTIFY_PACKET_DEVICE */
-        rc = ahci_exec_polled_cmd(ai, p, 0, 500, ATA_CMD_ID_ATAPI,
+
+      /* Get ATA(PI) identity. The so-called signature gives us a hint whether
+       * this is an ATA or an ATAPI device but we'll try both in either case;
+       * the signature will merely determine whether we're going to probe for
+       * an ATA or ATAPI device, first, in order to reduce the chance of sending
+       * the wrong command (which would result in a port reset given the way
+       * ahci_exec_polled_cmd() was implemented).
+       */
+      is_ata = readl(port_base(ai, p) + PORT_SIG) == 0x00000101UL;
+      for (i = 0; i < 2; i++) {
+        rc = ahci_exec_polled_cmd(ai, p, 0, 500,
+                                  (is_ata) ? ATA_CMD_ID_ATA : ATA_CMD_ID_ATAPI,
                                   AP_VADDR, (void _far *) id_buf, 512,
                                   AP_END);
+        if (rc == 0) {
+          break;
+        }
+
+        /* try again with ATA/ATAPI swapped */
+        is_ata = !is_ata;
       }
 
       if (rc == 0) {
         /* we have a valid IDENTIFY or IDENTIFY_PACKET response */
-        ddphex(id_buf, 512, "ATA_IDENTIFY(_PACKET) results:\n");
+        ddphex(id_buf, 512, "ATA_IDENTIFY%s results:\n", (is_ata) ? "" : "_PACKET");
         ahci_setup_device(ai, p, 0, id_buf);
       } else {
@@ -1399 +1413 @@
   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);
@@ -1418 +1436 @@
   dphex(((IORB_ADAPTER_PASSTHRU _far *) iorb)->pControllerCmd,
         ((IORB_ADAPTER_PASSTHRU _far *) iorb)->ControllerCmdLen,
-        "ahci_execute_cdb(%d.%d.%d)", a, p, d);
+        "ahci_execute_cdb(%d.%d.%d): ", a, p, d);
 
   if (ad_infos[a].ports[p].devs[d].atapi) {
@@ -1461 +1479 @@
     ai->ports[p].devs[d].atapi_16  = (id_buf[ATA_ID_CONFIG] & 0x0001U) != 0;
     ai->ports[p].devs[d].dev_type  = (id_buf[ATA_ID_CONFIG] & 0x1f00U) >> 8;
+    ai->ports[p].devs[d].ncq_max   = 1;
 
   } else {