Changeset 31

Timestamp:

Sep 30, 2010, 11:50:09 AM (15 years ago)

Author:

markus

Message:

display error if device claimed by other driver; update BIOS MMIO address if resource manager rejects it; ICH5 does NOT support AHCI -> removed

Location:

trunk/src/os2ahci

Files:

• os2ahci.def (modified) (1 diff)
• os2ahci.h (modified) (1 diff)
• pci.c (modified) (3 diffs)

trunk/src/os2ahci/os2ahci.def

@@ -1 +1 @@
 library os2ahci
-Description '$@#thi.guten (www.thiguten.de):1.00.20100924#@OS/2 AHCI Adapter Device Driver'
+Description '$@#thi.guten (www.thiguten.de):1.00.20100930#@OS/2 AHCI Adapter Device Driver'
 protmode
 

trunk/src/os2ahci/os2ahci.h

@@ -217 +217 @@
 #define PCI_VENDOR_ID_CT       0x102c
 #define PCI_VENDOR_ID_INTEL    0x8086
+#define PCI_VENDOR_ID_INITIO   0x1101
 #define PCI_VENDOR_ID_JMICRON  0x197B
 #define PCI_VENDOR_ID_MARVELL  0x11ab

trunk/src/os2ahci/pci.c

@@ -161 +161 @@
 PCI_ID pci_ids[] = {
 
-  /* Intel */
+  /* Intel
+   * NOTE: ICH5 controller does NOT support AHCI, so we do
+   *       not add it here! */
   { PCI_VDEVICE(INTEL, 0x2652), board_ahci }, /* ICH6 */
   { PCI_VDEVICE(INTEL, 0x2653), board_ahci }, /* ICH6M */
@@ -602 +604 @@
 
   ret = RMAllocResource(rm_drvh, &ad_info->rm_irq, &resource);
-  if (ret != RMRC_SUCCESS) {
-    cprintf("error: couldn't register IRQ %d (rc = %d)\n", irq, ret);
-    return;
+  switch (ret) {
+    case RMRC_SUCCESS:
+      break;
+    case RMRC_DEV_ALREADY_CLAIMED:
+    case RMRC_RES_ALREADY_CLAIMED:
+      cprintf("warning: device already claimed by other driver\n");
+      return;
+    default:
+      cprintf("error: couldn't register IRQ %d (rc = %d)\n", irq, ret);
+      return;
   }
   rc_list->hResource[rc_list->NumResource++] = ad_info->rm_irq;
@@ -663 +672 @@
 
     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 the BIOS 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 BIOS 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 BIOS MMIO address - bail out */
+        cprintf("error: couldn't update BIOS MMIO address\n");
+        ret = ~RMRC_SUCCESS;
+        goto add_pci_fail;
+      }
+
+    }
   }