Changeset 156 for trunk/src/os2ahci/ata.c

Timestamp:

May 6, 2013, 7:57:39 PM (12 years ago)

Author:

David Azarewicz

Message:

debugging updates

File:

• trunk/src/os2ahci/ata.c (modified) (3 diffs)

trunk/src/os2ahci/ata.c

@@ -441 +441 @@
 }
 
-/******************************************************************************
- * Try to read LVM information from the disk. If found, use the LVM geometry.
- * This function will only work at init time. A better strategy would be to
- * calculate the geometry during ahci_scan_ports and save it away and then just
- * return the saved values when ata_get_geometry() is called.
- */
-int is_lvm_geometry(IORBH _far *iorb)
+int check_lvm(IORBH _far *iorb, ULONG sector)
 {
   ADD_WORKSPACE _far *aws = add_workspace(iorb);
@@ -454 +448 @@
   PDLA_Table_Sector pDLA;
   int p = iorb_unit_port(iorb);
+  int rc;
+
+  rc = ahci_exec_polled_cmd(ai, p, 0, 500, ATA_CMD_READ,
+         AP_SECTOR_28, (u32) sector-1,
+         AP_COUNT, (u16) 1,
+         AP_VADDR, (void _far *) aws->buf, 512,
+         AP_DEVICE, 0x40,
+         AP_END);
+  if (rc) return 0;
+
+  pDLA = (PDLA_Table_Sector)aws->buf;
+  ddphex(pDLA, sizeof(DLA_Table_Sector), "DLA sector %d:\n", sector-1);
+
+  if ((pDLA->DLA_Signature1 == DLA_TABLE_SIGNATURE1) && (pDLA->DLA_Signature2 == DLA_TABLE_SIGNATURE2)) {
+    ddprintf("is_lvm_geometry found at sector %d\n", sector);
+    geometry->TotalCylinders = pDLA->Cylinders;
+    geometry->NumHeads = pDLA->Heads_Per_Cylinder;
+    geometry->SectorsPerTrack = pDLA->Sectors_Per_Track;
+    return 1;
+  }
+
+  return 0;
+}
+
+/******************************************************************************
+ * Try to read LVM information from the disk. If found, use the LVM geometry.
+ * This function will only work at init time. A better strategy would be to
+ * calculate the geometry during ahci_scan_ports and save it away and then just
+ * return the saved values when ata_get_geometry() is called.
+ */
+int is_lvm_geometry(IORBH _far *iorb)
+{
+  GEOMETRY _far *geometry = ((IORB_GEOMETRY _far *) iorb)->pGeometry;
+  AD_INFO *ai = ad_infos + iorb_unit_adapter(iorb);
+  int p = iorb_unit_port(iorb);
   int d = iorb_unit_device(iorb);
-  int rc;
   ULONG sector;
 
@@ -463 +491 @@
     ddprintf("is_lvm_geometry (%d.%d.%d)\n", ad_no(ai), p, d);
 
+    /* First check the sector reported by the hardware */
+    if (check_lvm(iorb, geometry->SectorsPerTrack)) return 1;
+
     for (sector = 255; sector >= 63; sector >>= 1) {
-      rc = ahci_exec_polled_cmd(ai, p, 0, 500, ATA_CMD_READ,
-             AP_SECTOR_28, (u32) sector-1,
-             AP_COUNT, (u16) 1,
-             AP_VADDR, (void _far *) aws->buf, 512,
-             AP_DEVICE, 0x40,
-             AP_END);
-      if (rc) continue;
-
-      pDLA = (PDLA_Table_Sector)aws->buf;
-      ddphex(pDLA, sizeof(DLA_Table_Sector), "DLA sector %d:\n", sector-1);
-
-      if ((pDLA->DLA_Signature1 == DLA_TABLE_SIGNATURE1) && (pDLA->DLA_Signature2 == DLA_TABLE_SIGNATURE2)) {
-        ddprintf("is_lvm_geometry found at sector %d\n", sector);
-        geometry->TotalCylinders = pDLA->Cylinders;
-        geometry->NumHeads = pDLA->Heads_Per_Cylinder;
-        geometry->SectorsPerTrack = pDLA->Sectors_Per_Track;
-        return 1;
-      }
+      if (sector == geometry->SectorsPerTrack) continue;
+      if (check_lvm(iorb, sector)) return 1;
     }
   }