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

Timestamp:

Sep 7, 2013, 5:52:45 PM (12 years ago)

Author:

David Azarewicz

Message:

Enhanced debug output
Fixed a long time PCI ID bug.

File:

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

trunk/src/os2ahci/ahci.c

@@ -4 +4 @@
  * Copyright (c) 2011 thi.guten Software Development
  * Copyright (c) 2011 Mensys B.V.
- * Portions copyright (c) 2013 David Azarewicz
+ * Copyright (c) 2013 David Azarewicz
  *
  * Authors: Christian Mueller, Markus Thielen
@@ -234 +234 @@
   }
 
-#if 0
-  /* init_reset is set by default. This code is commented out to allow
-   * unsetting init_reset by a command line switch
-   */
   if ((ai->bios_config[HOST_CTL / sizeof(u32)] & HOST_AHCI_EN) == 0 &&
-      ai->pci->vendor == PCI_VENDOR_ID_INTEL) {
+      ai->pci_vendor == PCI_VENDOR_ID_INTEL) {
     /* Adapter is not in AHCI mode and the spec says a COMRESET is
      * required when switching from SATA to AHCI mode and vice versa.
@@ -245 +241 @@
     init_reset = 1;
   }
-#endif
 
   #ifdef DEBUG
@@ -295 +290 @@
   }
 
-  if (ai->pci->vendor == PCI_VENDOR_ID_JMICRON &&
-      ai->pci->device == 0x2361 && ai->port_map != 1) {
+  if (ai->pci_vendor == PCI_VENDOR_ID_JMICRON &&
+      ai->pci_device == 0x2361 && ai->port_map != 1) {
     dprintf("JMB361 has only one port, port_map 0x%lx -> 0x%lx\n", ai->port_map, 1);
     ai->port_map = 1;
@@ -353 +348 @@
 
   if ((ai->bios_config[HOST_CTL / sizeof(u32)] & HOST_AHCI_EN) == 0 &&
-      ai->pci->vendor == PCI_VENDOR_ID_INTEL) {
+      ai->pci_vendor == PCI_VENDOR_ID_INTEL) {
 
     /* This BIOS apparently accesses the controller via SATA registers and
@@ -455 +450 @@
     ahci_restore_initial_config(ai);
 
-    if (ai->pci->vendor == PCI_VENDOR_ID_INTEL) {
+    if (ai->pci_vendor == PCI_VENDOR_ID_INTEL) {
       u32 tmp16 = 0;
 
@@ -1243 +1238 @@
     }
 
+    /* 0x89 = BSY(0x80) | DRQ(0x08) | ERR(0x01) */
     if (rc) {
       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) {
+    } else if (readl(port_mmio + PORT_SCR_ERR) != 0 || readl(port_mmio + PORT_TFDATA) & 0x89) {
       dprintf(" polled cmd error for IORB %Fp", iorb);
       iorb_seterr(iorb, IOERR_DEVICE_NONSPECIFIC);
@@ -1313 +1308 @@
   while (readl(port_mmio + PORT_CMD_ISSUE) & 1) {
     rc = timer_check_and_block(&Timer);
-    if (rc) break;
-  }
-
-  /* check error condition */
+    if (rc) {
+      dprintf(" Timeout", tmp);
+      break;
+    }
+  }
+
   if ((tmp = readl(port_mmio + PORT_SCR_ERR)) != 0) {
     dprintf(" SERR = 0x%08lx", tmp);
     rc = 1;
   }
+  /* 0x89 = BSY(0x80) | DRQ(0x08) | ERR(0x01) */
   if (((tmp = readl(port_mmio + PORT_TFDATA)) & 0x89) != 0) {
     dprintf(" TFDATA = 0x%08lx", tmp);
@@ -1819 +1817 @@
 
   /* try to detect virtualbox environment to enable a hack for IRQ routing */
-  if (ai == ad_infos && ai->pci->vendor == 0x8086 && ai->pci->device == 0x2829 &&
+  if (ai == ad_infos && ai->pci_vendor == 0x8086 && ai->pci_device == 0x2829 &&
       !memcmp(ata_dev_name(id_buf), "VBOX HARDDISK", 13)) {
     /* running inside virtualbox */