儲存庫 vbox 的更動 50091

時間撮記:

2014-1-17 下午12:06:45 (11 年 以前)

作者:

vboxsync

訊息:

BIOS: If available, store logical geometry of SCSI disk in CMOS and use it.

位置:

trunk/src/VBox/Devices/PC

檔案:

• BIOS/scsi.c (修改) (2 筆差異)
• DevPcBios.cpp (修改) (9 筆差異)

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

@@ -411 +411 @@
                 uint16_t    heads, sectors_per_track;
                 uint8_t     hdcount;
+                uint8_t     cmos_base;
 
                 /* Issue a read capacity command now. */
@@ -440 +441 @@
                 }
 
-                /* We need to calculate the geometry for the disk. From
-                 * the BusLogic driver in the Linux kernel.
-                 */
-                if (sectors >= (uint32_t)4 * 1024 * 1024)
+                devcount_scsi = bios_dsk->scsi_devcount;
+
+                /* Get logical CHS geometry. */
+                switch (devcount_scsi)
                 {
-                    heads = 255;
-                    sectors_per_track = 63;
+                    case 0:
+                        cmos_base = 0x90;
+                        break;
+                    case 1:
+                        cmos_base = 0x98;
+                        break;
+                    case 2:
+                        cmos_base = 0xA0;
+                        break;
+                    case 3:
+                        cmos_base = 0xA8;
+                        break;
+                    default:
+                        cmos_base = 0;
                 }
-                else if (sectors >= (uint32_t)2 * 1024 * 1024)
+
+                if (cmos_base && inb_cmos(cmos_base + 7))
                 {
-                    heads = 128;
-                    sectors_per_track = 32;
+                    /* If provided, grab the logical geometry from CMOS. */
+                    cylinders         = inb_cmos(cmos_base + 0) + (inb_cmos(cmos_base + 1) << 8);
+                    heads             = inb_cmos(cmos_base + 2);
+                    sectors_per_track = inb_cmos(cmos_base + 7);
                 }
                 else
                 {
-                    heads = 64;
-                    sectors_per_track = 32;
+                    /* Calculate default logical geometry. NB: Very different
+                     * from default ATA/SATA logical geometry!
+                     */
+                    if (sectors >= (uint32_t)4 * 1024 * 1024)
+                    {
+                        heads = 255;
+                        sectors_per_track = 63;
+                    }
+                    else if (sectors >= (uint32_t)2 * 1024 * 1024)
+                    {
+                        heads = 128;
+                        sectors_per_track = 32;
+                    }
+                    else
+                    {
+                        heads = 64;
+                        sectors_per_track = 32;
+                    }
+                    cylinders = (uint32_t)(sectors / (heads * sectors_per_track));
                 }
-                cylinders = (uint32_t)(sectors / (heads * sectors_per_track));
-                devcount_scsi = bios_dsk->scsi_devcount;
 
                 /* Calculate index into the generic disk table. */

trunk/src/VBox/Devices/PC/DevPcBios.cpp

@@ -107 +107 @@
     Second to third net boot devices:
          0x84 - 0x89
+    First SCSI HDD:
+         0x90 - 0x97
+    Second SCSI HDD:
+         0x98 - 0x9f
+    Third SCSI HDD:
+         0xa0 - 0xa7
+    Fourth SCSI HDD:
+         0xa8 - 0xaf
+
 @endverbatim
  *
@@ -152 +161 @@
     /** Sata harddisk device. */
     char           *pszSataDevice;
-    /** LUN of the four harddisks which are emulated as IDE. */
+    /** LUNs of the four BIOS-accessible SATA disks. */
     uint32_t        iSataHDLUN[4];
+    /** SCSI harddisk device. */
+    char           *pszScsiDevice;
+    /** LUNs of the four BIOS-accessible SCSI disks. */
+    uint32_t        iScsiHDLUN[4];
     /** Bios message buffer. */
     char            szMsg[256];
@@ -462 +475 @@
 
 /**
+ * Get logical CHS geometry for a hard disk, intended for SCSI/SAS drives
+ * with no physical geometry.
+ *
+ * @returns VBox status code.
+ * @param   pHardDisk     The hard disk.
+ * @param   pLCHSGeometry Where to store the geometry settings.
+ */
+static int getLogicalDiskGeometry(PPDMIBLOCKBIOS pHardDisk, PPDMMEDIAGEOMETRY pLCHSGeometry)
+{
+    PDMMEDIAGEOMETRY LCHSGeometry;
+    int rc = VINF_SUCCESS;
+
+    rc = pHardDisk->pfnGetLCHSGeometry(pHardDisk, &LCHSGeometry);
+    if (   rc == VERR_PDM_GEOMETRY_NOT_SET
+        || LCHSGeometry.cCylinders == 0
+        || LCHSGeometry.cHeads == 0
+        || LCHSGeometry.cHeads > 255
+        || LCHSGeometry.cSectors == 0
+        || LCHSGeometry.cSectors > 63)
+    {
+        /* Unlike the ATA case, if the image does not provide valid logical
+         * geometry, we leave things alone and let the BIOS decide what the
+         * logical geometry should be.
+         */
+        rc = VERR_PDM_GEOMETRY_NOT_SET;
+    }
+    else
+        *pLCHSGeometry = LCHSGeometry;
+
+    return rc;
+}
+
+
+/**
  * Get BIOS boot code from enmBootDevice in order
  *
@@ -628 +675 @@
 
     /*
-     * Harddisks.
+     * IDE harddisks.
      */
     for (i = 0; i < RT_ELEMENTS(apHDs); i++)
