Changeset 164

Timestamp:

Jul 17, 2013, 8:31:34 PM (12 years ago)

Author:

David Azarewicz

Message:

Debug output updates

Location:

trunk/src/os2ahci

Files:

• ahci.c (modified) (4 diffs)
• init.asm (modified) (1 diff)
• pci.c (modified) (1 diff)
• trace.c (modified) (2 diffs)

trunk/src/os2ahci/ahci.c

@@ -128 +128 @@
   u32 version;
 
-  aprintf("AHCI global controller registers:\n");
+  aprintf("AHCI global registers for adapter %d:%d:%d irq=%d addr=0x%lx\n",
+      ai->bus, ai->dev_func>>3, ai->dev_func&7, ai->irq, ai->mmio_phys);
+
   for (i = 0; i <= HOST_CAP2; i += sizeof(u32)) {
     u32 val;
@@ -1236 +1238 @@
 
     if (rc) {
-      dprintf("timeout for IORB %Fp\n", iorb);
+      dprintf(" timeout for IORB %Fp", iorb);
       iorb_seterr(iorb, IOERR_ADAPTER_TIMEOUT);
     } else if (readl(port_mmio + PORT_SCR_ERR) != 0 ||
                readl(port_mmio + PORT_TFDATA) & 0x89) {
-      dprintf("polled cmd error for IORB %Fp\n", iorb);
+      dprintf(" polled cmd error for IORB %Fp", iorb);
       iorb_seterr(iorb, IOERR_DEVICE_NONSPECIFIC);
       ahci_reset_port(ai, iorb_unit_port(iorb), 0);
@@ -1251 +1253 @@
       }
     }
+    ddprintf("\n");
   }
 
@@ -1309 +1312 @@
   /* check error condition */
   if ((tmp = readl(port_mmio + PORT_SCR_ERR)) != 0) {
-    dprintf("SERR = 0x%08lx\n", tmp);
+    dprintf(" SERR = 0x%08lx", tmp);
     rc = 1;
   }
   if (((tmp = readl(port_mmio + PORT_TFDATA)) & 0x89) != 0) {
-    dprintf("TFDATA = 0x%08lx\n", tmp);
+    dprintf(" TFDATA = 0x%08lx", tmp);
     rc = 1;
   }
 
   if (rc) {
+    ddprintf("failed\n");
     ahci_reset_port(ai, p, 0);
     return(-1);
   }
+  ddprintf("success\n");
   return(0);
 }

trunk/src/os2ahci/init.asm

@@ -46 +46 @@
 
 if 1
-; This is here to support old SMART tools. This is a really bad thing to do as it will
-; cause problems in the future. The SMART tools should be fixed instead.
+; This is here to support old SMART tools which only look for IBMS506$. This is a
+; really bad thing to do as it will cause problems in the future. The SMART tools
+; should be fixed to be able to open OS2AHCI$ and this header should be removed.
 _next_hdr       dd      -1                      ; no headers after this one
                 dw      DEVLEV_3 + DEV_CHAR_DEV ; flags for ADD drivers

trunk/src/os2ahci/pci.c

@@ -615 +615 @@
             class, bus, dev_func);
 
+  dprintf("found AHCI device: %s %s (%04x:%04x) class:0x%06lx bus:%d devfunc:0x%02x\n",
+            vendor_from_id(vendor), device_from_id(device),
+            vendor, device,
+            class, bus, dev_func);
+
   /* make sure we got room in the adapter information array */
   if (ad_info_cnt >= MAX_AD - 1) {

trunk/src/os2ahci/trace.c

@@ -235 +235 @@
     AD_INFO *ai = ad_infos + a;
 
-    ntprintf("Adapter %d: %d:%d:%d irq=%d addr=0x%lx\n", a,
+    ntprintf("Adapter %d: %d:%d:%d irq=%d addr=0x%lx version=%lx\n", a,
       ai->bus, ai->dev_func>>3, ai->dev_func&7,
-      ai->irq, ai->mmio_phys);
+      ai->irq, ai->mmio_phys,
+      ai->bios_config[HOST_VERSION / sizeof(u32)]);
 
     for (p = 0; p <= ai->port_max; p++) {
@@ -247 +248 @@
         if (!pi->devs[d].present) continue;
 
-        ntprintf("    Drive %d:");
+        ntprintf("    Drive %d:", d);
         if (pi->devs[d].atapi) ntprintf(" atapi");
         if (pi->devs[d].removable) ntprintf(" removable");