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

Timestamp:

Mar 6, 2021, 7:44:15 PM (4 years ago)

Author:

David Azarewicz

Message:

Debugging support changes.

File:

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

trunk/src/os2ahci/ahci.c

@@ -202 +202 @@
   if ((ai->cap & HOST_CAP_NCQ) && (ai->flags & AHCI_HFLAG_NO_NCQ))
   {
-    DPRINTF(1,"controller can't do NCQ, turning off CAP_NCQ\n");
+    DPRINTF(DBG_INIT, DBG_PREFIX": controller can't do NCQ, turning off CAP_NCQ\n");
     ai->cap &= ~HOST_CAP_NCQ;
   }
@@ -208 +208 @@
   if (!(ai->cap & HOST_CAP_NCQ) && (ai->flags & AHCI_HFLAG_YES_NCQ))
   {
-    DPRINTF(1,"controller can do NCQ, turning on CAP_NCQ\n");
+    DPRINTF(DBG_INIT, DBG_PREFIX": controller can do NCQ, turning on CAP_NCQ\n");
     ai->cap |= HOST_CAP_NCQ;
   }
@@ -214 +214 @@
   if ((ai->cap & HOST_CAP_PMP) && (ai->flags & AHCI_HFLAG_NO_PMP))
   {
-    DPRINTF(1,"controller can't do PMP, turning off CAP_PMP\n");
+    DPRINTF(DBG_INIT, DBG_PREFIX": controller can't do PMP, turning off CAP_PMP\n");
     ai->cap |= HOST_CAP_PMP;
   }
@@ -220 +220 @@
   if ((ai->cap & HOST_CAP_SNTF) && (ai->flags & AHCI_HFLAG_NO_SNTF))
   {
-    DPRINTF(1,"controller can't do SNTF, turning off CAP_SNTF\n");
+    DPRINTF(DBG_INIT, DBG_PREFIX": controller can't do SNTF, turning off CAP_SNTF\n");
     ai->cap &= ~HOST_CAP_SNTF;
   }
@@ -226 +226 @@
   if (ai->pci_vendor == PCI_VENDOR_ID_JMICRON && ai->pci_device == 0x2361 && ai->port_map != 1)
   {
-    DPRINTF(1,"JMB361 has only one port, port_map 0x%x -> 0x%x\n", ai->port_map, 1);
+    DPRINTF(DBG_INIT, DBG_PREFIX": JMB361 has only one port, port_map 0x%x -> 0x%x\n", ai->port_map, 1);
     ai->port_map = 1;
     ai->hw_ports = 1;
@@ -249 +249 @@
     /* more ports in port_map than in HOST_CAP & 0x1f */
     ports = ai->hw_ports;
-    DPRINTF(0,"implemented port map (0x%x) contains more ports than hw_ports (%d), using hw_ports\n", ai->port_map, ports);
+    DPRINTF(DBG_INIT, DBG_PREFIX": implemented port map (0x%x) contains more ports than hw_ports (%d), using hw_ports\n", ai->port_map, ports);
     ai->port_map = (1UL << ports) - 1UL;
   }
@@ -274 +274 @@
   }
 
-  DPRINTF(3,__func__": BIOS AHCI mode is %d\n", ai->bios_config[HOST_CTL / sizeof(u32)] & HOST_AHCI_EN);
+  DPRINTF(DBG_DETAILED, DBG_PREFIX": BIOS AHCI mode is %d\n", ai->bios_config[HOST_CTL / sizeof(u32)] & HOST_AHCI_EN);
 
   if ((ai->bios_config[HOST_CTL / sizeof(u32)] & HOST_AHCI_EN) == 0 && ai->pci_vendor == PCI_VENDOR_ID_INTEL)
@@ -284 +284 @@
   }
 
-  DUMP_HOST_REGS(6,ai,1);
+  DUMP_HOST_REGS(DBG_DETAILED, ai, 1);
 
   return(0);
