Changeset 80 for trunk/src/os2ahci/pci.c

Timestamp:

Mar 1, 2011, 10:10:11 AM (14 years ago)

Author:

chris

Message:

Version 1.06
============

• Finally came across a BIOS which accesses the ICH7/8 controller via SATA registers (i.e. not AHCI mode). This required a few changes to the code at boot time because it turned out that COMRESETs are required whenever switching to/from AHCI mode to allow the AHCI or SATA controller to re-discover the attached devices:

• 'init_reset' will now be forced on when finding a controller in non-AHCI mode at boot time.
• A COMRESET is initiated for each implemented port after turning off AHCI mode when restoring the BIOS configuration; this is done only for Intel controllers at this point because they map the AHCI port SCR MMIO registers even when not in AHCI mode.
• apm_suspend() has been adjusted to restore the BIOS configuration to prevent needless timeouts when the BIOS takes over during suspend or power-off operations.
• Small changes to the functions which save/restore BIOS/port settings to avoid pitfalls; among others, the port save/restore code now also saves and restores the port's engine status.

• Improvements to debug logging around port resets.

• Moved code to clear pending interrupts from ahci_reset_port() to ahci_stop_port() because both need it and resetting a port involves stopping it, first.

• NCQ mode has found to cause problems on a Dell D630. This may be related to the hard disk used for the test but since I've never seen more than one queued command regardless of the I/O load (even during simulaneous xcopy operations), NCQ mode is now off by default and needs to be turned on via the /N switch (i.e. the the /N switch now has a reversed meaning).

• Removed the code which attempts to establish another MMIO base address in case the one assigned by the BIOS can't be reserved via resource manager; if there's a conflict, it's extremely unlikely we would ever be able to restore the BIOS MMIO address at boot time without the BIOS clashing with whatever conflicts with the MMIO address, thus there's no point trying to do any of this.

• Implemented a reset context hook watchdog; in the early boot phase, some components apparently don't yield the CPU so the context hook will never execute without the watchdog. Now we'll give the context hook 10 seconds to execute, otherwise the watchdog will expire and we'll call the context hook directly from the corresponding timer callback.

File:

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

trunk/src/os2ahci/pci.c

@@ -183 +183 @@
  * other strings
  */
-static char s_already_claimed[] = "Warning: device already claimed by other driver.\n";
+static char s_already_claimed[] = "Warning: device already claimed by another driver.\n";
 
 
@@ -684 +684 @@
    *       the MMIO base address register (BAR), read back the resulting value
    *       and check the 0 bits from the right end. After doing this, we must
-   *       restore the original value set up by the BIOS because we're not yet
-   *       ready to take over.
+   *       restore the original value set up by the BIOS.
    *
    * The least significant 4 bits are not relevant for the MMIO address, thus
@@ -713 +712 @@
        mmio_size <<= 1);
 
-  ddprintf("MMIO size            = %ld\n", mmio_size);
-  ddprintf("MMIO address (BIOS)  = 0x%08lx\n", mmio_bios & 0xfffffff0UL);
+  ddprintf("MMIO size    = %ld\n", mmio_size);
+  ddprintf("MMIO address = 0x%08lx\n", mmio_bios & 0xfffffff0UL);
 
   /* register BIOS MMIO address space with resource manager */
@@ -724 +723 @@
 
   ret = RMAllocResource(rm_drvh, &ad_info->rm_mmio, &resource);
-
   if (ret != RMRC_SUCCESS) {
     if (ret == RMRC_RES_ALREADY_CLAIMED) {
-      /* MT: according to my observations, this is the 2nd place
-       * where we could fail due to the adapter having been already
-       * claimed by another driver...
-       */
       cprintf(s_already_claimed);
-      return;
+    } else {
+      cprintf("error: couldn't register MMIO region (rc = %d)\n", ret);
     }
-    /* didn't work; try to find another MMIO region */
-    cprintf("warning: BIOS MMIO address not accepted by resource manager "
-            "(code %d)\n", ret);
-    memset(&resource, 0x00, sizeof(resource));
-    resource.ResourceType         = RS_TYPE_MEM;
-    resource.MEMResource.MemSize  = mmio_size;
-    resource.MEMResource.MemFlags = RS_MEM_EXCLUSIVE | RS_SEARCH;
-    
-    ret = RMAllocResource(rm_drvh, &ad_info->rm_mmio, &resource);
-    
-    if (ret == RMRC_SUCCESS) {
-      /* MT: got a new address from Resource Manager; now we
-       * need to tell PCI about the new address.
-       * Leave the last 4 bits of the original MMIO value alone.
-       */
-      mmio_bios = (mmio_bios & 0x0000000fUL) |
-        (resource.MEMResource.MemBase & 0xfffffff0UL);
-      ddprintf("address we got from RM: 0x%08lx\n",
-               resource.MEMResource.MemBase);
-      ddprintf("setting new MMIO addr to 0x%08lx\n", mmio_bios);
-      
-      if (pci_write_conf(bus, dev_func, AHCI_MMIO,
-                         sizeof(u32), mmio_bios) != OH_SUCCESS) {
-        /* failed to update MMIO address - bail out */
-        cprintf("error: couldn't update MMIO address\n");
-        ret = ~RMRC_SUCCESS;
-        return;
-      }
-    }
-  }
-
-  if (ret != RMRC_SUCCESS) {
-    cprintf("error: couldn't register MMIO region (rc = %d)\n", ret);
     return;
   }
   rc_list->hResource[rc_list->NumResource++] = ad_info->rm_mmio;
-  ddprintf("MMIO address (final) = 0x%08lx\n", resource.MEMResource.MemBase);
 
   /****************************************************************************