Changeset 43483 in vbox for trunk/src/VBox/Devices/PC/BIOS

Timestamp:

Oct 1, 2012 10:13:16 AM (12 years ago)

Author:

vboxsync

Message:

BIOS: Build default logical geometry if none was provided in CMOS.

Location:

trunk/src/VBox/Devices/PC/BIOS

Files:

• ahci.c (modified) (3 diffs)
• ata.c (modified) (4 diffs)
• disk.c (modified) (1 diff)
• ebda.h (modified) (1 diff)

trunk/src/VBox/Devices/PC/BIOS/ahci.c

@@ -608 +608 @@
 }
 
-static void ahci_port_detect_device(ahci_t __far *ahci, uint8_t u8Port)
+void ahci_port_detect_device(ahci_t __far *ahci, uint8_t u8Port)
 {
     uint32_t            val;
@@ -651 +651 @@
                 uint32_t    sectors;
                 uint16_t    cylinders, heads, spt;
-                uint16_t    lcylinders, lheads, lspt;
+                chs_t       lgeo;
                 uint8_t     idxCmosChsBase;
 
@@ -711 +711 @@
                 if (idxCmosChsBase && inb_cmos(idxCmosChsBase+7))
                 {
-                    lcylinders = inb_cmos(idxCmosChsBase + 0) + (inb_cmos(idxCmosChsBase + 1) << 8);
-                    lheads     = inb_cmos(idxCmosChsBase + 2);
-                    lspt       = inb_cmos(idxCmosChsBase + 7);
+                    lgeo.cylinders = inb_cmos(idxCmosChsBase + 0) + (inb_cmos(idxCmosChsBase + 1) << 8);
+                    lgeo.heads     = inb_cmos(idxCmosChsBase + 2);
+                    lgeo.spt       = inb_cmos(idxCmosChsBase + 7);
                 }
                 else
-                {
-                    //@todo: What should we really do if logical geometry isn't in the CMOS?
-                    lcylinders = cylinders;
-                    lheads     = heads;
-                    lspt       = spt;
-                }
+                    set_geom_lba(&lgeo, sectors);   /* Default EDD-style translated LBA geometry. */
+
                 BX_INFO("AHCI %d-P#%d: PCHS=%u/%d/%d LCHS=%u/%u/%u %ld sectors\n", devcount_ahci,
-                        u8Port, cylinders, heads, spt, lcylinders, lheads, lspt, sectors);
-
-                bios_dsk->devices[hd_index].lchs.heads     = lheads;
-                bios_dsk->devices[hd_index].lchs.cylinders = lcylinders;
-                bios_dsk->devices[hd_index].lchs.spt       = lspt;
+                        u8Port, cylinders, heads, spt, lgeo.cylinders, lgeo.heads, lgeo.spt, sectors);
+
+                bios_dsk->devices[hd_index].lchs = lgeo;
 
                 /* Store the ID of the disk in the BIOS hdidmap. */

trunk/src/VBox/Devices/PC/BIOS/ata.c

@@ -462 +462 @@
             uint32_t    sectors;
             uint16_t    cylinders, heads, spt, blksize;
-            uint16_t    lcylinders, lheads, lspt;
+            chs_t       lgeo;
             uint8_t     chsgeo_base;
             uint8_t     removable, mode;
@@ -506 +506 @@
             if (chsgeo_base)
             {
-                lcylinders = inb_cmos(chsgeo_base) + (inb_cmos(chsgeo_base+1) << 8);
-                lheads = inb_cmos(chsgeo_base+2);
-                lspt = inb_cmos(chsgeo_base+7);
+                lgeo.cylinders = inb_cmos(chsgeo_base) + (inb_cmos(chsgeo_base + 1) << 8);
+                lgeo.heads     = inb_cmos(chsgeo_base + 2);
+                lgeo.spt       = inb_cmos(chsgeo_base + 7);
             }
             else
-            {
-                lcylinders = 0;
-                lheads = 0;
-                lspt = 0;
-            }
+                set_geom_lba(&lgeo, sectors);   /* Default EDD-style translated LBA geometry. */
+
             BX_INFO("ata%d-%d: PCHS=%u/%d/%d LCHS=%u/%u/%u\n", channel, slave,
-                    cylinders,heads, spt, lcylinders, lheads, lspt);
+                    cylinders,heads, spt, lgeo.cylinders, lgeo.heads, lgeo.spt);
 
             bios_dsk->devices[device].device         = DSK_DEVICE_HD;
@@ -527 +524 @@
             bios_dsk->devices[device].pchs.spt       = spt;
             bios_dsk->devices[device].sectors        = sectors;
-            bios_dsk->devices[device].lchs.heads     = lheads;
-            bios_dsk->devices[device].lchs.cylinders = lcylinders;
-            bios_dsk->devices[device].lchs.spt       = lspt;
+            bios_dsk->devices[device].lchs           = lgeo;
             if (device < 2)
             {
@@ -544 +539 @@
                  * isn't worth the effort of converting from AMI to Award CMOS
                  * format. Just do it here. */
-                fdpt->lcyl  = lcylinders;
-                fdpt->lhead = lheads;
+                fdpt->lcyl  = lgeo.cylinders;
+                fdpt->lhead = lgeo.heads;
                 fdpt->sig   = 0xa0;
                 fdpt->spt   = spt;

trunk/src/VBox/Devices/PC/BIOS/disk.c

@@ -92 +92 @@
 #define ES      r.es
 #define FLAGS   r.ra.flags.u.r16.flags
+
+
+/* 
+ * Build translated CHS geometry given a disk size in sectors. Based on
+ * Phoenix EDD 3.0. This is used as a fallback to generate sane logical
+ * geometry in case none was provided in CMOS.
+ */
+void set_geom_lba(chs_t __far *lgeo, uint32_t nsectors)
+{
+    uint32_t    limit = 8257536;    /* 1024 * 128 * 63 */
+    unsigned    heads = 255;
+    int         i;
+    
+    /* Start with ~4GB limit, go down to 504MB. */
+    for (i = 0; i < 4; ++i) {
+        if (nsectors <= limit)
+            heads = (heads + 1) / 2;
+        limit /= 2;
+    }
+
+    lgeo->cylinders = nsectors / (heads * 63UL);
+    if (lgeo->cylinders > 1024)
+        lgeo->cylinders = 1024;
+    lgeo->heads     = heads;
+    lgeo->spt       = 63;   /* Always 63 sectors per track, the maximum. */
+}
+
 
 void BIOSCALL int13_harddisk(disk_regs_t r)

trunk/src/VBox/Devices/PC/BIOS/ebda.h

@@ -316 +316 @@
 int __fastcall ahci_write_sectors(bio_dsk_t __far *bios_dsk);
 
+extern void set_geom_lba(chs_t __far *lgeo, uint32_t nsectors);
+
 // @todo: put this elsewhere (and change/eliminate?)
 #define SET_DISK_RET_STATUS(status) write_byte(0x0040, 0x0074, status)