@@ -296 +296 @@
 int ahci_restore_bios_config(AD_INFO *ai)
 {
-  DPRINTF(3,__func__": restoring AHCI BIOS configuration on adapter %d\n", ad_no(ai));
+  DPRINTF(DBG_DETAILED, DBG_PREFIX": restoring AHCI BIOS configuration on adapter %d\n", ad_no(ai));
 
   /* Restore saved BIOS configuration; please note that HOST_CTL is restored
@@ -354 +354 @@
 int ahci_restore_initial_config(AD_INFO *ai)
 {
-  DPRINTF(3,__func__": restoring initial configuration on adapter %d\n", ad_no(ai));
+  DPRINTF(DBG_DETAILED, DBG_PREFIX": restoring initial configuration on adapter %d\n", ad_no(ai));
 
   /* restore saved BIOS configuration */
@@ -379 +379 @@
     TIMER Timer;
 
-    DPRINTF(2,"controller reset starting on adapter %d\n", ad_no(ai));
+    DPRINTF(DBG_ATTACH, DBG_PREFIX": controller reset starting on adapter %d\n", ad_no(ai));
 
     /* we must be in AHCI mode, before using anything AHCI-specific, such as HOST_RESET. */
@@ -414 +414 @@
       u32 tmp16 = 0;
 
-      DPRINTF(1,"ahci_reset_controller: intel detected\n");
+      DPRINTF(DBG_ATTACH, DBG_PREFIX": ahci_reset_controller: intel detected\n");
       /* configure PCS */
       PciReadConfig(ai->bus, ai->dev_func, 0x92, sizeof(u16), &tmp16);
       if ((tmp16 & ai->port_map) != ai->port_map) {
-        DPRINTF(3,"ahci_reset_controller: updating PCS %x/%x\n", tmp16, ai->port_map);
+        DPRINTF(DBG_ATTACH, DBG_PREFIX": ahci_reset_controller: updating PCS %x/%x\n", tmp16, ai->port_map);
         tmp16 |= ai->port_map;
         PciWriteConfig(ai->bus, ai->dev_func, 0x92, sizeof(u16), tmp16);
@@ -535 +535 @@
   int i;
 
-  DPRINTF(2,__func__": completing initialization of adapter #%d\n", ad_no(ai));
+  DPRINTF(DBG_INIT, DBG_PREFIX": completing initialization of adapter #%d\n", ad_no(ai));
 
   if (!ai->int_set)
@@ -559 +559 @@
       if (i >= MAX_IRQ_HANDLERS) return -1; /* no more handlers available */
 
-      DPRINTF(2,"registering interrupt %d pin=%d\n", ai->irq, ai->irq_pin);
+      DPRINTF(DBG_INIT, DBG_PREFIX": registering interrupt %d pin=%d\n", ai->irq, ai->irq_pin);
 
       rc = Dev32Help_SetIRQ(ahci_intr, ai->irq, p, ai->irq);
@@ -592 +592 @@
       if (init_reset)
       {
-        DPRINTF(3,__func__": resetting port %d\n", p);
+        DPRINTF(DBG_INIT, DBG_PREFIX": resetting port %d\n", p);
         ahci_reset_port(ai, p, 1);
       }
       else
       {
-        DPRINTF(3,__func__": restarting port #%d\n", p);
+        DPRINTF(DBG_INIT, DBG_PREFIX": restarting port #%d\n", p);
         ahci_stop_port(ai, p);
         ahci_start_port(ai, p, 1);
@@ -615 +615 @@
   /* pci_enable_int(ai->bus, ai->dev_func); */
 
-  DPRINTF(2,__func__": done\n");
+  DPRINTF(DBG_INIT|DBG_FUNCEND, DBG_PREFIX": END\n");
   return(0);
 }
@@ -644 +644 @@
          AP_END)) break;
 
-    DHEXDUMP(5, pSector0, 512, "Sector0:\n");
+    DHEXDUMP(DBG_DETAILED, pSector0, 512, "Sector0:\n");
 
     /* check for wiped disk */
@@ -722 +722 @@
   }
 
