Changeset 169 for trunk/src/os2ahci/ata.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/ata.c (modified) (5 diffs)

trunk/src/os2ahci/ata.c

@@ -440 +440 @@
 
   return(rc);
+}
+
+/* Adjust the cylinder count in the physical
+ * geometry to the last full cylinder.
+ */
+int adjust_cylinders(GEOMETRY _far *geometry, ULONG TotalSectors) {
+  USHORT SecPerCyl;
+  int rc = FALSE;
+
+  geometry->TotalSectors = TotalSectors;
+  SecPerCyl = geometry->SectorsPerTrack * geometry->NumHeads;
+  if (SecPerCyl > 0) {
+    ULONG TotalCylinders  = TotalSectors / SecPerCyl;
+
+    geometry->TotalSectors   = TotalCylinders * SecPerCyl;
+    geometry->TotalCylinders = TotalCylinders;
+    if (TotalCylinders >> 16) {
+      geometry->TotalCylinders = 65535;
+      rc = TRUE;
+    }
+  }
+  return (rc);
+}
+
+/* Calculate the logical geometry based on the input physcial geometry
+ * using the LBA Assist Translation algorithm.
+ */
+#define BIOS_MAX_CYLINDERS       1024l
+#define BIOS_MAX_NUMHEADS         255
+#define BIOS_MAX_SECTORSPERTRACK   63
+void log_geom_calculate_LBA_assist(GEOMETRY _far *geometry, ULONG TotalSectors)
+{
+  UCHAR numSpT   = BIOS_MAX_SECTORSPERTRACK;
+  UCHAR numHeads = BIOS_MAX_NUMHEADS;
+  ULONG Cylinders;
+
+  if (TotalSectors <= (BIOS_MAX_CYLINDERS * 128 * BIOS_MAX_SECTORSPERTRACK)) {
+    USHORT temp = (TotalSectors - 1) / (BIOS_MAX_CYLINDERS * BIOS_MAX_SECTORSPERTRACK);
+
+    if (temp < 16)      numHeads = 16;
+    else if (temp < 32) numHeads = 32;
+    else if (temp < 64) numHeads = 64;
+    else                numHeads = 128;
+  }
+
+  do {
+    Cylinders = TotalSectors / (USHORT)(numHeads * numSpT);
+    if (Cylinders >> 16) {
+      if (numSpT < 128)
+        numSpT = (numSpT << 1) | 1;
+      else
+        Cylinders = 65535; // overflow !
+    }
+  } while (Cylinders >> 16);
+
+  geometry->TotalCylinders  = Cylinders;
+  geometry->NumHeads        = numHeads;
+  geometry->SectorsPerTrack = numSpT;
 }
 
@@ -574 +632 @@
     geometry->NumHeads        = 255;
     geometry->SectorsPerTrack = track_size[a][p];
-    geometry->TotalCylinders  = geometry->TotalSectors /
-                                 ((u32) geometry->NumHeads *
-                                  (u32) geometry->SectorsPerTrack);
+    geometry->TotalCylinders  = geometry->TotalSectors / ((u32) geometry->NumHeads * (u32) geometry->SectorsPerTrack);
     Method = "Custom";
-  } else if (CUR_HEADS(id_buf) > 0 && CUR_CYLS(id_buf) > 0 &&
-             CUR_SECTORS(id_buf) > 0 &&
-             CUR_CAPACITY(id_buf) == (u32) CUR_HEADS(id_buf) *
-                                     (u32) CUR_CYLS(id_buf) *
-                                     (u32) CUR_SECTORS(id_buf)) {
+  } else if (CUR_HEADS(id_buf) > 0 && CUR_CYLS(id_buf) > 0 && CUR_SECTORS(id_buf) > 0 &&
+             CUR_CAPACITY(id_buf) == (u32) CUR_HEADS(id_buf) * (u32) CUR_CYLS(id_buf) * (u32) CUR_SECTORS(id_buf)) {
     /* BIOS-supplied (aka "current") geometry values look valid */
     geometry->NumHeads        = CUR_HEADS(id_buf);
@@ -588 +641 @@
     geometry->TotalCylinders  = CUR_CYLS(id_buf);
     Method = "BIOS";
-  } else if (ATA_HEADS(id_buf) > 0 && ATA_CYLS(id_buf) > 0 &&
-             ATA_SECTORS(id_buf) > 0) {
+  } else if (ATA_HEADS(id_buf) > 0 && ATA_CYLS(id_buf) > 0 && ATA_SECTORS(id_buf) > 0) {
     /* ATA-supplied values for geometry look valid */
     geometry->NumHeads        = ATA_HEADS(id_buf);
@@ -599 +651 @@
     geometry->NumHeads        = 255;
     geometry->SectorsPerTrack = 63;
-    geometry->TotalCylinders  = geometry->TotalSectors /
-                                 ((u32) geometry->NumHeads *
-                                  (u32) geometry->SectorsPerTrack);
+    geometry->TotalCylinders  = geometry->TotalSectors / ((u32) geometry->NumHeads * (u32) geometry->SectorsPerTrack);
     Method = "SCSI";
   }
+
+  dprintf("Physical geometry: %ld cylinders, %d heads, %d sectors per track (%ldMB) (%s)\n",
+      (u32) geometry->TotalCylinders, (u16) geometry->NumHeads, (u16) geometry->SectorsPerTrack,
+      (u32) (geometry->TotalSectors / 2048), Method);
+
+  /* Fixup the geometry in case the geometry reported by the BIOS is bad */
+  if (adjust_cylinders(geometry, geometry->TotalSectors)) { // cylinder overflow
+    log_geom_calculate_LBA_assist(geometry, geometry->TotalSectors);
+    geometry->TotalSectors = (USHORT)(geometry->NumHeads * geometry->SectorsPerTrack) * (ULONG)geometry->TotalCylinders;
+  }
+  adjust_cylinders(geometry, geometry->TotalSectors);
+
+  dprintf("Logical geometry: %ld cylinders, %d heads, %d sectors per track (%ldMB) (%s)\n",
+      (u32) geometry->TotalCylinders, (u16) geometry->NumHeads, (u16) geometry->SectorsPerTrack,
+      (u32) (geometry->TotalSectors / 2048), Method);
 
   if (is_lvm_geometry(iorb)) Method = "LVM";
@@ -612 +677 @@
   ad_infos[a].ports[p].devs[0].dev_info.Method = Method;
 
-  dprintf("Drive geometry: %ld cylinders, %d heads, %d sectors per track (%ldMB) (%s)\n",
+  dprintf("Reported geometry: %ld cylinders, %d heads, %d sectors per track (%ldMB) (%s)\n",
       (u32) geometry->TotalCylinders, (u16) geometry->NumHeads, (u16) geometry->SectorsPerTrack,
       (u32) (geometry->TotalSectors / 2048), Method);