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

Timestamp:

Apr 10, 2013, 6:47:05 PM (12 years ago)

Author:

David Azarewicz

Message:

Begin adding user info output.
Added LVM support.

File:

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

trunk/src/os2ahci/ata.c

@@ -442 +442 @@
 
 /******************************************************************************
+ * 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)
+{
+  ADD_WORKSPACE _far *aws = add_workspace(iorb);
+  AD_INFO *ai = ad_infos + iorb_unit_adapter(iorb);
+  GEOMETRY _far *geometry = ((IORB_GEOMETRY _far *) iorb)->pGeometry;
+  PDLA_Table_Sector pDLA;
+  int p = iorb_unit_port(iorb);
+  int d = iorb_unit_device(iorb);
+  int rc;
+  ULONG sector;
+
+  if (init_complete) return 0; /* We cannot use ahci_exec_polled_cmd() after init_complete */
+
+  if (use_lvm_info) {
+    ddprintf("is_lvm_geometry (%d.%d.%d)\n", ad_no(ai), p, d);
+
+    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;
+      }
+    }
+  }
+
+  return 0;
+}
+
+/******************************************************************************
  * Post processing function for ata_get_geometry(): convert the ATA identify
  * information to OS/2 IOCC_GEOMETRY information.
@@ -452 +499 @@
   int a = iorb_unit_adapter(iorb);
   int p = iorb_unit_port(iorb);
+  char *Method;
 
   /* Fill-in geometry information; the ATA-8 spec declares the geometry
@@ -500 +548 @@
   }
 
+  Method = "None";
   /* fabricate the remaining geometry fields */
   if (track_size[a][p] != 0) {
@@ -511 +560 @@
                                  ((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 &&
@@ -521 +570 @@
     geometry->SectorsPerTrack = CUR_SECTORS(id_buf);
     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) {
@@ -528 +577 @@
     geometry->SectorsPerTrack = ATA_SECTORS(id_buf);
     geometry->TotalCylinders  = ATA_CYLS(id_buf);
-
+    Method = "ATA";
   } else {
     /* use typical SCSI geometry */
@@ -536 +585 @@
                                  ((u32) geometry->NumHeads *
                                   (u32) geometry->SectorsPerTrack);
-  }
+    Method = "SCSI";
+  }
+
+  if (is_lvm_geometry(iorb)) Method = "LVM";
 
   if (debug) {
-    printf("geometry information:\n");
-    printf("  heads:     %d\n", (u16) geometry->NumHeads);
-    printf("  sectors:   %d\n", (u16) geometry->SectorsPerTrack);
-    printf("  cylinders: %d\n", (u16) geometry->TotalCylinders);
-    printf("  capacity:  %ldMB\n", (u32) (geometry->TotalSectors / 2048));
+    printf("Drive geometry: %d cylinders, %d heads, %d sectors per track (%ldMB) (%s)\n",
+        (u16) geometry->TotalCylinders, (u16) geometry->NumHeads, (u16) geometry->SectorsPerTrack,
+        (u32) (geometry->TotalSectors / 2048), Method);
   }