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

Timestamp:

Aug 9, 2013, 12:17:15 AM (12 years ago)

Author:

David Azarewicz

Message:

Added a check for bad geometries reported by the BIOS and fix them.

File:

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

trunk/src/os2ahci/ahci.c

@@ -265 +265 @@
   }
   ai->flags = initial_flags[ai->pci->board];
+  ai->hw_ports = (ai->cap & 0x1f) + 1;
 
   if ((ai->cap & HOST_CAP_64) && (ai->flags & AHCI_HFLAG_32BIT_ONLY)) {
@@ -298 +299 @@
     dprintf("JMB361 has only one port, port_map 0x%lx -> 0x%lx\n", ai->port_map, 1);
     ai->port_map = 1;
+    ai->hw_ports = 1;
   }
 
@@ -309 +311 @@
    *       in ahci_scan_ports().
    */
-  ports = (ai->cap & 0x1f) + 1;
+  ports = ai->hw_ports;
   for (i = 0; i < AHCI_MAX_PORTS; i++) {
     if (ai->port_map & (1UL << i)) {
@@ -317 +319 @@
   if (ports < 0) {
     /* more ports in port_map than in HOST_CAP & 0x1f */
-    ports = (ai->cap & 0x1f) + 1;
+    ports = ai->hw_ports;
     dprintf("implemented port map (0x%lx) contains more "
             "ports than nr_ports (%d), using nr_ports\n",