Changeset 42947 in vbox for trunk/src

Timestamp:

Aug 23, 2012 12:06:39 PM (12 years ago)

Author:

vboxsync

Message:

BIOS: Make AHCI init more similar to ATA, log discovered harddisks.

Location:

trunk/src/VBox/Devices/PC/BIOS

Files:

• ahci.c (modified) (4 diffs)
• ata.c (modified) (1 diff)

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

@@ -645 +645 @@
             if (val == 0x101)
             {
-                uint32_t    cSectors;
-                uint16_t    cCylinders, cHeads, cSectorsPerTrack;
+                uint32_t    sectors;
+                uint16_t    cylinders, heads, spt;
+                uint16_t    lcylinders, lheads, lspt;
                 uint8_t     idxCmosChsBase;
 
@@ -661 +662 @@
                 hd_index = devcount_ahci + BX_MAX_ATA_DEVICES + BX_MAX_SCSI_DEVICES;
 
-                removable        = *(abBuffer+0) & 0x80 ? 1 : 0;
-                cCylinders       = *(uint16_t *)(abBuffer+(1*2));   // word 1
-                cHeads           = *(uint16_t *)(abBuffer+(3*2));   // word 3
-                cSectorsPerTrack = *(uint16_t *)(abBuffer+(6*2));   // word 6
-                cSectors         = *(uint32_t *)(abBuffer+(60*2));  // word 60 and word 61
+                removable = *(abBuffer+0) & 0x80 ? 1 : 0;
+                cylinders = *(uint16_t *)(abBuffer+(1*2));  // word 1
+                heads     = *(uint16_t *)(abBuffer+(3*2));  // word 3
+                spt       = *(uint16_t *)(abBuffer+(6*2));  // word 6
+                sectors   = *(uint32_t *)(abBuffer+(60*2)); // word 60 and word 61
 
                 /** @todo update sectors to be a 64 bit number (also lba...). */
-                if (cSectors == 268435455)
-                    cSectors = *(uint32_t *)(abBuffer+(100*2)); // words 100 to 103 (someday)
-
-                DBG_AHCI("AHCI: %ld sectors\n", cSectors);
+                if (sectors == 0x0FFFFFFF)  /* For disks bigger than ~128GB */
+                    sectors = *(uint32_t *)(abBuffer+(100*2)); // words 100 to 103 (someday)
+
+                DBG_AHCI("AHCI: %ld sectors\n", sectors);
 
                 bios_dsk->ahcidev[devcount_ahci].port = u8Port;
@@ -680 +681 @@
                 bios_dsk->devices[hd_index].blksize     = 512;
                 bios_dsk->devices[hd_index].translation = GEO_TRANSLATION_LBA;
-                bios_dsk->devices[hd_index].sectors     = cSectors;
-
-                bios_dsk->devices[hd_index].pchs.heads     = cHeads;
-                bios_dsk->devices[hd_index].pchs.cylinders = cCylinders;
-                bios_dsk->devices[hd_index].pchs.spt       = cSectorsPerTrack;
+                bios_dsk->devices[hd_index].sectors     = sectors;
+
+                bios_dsk->devices[hd_index].pchs.heads     = heads;
+                bios_dsk->devices[hd_index].pchs.cylinders = cylinders;
+                bios_dsk->devices[hd_index].pchs.spt       = spt;
 
                 /* Get logical CHS geometry. */
@@ -706 +707 @@
                 if (idxCmosChsBase && inb_cmos(idxCmosChsBase+7))
                 {
-                    cCylinders = inb_cmos(idxCmosChsBase) + (inb_cmos(idxCmosChsBase+1) << 8);
-                    cHeads = inb_cmos(idxCmosChsBase+2);
-                    cSectorsPerTrack = inb_cmos(idxCmosChsBase+7);
+                    lcylinders = inb_cmos(idxCmosChsBase + 0) + (inb_cmos(idxCmosChsBase + 1) << 8);
+                    lheads     = inb_cmos(idxCmosChsBase + 2);
+                    lspt       = inb_cmos(idxCmosChsBase + 7);
                 }
                 else
                 {
-#if 0   // LCHS equals PCHS?
-                    cCylinders = 0;
-                    cHeads = 0;
-                    cSectorsPerTrack = 0;
-#endif
+                    //@todo: What should we really do if logical geometry isn't in the CMOS?
+                    lcylinders = cylinders;
+                    lheads     = heads;
+                    lspt       = spt;
                 }
-                DBG_AHCI("AHCI: Dev %d LCHS=%d/%d/%d\n", 
-                         devcount_ahci, cCylinders, cHeads, cSectorsPerTrack);
-
-                bios_dsk->devices[hd_index].lchs.heads     = cHeads;
-                bios_dsk->devices[hd_index].lchs.cylinders = cCylinders;
-                bios_dsk->devices[hd_index].lchs.spt       = cSectorsPerTrack;
+                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;
 
                 /* Store the ID of the disk in the BIOS hdidmap. */

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

@@ -485 +485 @@
             sectors   = *(uint32_t *)(buffer+(60*2)); // word 60 and word 61
             /** @todo update sectors to be a 64 bit number (also lba...). */
-            if (sectors == 268435455)
+            if (sectors == 0x0FFFFFFF)  /* For disks bigger than ~128GB */
                 sectors = *(uint32_t *)(buffer+(100*2)); // words 100 to 103 (someday)
             switch (device)