Changeset 48 for trunk

Timestamp:

Dec 2, 2010, 1:12:53 PM (15 years ago)

Author:

markus

Message:

display console message if AHCI device is claimed by other driver; fixed crash during init cleanup (if adapter init fails)

Location:

trunk/src/os2ahci

Files:

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

trunk/src/os2ahci/os2ahci.def

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

trunk/src/os2ahci/pci.c

@@ -179 +179 @@
 
 static char s_generic[]       = "Generic";
+
+/******************************************************************************
+ * other strings
+ */
+static char s_already_claimed[] = "Warning: device already claimed by other driver.\n";
 
 
@@ -641 +646 @@
     case RMRC_DEV_ALREADY_CLAIMED:
     case RMRC_RES_ALREADY_CLAIMED:
-      cprintf("warning: device already claimed by other driver\n");
+      cprintf(s_already_claimed);
       return;
     default:
@@ -677 +682 @@
       pci_write_conf(bus, dev_func, AHCI_MMIO, sizeof(u32), mmio_bios);
     }
-    goto add_pci_fail;
+    return;
   }
   for (mmio_size = 0x00000010UL;
@@ -696 +701 @@
 
   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;
+    }
     /* didn't work; try to find another MMIO region */
-    cprintf("warning: BIOS MMIO address not accepted by resource manager\n");
+    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
@@ -711 +725 @@
        */
       mmio_bios = (mmio_bios & 0x0000000fUL) |
-        (resource.MEMResource.MemBase & 0xfffffff0UL);
+        (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) {
+                         sizeof(u32), mmio_bios) != OH_SUCCESS) {
         /* failed to update MMIO address - bail out */
-        cprintf("error: couldn't update MMIO address\n");
-        ret = ~RMRC_SUCCESS;
-        goto add_pci_fail;
+        cprintf("error: couldn't update MMIO address\n");
+        ret = ~RMRC_SUCCESS;
+        return;
       }
-
     }
   }
@@ -729 +742 @@
   if (ret != RMRC_SUCCESS) {
     cprintf("error: couldn't register MMIO region (rc = %d)\n", ret);
-    goto add_pci_fail;
+    return;
   }
   rc_list->hResource[rc_list->NumResource++] = ad_info->rm_mmio;