Changeset 211 for trunk/src/os2ahci/trace.c

Timestamp:

Jul 24, 2023, 5:51:46 PM (2 years ago)

Author:

David Azarewicz

Message:

Added workaround to help with VirtualBox issues.
Improved diagnostic messages.
Changed how timeouts are reset and how ctx hooks are triggered.
Added quirk for devices with issues executing some standard commands.
Changed to make /N the default.

File:

• trunk/src/os2ahci/trace.c (modified) (4 diffs)

trunk/src/os2ahci/trace.c

@@ -1 +1 @@
 /**
  *
- * Copyright (c) 2013-2021 David Azarewicz <david@88watts.net>
+ * Copyright (c) 2013-2023 David Azarewicz <david@88watts.net>
  *
  */
@@ -22 +22 @@
     AD_INFO *ai = ad_infos + a;
 
-    dprintf(0,"Adapter %d: PCI=%d:%d:%d ID=%04x:%04x %s %s irq=%d addr=0x%x version=%x\n", a,
-      PCI_BUS_FROM_BDF(ai->bus_dev_func), PCI_DEV_FROM_BDF(ai->bus_dev_func),
-      PCI_FUNC_FROM_BDF(ai->bus_dev_func),
-      ai->pci_vendor, ai->pci_device, vendor_from_id(ai->pci_vendor), ai->pci->chipname,
+    dprintf(0,"Adapter %d: %d:%d:%d ID=%04x:%04x %s %s irq=%d adr=%x version=%x\n", a,
+      PCI_BUS_FROM_BDF(ai->BusDevFunc), PCI_DEV_FROM_BDF(ai->BusDevFunc),
+      PCI_FUNC_FROM_BDF(ai->BusDevFunc),
+      ai->PciVendor, ai->PciDevice, vendor_from_id(ai->PciVendor), ai->pChipName,
       ai->irq, ai->mmio_phys,
       ai->bios_config[HOST_VERSION / sizeof(u32)]);
@@ -63 +63 @@
 
 #ifdef DEBUG
-void DumpIorb(IORBH *pIorb)
+void DumpIorb(IORBH *pIorb, IORBH FAR16DATA *vIorb)
 {
-  if (!(D32g_DbgLevel & DBG_DETAILED)) return;
-  if (!ad_infos[iorb_unit_adapter(pIorb)].ports[iorb_unit_port(pIorb)].devs[iorb_unit_device(pIorb)].atapi) return;
+  //if (!(D32g_DbgLevel & DBG_DETAILED)) return;
+  if (ad_infos[iorb_unit_adapter(pIorb)].ports[iorb_unit_port(pIorb)].devs[iorb_unit_device(pIorb)].atapi) return;
 
   dprintf(0,"IORB %x: Size=%x Len=%x Handle=%x CmdCode=%x\n",
-      pIorb, sizeof(IORBH), pIorb->Length, pIorb->UnitHandle, pIorb->CommandCode);
+      vIorb, sizeof(IORBH), pIorb->Length, pIorb->UnitHandle, pIorb->CommandCode);
   dprintf(0,"  CmdMod=%x ReqCtrl=%x Status=%x ErrorCode=%x\n",
       pIorb->CommandModifier, pIorb->RequestControl, pIorb->Status, pIorb->ErrorCode);
@@ -75 +75 @@
       pIorb->Timeout, pIorb->StatusBlockLen, pIorb->pStatusBlock, pIorb->Reserved_1,
       pIorb->f16NxtIORB);
+
+  if (pIorb->CommandCode == IOCC_EXECUTE_IO || pIorb->CommandCode == IOCC_EXECUTE_IO_64)
+  {
+    IORB_EXECUTEIO64 *pIo = (IORB_EXECUTEIO64*)pIorb;
+    ULONGLONG ullLba;
+
+    ullLba = pIo->RBA;
+    if (pIorb->CommandCode == IOCC_EXECUTE_IO_64) ullLba = pIo->ullRBA;
+
+    dprintf(0,"  I/O: Block=%llx Count=%x Xferred=%x Size=%x Flags=%x\n",
+      ullLba, pIo->BlockCount, pIo->BlocksXferred, pIo->BlockSize, pIo->Flags);
+  }
 }
 #endif