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

Timestamp:

Dec 13, 2016, 3:07:49 AM (9 years ago)

Author:

David Azarewicz

Message:

Debugging changes

File:

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

trunk/src/os2ahci/ahci.c

@@ -207 +207 @@
 #endif
 
+int AllocPortData(AD_INFO *ai, int p)
+{
+  if (ai->ports[p]) return 0;
+  ai->ports[p] = MemAlloc(sizeof(P_INFO));
+  if (ai->ports[p] == NULL) return 1;
+  memset(ai->ports[p], 0, sizeof(P_INFO));
+  return 0;
+}
+
+FreePortData(AD_INFO *ai, int p)
+{
+}
+
 /******************************************************************************
  * Save BIOS configuration of AHCI adapter. As a side effect, this also saves
@@ -605 +618 @@
     if (port_ignore[ad_no(ai)][p]) continue;
 
+    // DAZ allocate port structure here
+
     DPRINTF(3,"ahci_scan_ports: Wait till not busy on port %d\n", p);
     /* wait until all active commands have completed on this port */
@@ -629 +644 @@
       rc = ahci_start_port(ai, p, 0);
     }
-    if (rc)
-    {
-      /* no device attached to this port */
-      ai->port_map &= ~(1UL << p);
-      goto restore_port_config;
-    }
-
-    /* this port seems to have a device attached and ready for commands */
-    DPRINTF(1,"ahci_scan_ports: port %d seems to be attached to a device; probing...\n", p);
-
-    /* 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 *) id_buf, ATA_ID_WORDS * sizeof(u16),
-                                AP_END);
-      if (rc == 0) break;
-
-      /* try again with ATA/ATAPI swapped */
-      is_ata = !is_ata;
+
+    if (rc == 0)
+    {
+      /* this port seems to have a device attached and ready for commands */
+      DPRINTF(1,"ahci_scan_ports: port %d seems to be attached to a device; probing...\n", p);
+
+      /* 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 *) id_buf, ATA_ID_WORDS * sizeof(u16),
+                                  AP_END);
+        if (rc == 0) break;
+
+        /* try again with ATA/ATAPI swapped */
+        is_ata = !is_ata;
+      }
     }
 
@@ -669 +681 @@
       /* no device attached to this port */
       ai->port_map &= ~(1UL << p);
-    }
-
-  restore_port_config:
-    if (pc != NULL) {
-      ahci_restore_port_config(ai, p, pc);
-    }
+      // DAZ free port structure here
+    }
+
+    if (pc != NULL) ahci_restore_port_config(ai, p, pc);
   }
 
@@ -1096 +1106 @@
   }
 
-  DPRINTF(1,"---------- ahci_exec_iorb: iorb=%x\n", vIorb);
+  DPRINTF(7,"---------- ahci_exec_iorb: iorb=%x\n", vIorb);
 
   /* Enable AHCI mode; apparently, the AHCI mode may end up becoming
@@ -1122 +1132 @@
       cmd_max = ai->cmd_max;
     }
-    DPRINTF(3,"NCQ command; cmd_max = %d->%d\n", ai->cmd_max, cmd_max);
+    DPRINTF(8,"NCQ command; cmd_max = %d->%d\n", ai->cmd_max, cmd_max);
   }
 
@@ -1175 +1185 @@
         aws->cmd_slot = port->cmd_slot;
 
-        DPRINTF(1,"Issuing command Slot=%d cmds=%x\n", port->cmd_slot, *cmds);
+        DPRINTF(7,"Issuing command Slot=%d cmds=%x\n", port->cmd_slot, *cmds);
         if (aws->is_ncq)
         {
@@ -1432 +1442 @@
  * queues, ...)
  */
-u32 DazCount = 0;
-
 int ahci_intr(u16 irq)
 {
@@ -1440 +1448 @@
   int a;
   int p;
-
-  DPRINTF(1,"AI=%x",DazCount++);
 
   /* find adapter(s) with pending interrupts */
@@ -1530 +1536 @@
   readl(port_mmio + PORT_IRQ_STAT); /* flush */
 
-  DPRINTF(3,"port interrupt A=%d Port=%d stat=%x\n", ad_no(ai), p, irq_stat);
   memset(&done_queue, 0x00, sizeof(done_queue));
 
@@ -1556 +1561 @@
     active_cmds = readl(port_mmio + PORT_SCR_ACT);
     done_mask = ai->ports[p].ncq_cmds ^ active_cmds;
-    DPRINTF(1,"[ncq_cmds]: active_cmds=0x%08x done_mask=0x%08x\n", active_cmds, done_mask);
+    DPRINTF(7,"[ncq_cmds]: active_cmds=0x%08x done_mask=0x%08x\n", active_cmds, done_mask);
   }
   else
@@ -1562 +1567 @@
     active_cmds = readl(port_mmio + PORT_CMD_ISSUE);
     done_mask = ai->ports[p].reg_cmds ^ active_cmds;
-    DPRINTF(1,"[reg_cmds]: active_cmds=0x%08x  done_mask=0x%08x\n", active_cmds, done_mask);
+    DPRINTF(7,"[reg_cmds]: active_cmds=0x%08x  done_mask=0x%08x\n", active_cmds, done_mask);
   }
 
@@ -1681 +1686 @@
 {
   #ifdef DEBUG
-  DPRINTF(2,"ahci_get_geometry(%d.%d.%d)\n", iorb_unit_adapter(pIorb),
+  DPRINTF(7,"ahci_get_geometry(%d.%d.%d)\n", iorb_unit_adapter(pIorb),
           iorb_unit_port(pIorb), iorb_unit_device(pIorb));
   #endif
@@ -1694 +1699 @@
 {
   #ifdef DEBUG
-  DPRINTF(2,"ahci_unit_ready(%d.%d.%d)\n", iorb_unit_adapter(pIorb),
+  DPRINTF(7,"ahci_unit_ready(%d.%d.%d)\n", iorb_unit_adapter(pIorb),
           iorb_unit_port(pIorb), iorb_unit_device(pIorb));
   #endif
@@ -1707 +1712 @@
 {
   #ifdef DEBUG
-  DPRINTF(2,"ahci_read(%d.%d.%d, %d, %d)\n", iorb_unit_adapter(vIorb),
+  DPRINTF(7,"ahci_read(%d.%d.%d, %d, %d)\n", iorb_unit_adapter(vIorb),
           iorb_unit_port(pIorb), iorb_unit_device(pIorb),
           ((IORB_EXECUTEIO *) pIorb)->RBA,
@@ -1722 +1727 @@
 {
   #ifdef DEBUG
-  DPRINTF(2,"ahci_verify(%d.%d.%d, %d, %d)\n", iorb_unit_adapter(pIorb),
+  DPRINTF(7,"ahci_verify(%d.%d.%d, %d, %d)\n", iorb_unit_adapter(pIorb),
           iorb_unit_port(pIorb), iorb_unit_device(pIorb),
           ((IORB_EXECUTEIO *)pIorb)->RBA,
@@ -1737 +1742 @@
 {
   #ifdef DEBUG
-  DPRINTF(2,"ahci_write(%d.%d.%d, %d, %d)\n", iorb_unit_adapter(pIorb),
+  DPRINTF(7,"ahci_write(%d.%d.%d, %d, %d)\n", iorb_unit_adapter(pIorb),
           iorb_unit_port(pIorb), iorb_unit_device(pIorb),
           ((IORB_EXECUTEIO *)pIorb)->RBA,