@@ -683 +730 @@
 
     /*
-     * Sata Harddisks.
+     * SATA harddisks.
      */
     if (pThis->pszSataDevice)
     {
-        /* Clear pointers to IDE controller. */
+        /* Clear pointers to the block devices. */
         for (i = 0; i < RT_ELEMENTS(apHDs); i++)
             apHDs[i] = NULL;
@@ -736 +783 @@
     }
 
+    /*
+     * SCSI harddisks. Not handled quite the same as SATA.
+     */
+    if (pThis->pszScsiDevice)
+    {
+        /* Clear pointers to the block devices. */
+        for (i = 0; i < RT_ELEMENTS(apHDs); i++)
+            apHDs[i] = NULL;
+
+        for (i = 0; i < RT_ELEMENTS(apHDs); i++)
+        {
+            PPDMIBASE pBase;
+            int rc = PDMR3QueryLun(pUVM, pThis->pszScsiDevice, 0, pThis->iScsiHDLUN[i], &pBase);
+            if (RT_SUCCESS(rc))
+                apHDs[i] = PDMIBASE_QUERY_INTERFACE(pBase, PDMIBLOCKBIOS);
+            if (   apHDs[i]
+                && (   apHDs[i]->pfnGetType(apHDs[i]) != PDMBLOCKTYPE_HARD_DISK
+                    || !apHDs[i]->pfnIsVisible(apHDs[i])))
+                apHDs[i] = NULL;
+            if (apHDs[i])
+            {
+                PDMMEDIAGEOMETRY LCHSGeometry;
+                rc = getLogicalDiskGeometry(apHDs[i], &LCHSGeometry);
+
+                if (i < 4 && RT_SUCCESS(rc))
+                {
+                    /* Extended drive information (for SCSI disks).
+                     * Used by the BIOS for setting the logical geometry, but
+                     * only if the image provided valid data.
+                     */
+                    int offInfo;
+                    switch (i)
+                    {
+                        case 0:
+                            offInfo = 0x90;
+                            break;
+                        case 1:
+                            offInfo = 0x98;
+                            break;
+                        case 2:
+                            offInfo = 0xa0;
+                            break;
+                        case 3:
+                        default:
+                            offInfo = 0xa8;
+                            break;
+                    }
+                    pcbiosCmosInitHardDisk(pDevIns, 0x00, offInfo, &LCHSGeometry);
+                    LogRel(("DevPcBios: SCSI LUN#%d LCHS=%u/%u/%u\n", i, LCHSGeometry.cCylinders, LCHSGeometry.cHeads, LCHSGeometry.cSectors));
+                }
+                else
+                    LogRel(("DevPcBios: SCSI LUN#%d LCHS not provided\n", i));
+            }
+        }
+    }
+
     /* Calculate and store AT-style CMOS checksum. */
     uint16_t    cksum = 0;
@@ -847 +950 @@
         MMR3HeapFree(pThis->pszSataDevice);
         pThis->pszSataDevice = NULL;
+    }
+
+    if (pThis->pszScsiDevice)
+    {
+        MMR3HeapFree(pThis->pszScsiDevice);
+        pThis->pszScsiDevice = NULL;
     }
 
@@ -918 +1027 @@
                               "SataLUN3\0"
                               "SataLUN4\0"
+                              "ScsiHardDiskDevice\0"
+                              "ScsiLUN1\0"
+                              "ScsiLUN2\0"
+                              "ScsiLUN3\0"
+                              "ScsiLUN4\0"
                               "FloppyDevice\0"
                               "DelayBoot\0"
@@ -1041 +1155 @@
         }
     }
+
+    /* Repeat the exercise for SCSI drives. */
+    rc = CFGMR3QueryStringAlloc(pCfg, "ScsiHardDiskDevice", &pThis->pszScsiDevice);
+    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
+        pThis->pszScsiDevice = NULL;
+    else if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Querying \"ScsiHardDiskDevice\" as a string failed"));
+
+    if (pThis->pszScsiDevice)
+    {
+        static const char * const s_apszScsiDisks[] =
+            { "ScsiLUN1", "ScsiLUN2", "ScsiLUN3", "ScsiLUN4" };
+        Assert(RT_ELEMENTS(s_apszScsiDisks) == RT_ELEMENTS(pThis->iScsiHDLUN));
+        for (unsigned i = 0; i < RT_ELEMENTS(pThis->iScsiHDLUN); i++)
+        {
+            rc = CFGMR3QueryU32(pCfg, s_apszScsiDisks[i], &pThis->iScsiHDLUN[i]);
+            if (rc == VERR_CFGM_VALUE_NOT_FOUND)
+                pThis->iScsiHDLUN[i] = i;
+            else if (RT_FAILURE(rc))
+                return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
+                                           N_("Configuration error: Querying \"%s\" as a string failed"), s_apszScsiDisks);
+        }
+    }
+
+
     /*
      * Register I/O Ports and PC BIOS.