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

Timestamp:

Feb 23, 2021, 10:10:11 PM (4 years ago)

Author:

David Azarewicz

Message:

Add 64/48 bit LBA support.

File:

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

trunk/src/os2ahci/ahci.c

@@ -79 +79 @@
   u32 version;
 
-  DPRINTF(2,"AHCI global registers for adapter %d %d:%d:%d irq=%d addr=0x%x\n",
+  dprintf(0,"AHCI global registers for adapter %d %d:%d:%d irq=%d addr=0x%x\n",
       ad_no(ai),
       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->irq, ai->mmio_phys);
 
-  for (i = 0; i <= HOST_CAP2; i += sizeof(u32)) {
+  for (i = 0; i <= HOST_CAP2; i += sizeof(u32))
+  {
     u32 val;
 
@@ -98 +99 @@
     dprintf(0," %02x: %08lx", i, val);
 
-    if (i == HOST_CAP) {
+    if (i == HOST_CAP)
+    {
       dprintf(0," -");
       if (val & HOST_CAP_64)         dprintf(0," 64bit");
@@ -119 +121 @@
       dprintf(0," cmd_slots:%d", ((val >> 8) & 0x1f) + 1);
       dprintf(0," ports:%d",     (val & 0x1f) + 1);
-    } else if (i == HOST_CTL) {
+    }
+    else if (i == HOST_CTL)
+    {
       dprintf(0," -");
       if (val & HOST_AHCI_EN)        dprintf(0," ahci_enabled");
       if (val & HOST_IRQ_EN)         dprintf(0," irq_enabled");
       if (val & HOST_RESET)          dprintf(0," resetting");
-    } else if (i == HOST_CAP2) {
+    }
+    else if (i == HOST_CAP2)
+    {
       dprintf(0," -");
       if (val & HOST_CAP2_BOH)       dprintf(0," boh");
@@ -278 +284 @@
   }
 
-  DUMP_HOST_REGS(2,ai,1);
+  DUMP_HOST_REGS(6,ai,1);
 
   return(0);
@@ -529 +535 @@
   int i;
 
-  DPRINTF(1,__func__": completing initialization of adapter #%d\n", ad_no(ai));
+  DPRINTF(2,__func__": completing initialization of adapter #%d\n", ad_no(ai));
 
   if (!ai->int_set)
@@ -609 +615 @@
   /* pci_enable_int(ai->bus, ai->dev_func); */
 
-  DPRINTF(1,__func__": done\n");
+  DPRINTF(2,__func__": done\n");
   return(0);
 }
@@ -834 +840 @@
     {
       /* this port seems to have a device attached and ready for commands */
-      DPRINTF(1,__func__": port %d seems to be attached to a device; probing...\n", p);
+      DPRINTF(2,__func__": port %d seems to be attached to a device; probing...\n", p);
 
       #ifdef DAZ_NEW_CODE
@@ -909 +915 @@
   TIMER Timer;
 
-  DPRINTF(2,__func__": resetting port %d.%d\n", ad_no(ai), p);
-  DUMP_PORT_REGS(2,ai,p);
+  DPRINTF(3,__func__": resetting port %d.%d\n", ad_no(ai), p);
+  DUMP_PORT_REGS(3,ai,p);
 
   /* stop port engines (we don't care whether there is an error doing so) */
@@ -944 +950 @@
 
   /* wait for communication to be re-established after port reset */
-  DPRINTF(2,"Wait for communication...\n");
+  DPRINTF(3,"Wait for communication...\n");
   TimerInit(&Timer, 500);
   while (((tmp = readl(port_mmio + PORT_SCR_STAT)) & 3) != 3)
@@ -950 +956 @@
     if (TimerCheckAndBlock(&Timer))
     {
-      DPRINTF(0,"no device present after resetting port #%d (PORT_SCR_STAT = 0x%x)\n", p, tmp);
+      DPRINTF(2,"no device present after resetting port #%d (PORT_SCR_STAT = 0x%x)\n", p, tmp);
       return(-1);
     }
@@ -960 +966 @@
 
   /* start port so we can receive the COMRESET FIS */
-  DPRINTF(2,__func__": starting port %d again\n", p);
+  DPRINTF(3,__func__": starting port %d again\n", p);
   ahci_start_port(ai, p, ei);
 
@@ -1794 +1800 @@
   }
 
-  dprintf(0,"port #%d interrupt error status: 0x%08lx; restarting port\n", p, irq_stat);
+  #ifdef DEBUG
+  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)
+  {
+    dprintf(0,"port #%d interrupt error status: 0x%08x; restarting port\n", p, irq_stat);
+  }
+  #endif
 
   /* Handle device-specific errors. Those errors typically involve restarting