-  DPRINTF(2,"found device %d.%d.%d: removable=%d dev_type=%d atapi=%d ncq_max=%d\n",
+  DPRINTF(DBG_ATTACH, DBG_PREFIX": found device %d.%d.%d: removable=%d dev_type=%d atapi=%d ncq_max=%d\n",
           ad_no(ai), p, d,
           ai->ports[p].devs[d].removable,
@@ -804 +804 @@
 
   /* perform port scan */
-  DPRINTF(1,__func__": scanning ports on adapter %d\n", ad_no(ai));
+  DPRINTF(DBG_ATTACH, DBG_PREFIX": scanning ports on adapter %d\n", ad_no(ai));
   for (p = 0; p < AHCI_MAX_PORTS; p++)
   {
@@ -812 +812 @@
     // DAZ allocate port structure here
 
-    DPRINTF(3,__func__": Wait till not busy on port %d\n", p);
+    DPRINTF(DBG_ATTACH, DBG_PREFIX": Wait till not busy on port %d\n", p);
     /* wait until all active commands have completed on this port */
     TimerInit(&Timer, 250);
@@ -832 +832 @@
     else
     {
-      DPRINTF(3,__func__": (re)starting port %d\n", p);
+      DPRINTF(DBG_ATTACH, DBG_PREFIX": (re)starting port %d\n", p);
       ahci_stop_port(ai, p);
       rc = ahci_start_port(ai, p, 0);
@@ -840 +840 @@
     {
       /* this port seems to have a device attached and ready for commands */
-      DPRINTF(2,__func__": port %d seems to be attached to a device; probing...\n", p);
+      DPRINTF(DBG_ATTACH, DBG_PREFIX": port %d seems to be attached to a device; probing...\n", p);
 
       #ifdef DAZ_NEW_CODE
@@ -871 +871 @@
     {
       /* we have a valid IDENTIFY or IDENTIFY_PACKET response */
-      DHEXDUMP(5,id_buf, ATA_ID_WORDS * sizeof(u16), "ATA_IDENTIFY%s results:\n", (is_ata) ? "" : "_PACKET");
+      DHEXDUMP(DBG_DETAILED,id_buf, ATA_ID_WORDS * sizeof(u16), "ATA_IDENTIFY%s results:\n", (is_ata) ? "" : "_PACKET");
       ahci_setup_device(ai, p, 0, id_buf);
       if (!IsUsableDisk(ai, p, 0)) ai->ports[p].devs[0].ignored = 1;
@@ -915 +915 @@
   TIMER Timer;
 
-  DPRINTF(3,__func__": resetting port %d.%d\n", ad_no(ai), p);
-  DUMP_PORT_REGS(3,ai,p);
+  DPRINTF(DBG_ATTACH, DBG_PREFIX": resetting port %d.%d\n", ad_no(ai), p);
+  DUMP_PORT_REGS(DBG_DETAILED,ai,p);
 
   /* stop port engines (we don't care whether there is an error doing so) */
@@ -932 +932 @@
 
   /* set link speed and power management options */
-  DPRINTF(3,__func__": setting link speed and power management options\n");
+  DPRINTF(DBG_DETAILED, DBG_PREFIX": setting link speed and power management options\n");
   tmp = readl(port_mmio + PORT_SCR_CTL) & ~0x00000fffUL;
   tmp |= (link_speed[ad_no(ai)][p] & 0x0f) << 4;
@@ -939 +939 @@
 
   /* issue COMRESET on the port */
-  DPRINTF(3,__func__": issuing COMRESET on port %d\n", p);
+  DPRINTF(DBG_DETAILED, DBG_PREFIX": issuing COMRESET on port %d\n", p);
   writel(port_mmio + PORT_SCR_CTL, tmp | 1);
   readl(port_mmio + PORT_SCR_CTL);  /* flush */
@@ -950 +950 @@
 
   /* wait for communication to be re-established after port reset */
-  DPRINTF(3,"Wait for communication...\n");
+  DPRINTF(DBG_DETAILED, DBG_PREFIX": Wait for communication...\n");
   TimerInit(&Timer, 500);
   while (((tmp = readl(port_mmio + PORT_SCR_STAT)) & 3) != 3)
@@ -956 +956 @@
     if (TimerCheckAndBlock(&Timer))
     {
-      DPRINTF(2,"no device present after resetting port #%d (PORT_SCR_STAT = 0x%x)\n", p, tmp);
+      DPRINTF(DBG_ATTACH, DBG_PREFIX": no device present after resetting port #%d (PORT_SCR_STAT = 0x%x)\n", p, tmp);
       return(-1);
     }
@@ -966 +966 @@
 
   /* start port so we can receive the COMRESET FIS */
-  DPRINTF(3,__func__": starting port %d again\n", p);
+  DPRINTF(DBG_DETAILED, DBG_PREFIX": starting port %d again\n", p);
   ahci_start_port(ai, p, ei);
 
@@ -975 +975 @@
     if (TimerCheckAndBlock(&Timer))
     {
-      DPRINTF(0,"device not ready on port #%d (PORT_TFDATA = 0x%x)\n", p, tmp);
+      DPRINTF(0, DBG_PREFIX": device not ready on port #%d (PORT_TFDATA = 0x%x)\n", p, tmp);
       ahci_stop_port(ai, p);
       return(-1);
     }
   }
-  DPRINTF(3,__func__": PORT_TFDATA = 0x%x\n", readl(port_mmio + PORT_TFDATA));
+  DPRINTF(DBG_ATTACH|DBG_FUNCEND, DBG_PREFIX": END PORT_TFDATA = 0x%x\n", readl(port_mmio + PORT_TFDATA));
 
   return(0);
@@ -993 +993 @@
   u32 status;
 
-  DPRINTF(3,__func__": %d.%d\n", ad_no(ai), p);
+  DPRINTF(DBG_ATTACH, DBG_PREFIX": %d.%d\n", ad_no(ai), p);
   /* check whether device presence is detected and link established */
 
   status = readl(port_mmio + PORT_SCR_STAT);
-  DPRINTF(3,__func__": PORT_SCR_STAT = 0x%x\n", status);
+  DPRINTF(DBG_DETAILED, DBG_PREFIX": PORT_SCR_STAT = 0x%x\n", status);
   if ((status & 0xf) != 3) return(-1);
 
   /* clear SError, if any */
   status = readl(port_mmio + PORT_SCR_ERR);
-  DPRINTF(3,__func__": PORT_SCR_ERR  = 0x%x\n", status);
+  DPRINTF(DBG_DETAILED, DBG_PREFIX": PORT_SCR_ERR  = 0x%x\n", status);
   writel(port_mmio + PORT_SCR_ERR, status);
 
@@ -1090 +1090 @@
   int rc;
 
-  DPRINTF(3,__func__": %d.%d\n", ad_no(ai), p);
+  DPRINTF(DBG_ATTACH, DBG_PREFIX": %d.%d\n", ad_no(ai), p);
 
   /* disable port interrupts */
@@ -1233 +1233 @@
   }
 
-  DPRINTF(7,"---------- "__func__": iorb=%x\n", vIorb);
+  DPRINTF(DBG_DETAILED, DBG_PREFIX": ---------- iorb=%x\n", vIorb);
 
   /* Enable AHCI mode; apparently, the AHCI mode may end up becoming
@@ -1259 +1259 @@
       cmd_max = ai->cmd_max;
     }
-    DPRINTF(8,__func__": NCQ command; cmd_max = %d->%d\n", ai->cmd_max, cmd_max);
+    DPRINTF(DBG_DETAILED, DBG_PREFIX": NCQ command; cmd_max = %d->%d\n", ai->cmd_max, cmd_max);
   }
 
@@ -1312 +1312 @@
         aws->cmd_slot = port->cmd_slot;
 
-        DPRINTF(7,__func__": Issuing command Slot=%d cmds=%x\n", port->cmd_slot, *cmds);
+        DPRINTF(DBG_DETAILED, DBG_PREFIX": Issuing command Slot=%d cmds=%x\n", port->cmd_slot, *cmds);
         if (aws->is_ncq)
         {
@@ -1405 +1405 @@
   {
     /* successfully prepared cmd; issue cmd and wait for completion */
-    DPRINTF(3,"---------- "__func__" executing polled cmd on slot 0...");
+    DPRINTF(DBG_DETAILED, DBG_PREFIX": ---------- executing polled cmd on slot 0...");
     writel(port_mmio + PORT_CMD_ISSUE, 1);
     TimerInit(&Timer, timeout);
@@ -1417 +1417 @@
     if (rc)
     {
-      DPRINTF(3," timeout for IORB %x port=%x", vIorb, p);
+      DPRINTF(DBG_DETAILED, " timeout for IORB %x port=%x", vIorb, p);
       iorb_seterr(pIorb, IOERR_ADAPTER_TIMEOUT);
     }
     else if (readl(port_mmio + PORT_SCR_ERR) != 0 || readl(port_mmio + PORT_TFDATA) & 0x89)
     {
-      DPRINTF(3," polled cmd error for IORB %x", vIorb);
+      DPRINTF(DBG_DETAILED, " polled cmd error for IORB %x", vIorb);
       iorb_seterr(pIorb, IOERR_DEVICE_NONSPECIFIC);
       ahci_reset_port(ai, iorb_unit_port(pIorb), 0);
@@ -1438 +1438 @@
       }
     }
-    DPRINTF(3,"\n");
+    DPRINTF(DBG_DETAILED, "\n");
   }
 
@@ -1476 +1476 @@
   if (readl(port_mmio + PORT_CMD_ISSUE) & 1)
   {
-    DPRINTF(3,__func__": port %d slot 0 is not idle; not executing polled cmd\n", p);
+    DPRINTF(0, DBG_PREFIX": port %d slot 0 is not idle; not executing polled cmd\n", p);
     return(-1);
   }
@@ -1485 +1485 @@
 
   /* start command execution for slot 0 */
-  DPRINTF(3,"---------- "__func__" executing polled cmd...");
+  DPRINTF(DBG_DETAILED, DBG_PREFIX": ---------- executing polled cmd...");
   writel(port_mmio + PORT_CMD_ISSUE, 1);
 
@@ -1496 +1496 @@
     if (rc)
     {
-      DPRINTF(2," Timeout");
+      DPRINTF(DBG_DETAILED, " Timeout");
       break;
     }
@@ -1504 +1504 @@
   if (tmp & PORT_ERR_FAIL_BITS)
   {
-    DPRINTF(2," SERR = 0x%08lx", tmp);
+    DPRINTF(DBG_DETAILED, " SERR = 0x%08lx", tmp);
     rc = 1;
   }
@@ -1510 +1510 @@
   if (((tmp = readl(port_mmio + PORT_TFDATA)) & 0x89) != 0)
   {
-    DPRINTF(2," TFDATA = 0x%08lx", tmp);
+    DPRINTF(DBG_DETAILED, " TFDATA = 0x%08lx", tmp);
     rc = 1;
   }
@@ -1516 +1516 @@
   if (rc)
   {
-    DPRINTF(3,"failed\n");
+    DPRINTF(DBG_DETAILED, "failed\n");
     ahci_reset_port(ai, p, 0);
     return(-1);
   }
-  DPRINTF(3,"success\n");
+  DPRINTF(DBG_DETAILED, "success\n");
   return(0);
 }
@@ -1537 +1537 @@
   if (!ai->ports[p].devs[d].atapi)
   {
-    DPRINTF(2,__func__": flushing cache on %d.%d.%d\n", ad_no(ai), p, d);
+    DPRINTF(DBG_INIT, DBG_PREFIX": 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));
@@ -1554 +1554 @@
 int ahci_set_dev_idle(AD_INFO *ai, int p, int d, int idle)
 {
-  DPRINTF(3,__func__": sending IDLE=%d command to port %d\n", idle, p);
+  DPRINTF(DBG_FUNCBEG, DBG_PREFIX": sending IDLE=%d command to port %d\n", idle, p);
   return ahci_exec_polled_cmd(ai, p, d, 500, ATA_CMD_IDLE, AP_COUNT, idle ? 1 : 0, AP_END);
 }
@@ -1612 +1612 @@
     if ((u32)&irq_stat < 0xf000)
     {
-      DPRINTF(0,__func__": IRQ stack running low; arming engine context hook\n");
+      DPRINTF(DBG_DETAILED, DBG_PREFIX": IRQ stack running low; arming engine context hook\n");
       /* Rousseau:
        * A context hook cannot be re-armed before it has completed.
@@ -1689 +1689 @@
     active_cmds = readl(port_mmio + PORT_SCR_ACT);
     done_mask = ai->ports[p].ncq_cmds ^ active_cmds;
-    DPRINTF(7,"[ncq_cmds]: active_cmds=0x%08x done_mask=0x%08x\n", active_cmds, done_mask);
+    DPRINTF(DBG_DETAILED, DBG_PREFIX": [ncq_cmds]: active_cmds=0x%08x done_mask=0x%08x\n", active_cmds, done_mask);
   }
   else
@@ -1695 +1695 @@
     active_cmds = readl(port_mmio + PORT_CMD_ISSUE);
     done_mask = ai->ports[p].reg_cmds ^ active_cmds;
-    DPRINTF(7,"[reg_cmds]: active_cmds=0x%08x  done_mask=0x%08x\n", active_cmds, done_mask);
+    DPRINTF(DBG_DETAILED, DBG_PREFIX": [reg_cmds]: active_cmds=0x%08x  done_mask=0x%08x\n", active_cmds, done_mask);
   }
 
@@ -1775 +1775 @@
     #ifdef DEBUG
     u32 *unk = (u32 *) (port_dma_base(ai, p)->rx_fis + RX_FIS_UNK);
-    DPRINTF(0,"warning: unknown FIS %08lx %08lx %08lx %08lx\n", unk[0], unk[1], unk[2], unk[3]);
+    dprintf(0,"warning: unknown FIS %08lx %08lx %08lx %08lx\n", unk[0], unk[1], unk[2], unk[3]);
     #endif
     reset_port = 1;
@@ -1803 +1803 @@
   dprintf(0,"port #%d interrupt error status: 0x%08x; restarting port\n", p, irq_stat);
   #else
-  if (!ai->ports[p].devs[0].atapi || D32g_DbgLevel)
+  if (!ai->ports[p].devs[0].atapi)
   {
     dprintf(0,"port #%d interrupt error status: 0x%08x; restarting port\n", p, irq_stat);
@@ -1823 +1823 @@
 void ahci_get_geometry(IORBH FAR16DATA *vIorb, IORBH *pIorb)
 {
-  DPRINTF(7,"ahci_get_geometry(%d.%d.%d)\n", iorb_unit_adapter(pIorb),
+  DPRINTF(DBG_FUNCBEG, DBG_PREFIX": ahci_get_geometry(%d.%d.%d)\n", iorb_unit_adapter(pIorb),
           iorb_unit_port(pIorb), iorb_unit_device(pIorb));
 
@@ -1834 +1834 @@
 void ahci_unit_ready(IORBH FAR16DATA *vIorb, IORBH *pIorb)
 {
-  DPRINTF(7,"ahci_unit_ready(%d.%d.%d)\n", iorb_unit_adapter(pIorb),
+  DPRINTF(DBG_FUNCBEG, DBG_PREFIX": ahci_unit_ready(%d.%d.%d)\n", iorb_unit_adapter(pIorb),
           iorb_unit_port(pIorb), iorb_unit_device(pIorb));
 
@@ -1845 +1845 @@
 void ahci_read(IORBH FAR16DATA *vIorb, IORBH *pIorb)
 {
-  DPRINTF(7,"ahci_read(%d.%d.%d, %d, %d)\n", iorb_unit_adapter(vIorb),
+  DPRINTF(DBG_FUNCBEG, DBG_PREFIX": ahci_read(%d.%d.%d, %d, %d)\n", iorb_unit_adapter(vIorb),
           iorb_unit_port(pIorb), iorb_unit_device(pIorb),
           ((IORB_EXECUTEIO *) pIorb)->RBA,
@@ -1858 +1858 @@
 void ahci_verify(IORBH FAR16DATA *vIorb, IORBH *pIorb)
 {
-  DPRINTF(7,"ahci_verify(%d.%d.%d, %d, %d)\n", iorb_unit_adapter(pIorb),
+  DPRINTF(DBG_FUNCBEG, DBG_PREFIX": ahci_verify(%d.%d.%d, %d, %d)\n", iorb_unit_adapter(pIorb),
           iorb_unit_port(pIorb), iorb_unit_device(pIorb),
           ((IORB_EXECUTEIO *)pIorb)->RBA,
@@ -1871 +1871 @@
 void ahci_write(IORBH FAR16DATA *vIorb, IORBH *pIorb)
 {
-  DPRINTF(7,"ahci_write(%d.%d.%d, %d, %d)\n", iorb_unit_adapter(pIorb),
+  DPRINTF(DBG_FUNCBEG, DBG_PREFIX": ahci_write(%d.%d.%d, %d, %d)\n", iorb_unit_adapter(pIorb),
           iorb_unit_port(pIorb), iorb_unit_device(pIorb),
           ((IORB_EXECUTEIO *)pIorb)->RBA,
@@ -1888 +1888 @@
   int d = iorb_unit_device(pIorb);
 
-  DHEXDUMP(5,Far16ToFlat(((IORB_ADAPTER_PASSTHRU *)pIorb)->f16ControllerCmd),
+  DHEXDUMP(DBG_DETAILED ,Far16ToFlat(((IORB_ADAPTER_PASSTHRU *)pIorb)->f16ControllerCmd),
         ((IORB_ADAPTER_PASSTHRU *)pIorb)->ControllerCmdLen,
         "ahci_execute_cdb(%d.%d.%d): ", a, p, d);
@@ -1914 +1914 @@
   int d = iorb_unit_device(pIorb);
 
-  DHEXDUMP(5,Far16ToFlat(((IORB_ADAPTER_PASSTHRU *)pIorb)->f16ControllerCmd),
+  DHEXDUMP(DBG_DETAILED, Far16ToFlat(((IORB_ADAPTER_PASSTHRU *)pIorb)->f16ControllerCmd),
         ((IORB_ADAPTER_PASSTHRU *)pIorb)->ControllerCmdLen,
         "ahci_execute_ata(%d.%d.%d): ", a, p, d);