Changeset 65850 in vbox for trunk/src/VBox

Timestamp:

Feb 23, 2017 10:16:04 AM (8 years ago)

Author:

vboxsync

Message:

Devices/Main: don't set RamSize and RamHole explicitly for DevACPI, DevEFI, DevPcBios and VMMDev but use the MMR3Phys* API for that. This simplifies and unifies the calculation of RAM below 4GB and RAM above 4GB. Also renamed PciPref64Limit to PciPref64LimitGB to show that the limit is in GB.

Location:

trunk/src/VBox

Files:

• Devices/EFI/DevEFI.cpp (modified) (5 diffs)
• Devices/PC/DevACPI.cpp (modified) (5 diffs)
• Devices/PC/DevFwCommon.cpp (modified) (3 diffs)
• Devices/PC/DevPcBios.cpp (modified) (6 diffs)
• Devices/VMMDev/VMMDev.cpp (modified) (3 diffs)
• Main/src-client/ConsoleImpl2.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/EFI/DevEFI.cpp

@@ -191 +191 @@
     /** Number of virtual CPUs. (Config) */
     uint32_t                cCpus;
-    /** RAM below 4GB (in bytes). (Config) */
-    uint32_t                cbBelow4GB;
-    /** RAM above 4GB (in bytes). (Config) */
-    uint64_t                cbAbove4GB;
-    /** The total amount of memory. */
-    uint64_t                cbRam;
-    /** The size of the RAM hole below 4GB. */
-    uint64_t                cbRamHole;
 
     /** The size of the DMI tables. */
@@ -1744 +1736 @@
     PDEVEFI pThis = PDMINS_2_DATA(pDevIns, PDEVEFI);
 
+    PVM pVM                    = PDMDevHlpGetVM(pDevIns);
+    uint64_t const  cbRamSize  = MMR3PhysGetRamSize(pVM);
+    uint32_t const  cbBelow4GB = MMR3PhysGetRamSizeBelow4GB(pVM);
+    uint64_t const  cbAbove4GB = MMR3PhysGetRamSizeAbove4GB(pVM);
+    NOREF(cbAbove4GB);
+
     /*
      * Memory sizes.
      */
-    uint64_t const offRamHole = _4G - pThis->cbRamHole;
     uint32_t u32Low = 0;
     uint32_t u32Chunks = 0;
-    if (pThis->cbRam > 16 * _1M)
-    {
-        u32Low = (uint32_t)RT_MIN(RT_MIN(pThis->cbRam, offRamHole), UINT32_C(0xffe00000));
+    if (cbRamSize > 16 * _1M)
+    {
+        u32Low = RT_MIN(cbBelow4GB, UINT32_C(0xffe00000));
         u32Chunks = (u32Low - 16U * _1M) / _64K;
     }
@@ -1758 +1755 @@
     cmosWrite(pDevIns, 0x35, RT_BYTE2(u32Chunks));
 
-    if (u32Low < pThis->cbRam)
-    {
-        uint64_t u64 = pThis->cbRam - u32Low;
+    if (u32Low < cbRamSize)
+    {
+        uint64_t u64 = cbRamSize - u32Low;
         u32Chunks = (uint32_t)(u64 / _64K);
         cmosWrite(pDevIns, 0x5b, RT_BYTE1(u32Chunks));
@@ -2142 +2139 @@
     if (!CFGMR3AreValuesValid(pCfg,
                               "EfiRom\0"
-                              "RamSize\0"
-                              "RamHoleSize\0"
                               "NumCPUs\0"
                               "UUID\0"
@@ -2221 +2216 @@
     uuid.Gen.u16TimeHiAndVersion = RT_H2BE_U16(uuid.Gen.u16TimeHiAndVersion);
     memcpy(&pThis->aUuid, &uuid, sizeof pThis->aUuid);
-
-    /*
-     * RAM sizes
-     */
-    rc = CFGMR3QueryU64(pCfg, "RamSize", &pThis->cbRam);
-    AssertLogRelRCReturn(rc, rc);
-    rc = CFGMR3QueryU64(pCfg, "RamHoleSize", &pThis->cbRamHole);
-    AssertLogRelRCReturn(rc, rc);
-    pThis->cbBelow4GB = RT_MIN(pThis->cbRam, _4G - pThis->cbRamHole);
-    pThis->cbAbove4GB = pThis->cbRam - pThis->cbBelow4GB;
 
     /*

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

@@ -1337 +1337 @@
             *pu32 = pThis->u64PciPref64Max >> 16; /* 64KB units */
             Assert(((uint64_t)*pu32 << 16) == pThis->u64PciPref64Max);
-            LogRel(("MAX\n"));
             break;
 
@@ -3128 +3127 @@
     cbXsdt += cAddr*sizeof(uint64_t);  /* each entry: 64 bits phys. address. */
 
-    rc = CFGMR3QueryU64(pThis->pDevInsR3->pCfg, "RamSize", &pThis->u64RamSize);
-    if (RT_FAILURE(rc))
-        return PDMDEV_SET_ERROR(pThis->pDevInsR3, rc,
-                                N_("Configuration error: Querying \"RamSize\" as integer failed"));
-
-    uint32_t cbRamHole;
-    rc = CFGMR3QueryU32Def(pThis->pDevInsR3->pCfg, "RamHoleSize", &cbRamHole, MM_RAM_HOLE_SIZE_DEFAULT);
-    if (RT_FAILURE(rc))
-        return PDMDEV_SET_ERROR(pThis->pDevInsR3, rc,
-                                N_("Configuration error: Querying \"RamHoleSize\" as integer failed"));
-
     /*
      * Calculate the sizes for the low region and for the 64-bit prefetchable memory.
-     * The latter starts never below 4G and is 1G-aligned.
+     * The latter starts never below 4G.
      */
-    const uint64_t offRamHole = _4G - cbRamHole;
+    PVM pVM                    = PDMDevHlpGetVM(pThis->pDevInsR3);
+    uint32_t        cbBelow4GB = MMR3PhysGetRamSizeBelow4GB(pVM);
+    uint64_t const  cbAbove4GB = MMR3PhysGetRamSizeAbove4GB(pVM);
+
+    pThis->u64RamSize = MMR3PhysGetRamSize(pVM);
     if (pThis->fPciPref64Enabled)
     {
-        /* Activate MEM4 */
-        if (pThis->u64RamSize > offRamHole)
-            pThis->u64PciPref64Min = RT_ALIGN_64(pThis->u64RamSize + cbRamHole, _1M);
-        else
-            pThis->u64PciPref64Min = _4G;
-    }
-    uint64_t cbRamLow = pThis->u64RamSize > offRamHole ? offRamHole : pThis->u64RamSize;
-    if (cbRamLow > UINT32_C(0xffe00000)) /* See MEM3. */
+        /* Activate MEM4. See also DevPciIch9.cpp / ich9pciFakePCIBIOS() / uPciBiosMmio64 */
+        pThis->u64PciPref64Min = _4G + cbAbove4GB;
+        LogRel(("ACPI: enabling 64-bit prefetch root bus resource %#018RX64..%#018RX64\n",
+               pThis->u64PciPref64Min, pThis->u64PciPref64Max-1));
+    }
+    if (cbBelow4GB > UINT32_C(0xffe00000)) /* See MEM3. */
     {
         /* Note: This is also enforced by DevPcBios.cpp. */
-        LogRel(("ACPI: Clipping cbRamLow=%#RX64 down to 0xffe00000.\n", cbRamLow));
-        cbRamLow = UINT32_C(0xffe00000);
-    }
-    pThis->cbRamLow = (uint32_t)cbRamLow;
+        LogRel(("ACPI: Clipping cbRamLow=%#RX64 down to 0xffe00000.\n", cbBelow4GB));
+        cbBelow4GB = UINT32_C(0xffe00000);
+    }
+    pThis->cbRamLow = cbBelow4GB;
 
     GCPhysCur = 0;
@@ -3567 +3557 @@
      */
     if (!CFGMR3AreValuesValid(pCfg,
-                              "RamSize\0"
-                              "RamHoleSize\0"
                               "IOAPIC\0"
                               "NumCPUs\0"
@@ -3578 +3566 @@
                               "McfgLength\0"
                               "PciPref64Enabled\0"
-                              "PciPref64Limit\0"
+                              "PciPref64LimitGB\0"
                               "SmcEnabled\0"
                               "FdcEnabled\0"
@@ -3653 +3641 @@
 
     /* query the limit of the the 64-bit prefetchable memory window */
-    rc = CFGMR3QueryU64Def(pCfg, "PciPref64Limit", &pThis->u64PciPref64Max, _1G64*64);
+    uint64_t u64PciPref64MaxGB;
+    rc = CFGMR3QueryU64Def(pCfg, "PciPref64LimitGB", &u64PciPref64MaxGB, 64);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
-                                N_("Configuration error: Failed to read \"PciPref64Limit\""));
+                                N_("Configuration error: Failed to read \"PciPref64LimitGB\""));
+    pThis->u64PciPref64Max = _1G64 * u64PciPref64MaxGB;
 
     /* query whether we are supposed to present custom table */

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

@@ -820 +820 @@
          * DMI Physical Memory Array (Type 16) *
          ***************************************/
-        uint64_t u64RamSize;
-        rc = CFGMR3QueryU64(pCfg, "RamSize", &u64RamSize);
-        if (RT_FAILURE (rc))
-            return PDMDEV_SET_ERROR(pDevIns, rc,
-                                    N_("Configuration error: Failed to read \"RamSize\""));
+        uint64_t const  cbRamSize = MMR3PhysGetRamSize(PDMDevHlpGetVM(pDevIns));
 
         PDMIRAMARRAY pMemArray = (PDMIRAMARRAY)pszStr;
@@ -838 +834 @@
         pMemArray->u8Use                 = 0x03;   /* System memory */
         pMemArray->u8MemErrorCorrection  = 0x01;   /* Other */
-        pMemArray->u32MaxCapacity        = (uint32_t)(u64RamSize / _1K); /* RAM size in K */
+        if (cbRamSize / _1K > INT32_MAX)
+        {
+            /** @todo 2TB-1K limit. In such cases we probably need to provide multiple type-16 descriptors.
+             * Or use 0x8000'0000 = 'capacity unknown'? */
+            AssertLogRelMsgFailed(("DMI: RAM size %#RX64 does not fit into type-16 descriptor, clipping to %#RX64\n",
+                                   cbRamSize, (uint64_t)INT32_MAX * _1K));
+            pMemArray->u32MaxCapacity    = INT32_MAX;
+        }
+        else
+            pMemArray->u32MaxCapacity    = (int32_t)(cbRamSize / _1K); /* RAM size in K */
         pMemArray->u16MemErrorHandle     = 0xfffe; /* No error info structure */
         pMemArray->u16NumberOfMemDevices = 1;
@@ -859 +864 @@
         pMemDev->u16TotalWidth           = 0xffff; /* Unknown */
         pMemDev->u16DataWidth            = 0xffff; /* Unknown */
-        int16_t u16RamSizeM = (uint16_t)(u64RamSize / _1M);
+        int16_t u16RamSizeM;
+        if (cbRamSize / _1M > INT16_MAX)
+        {
+            /** @todo 32G-1M limit. Provide multiple type-17 descriptors.
+             * The highest bit of u16Size must be 0 to specify 'GB' units / 1 would be 'KB' */
+            AssertLogRelMsgFailed(("DMI: RAM size %#RX64 too big for one type-17 descriptor, clipping to %#RX64\n",
+                                   cbRamSize, (uint64_t)INT16_MAX * _1M));
+            u16RamSizeM = INT16_MAX;
+        }
+        else
+            u16RamSizeM = (uint16_t)(cbRamSize / _1M);
         if (u16RamSizeM == 0)
             u16RamSizeM = 0x400; /* 1G */

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

@@ -155 +155 @@
     /** Boot devices (ordered). */
     DEVPCBIOSBOOT   aenmBootDevice[4];
-    /** RAM size (in bytes). */
-    uint64_t        cbRam;
-    /** RAM hole size (in bytes). */
-    uint32_t        cbRamHole;
     /** Bochs shutdown index. */
     uint32_t        iShutdown;
@@ -621 +617 @@
     LogFlow(("pcbiosInitComplete:\n"));
 
+    PVM pVM                    = PDMDevHlpGetVM(pDevIns);
+    uint64_t const  cbRamSize  = MMR3PhysGetRamSize(pVM);
+    uint32_t const  cbBelow4GB = MMR3PhysGetRamSizeBelow4GB(pVM);
+    uint64_t const  cbAbove4GB = MMR3PhysGetRamSizeAbove4GB(pVM);
+
     /*
      * Memory sizes.
      */
     /* base memory. */
-    u32 = pThis->cbRam > 640 ? 640 : (uint32_t)pThis->cbRam / _1K; /* <-- this test is wrong, but it doesn't matter since we never assign less than 1MB */
-    pcbiosCmosWrite(pDevIns, 0x15, u32 & 0xff);                                 /* 15h - Base Memory in K, Low Byte */
-    pcbiosCmosWrite(pDevIns, 0x16, u32 >> 8);                                   /* 16h - Base Memory in K, High Byte */
+    u32 = cbRamSize > 640 ? 640 : (uint32_t)cbRamSize / _1K; /* <-- this test is wrong, but it doesn't matter since we never assign less than 1MB */
+    pcbiosCmosWrite(pDevIns, 0x15, u32 & 0xff);     /* 15h - Base Memory in K, Low Byte */
+    pcbiosCmosWrite(pDevIns, 0x16, u32 >> 8);       /* 16h - Base Memory in K, High Byte */
 
     /* Extended memory, up to 65MB */
-    u32 = pThis->cbRam >= 65 * _1M ? 0xffff : ((uint32_t)pThis->cbRam - _1M) / _1K;
-    pcbiosCmosWrite(pDevIns, 0x17, u32 & 0xff);                                 /* 17h - Extended Memory in K, Low Byte */
-    pcbiosCmosWrite(pDevIns, 0x18, u32 >> 8);                                   /* 18h - Extended Memory in K, High Byte */
-    pcbiosCmosWrite(pDevIns, 0x30, u32 & 0xff);                                 /* 30h - Extended Memory in K, Low Byte */
-    pcbiosCmosWrite(pDevIns, 0x31, u32 >> 8);                                   /* 31h - Extended Memory in K, High Byte */
+    u32 = cbRamSize >= 65 * _1M ? 0xffff : ((uint32_t)cbRamSize - _1M) / _1K;
+    pcbiosCmosWrite(pDevIns, 0x17, u32 & 0xff);     /* 17h - Extended Memory in K, Low Byte */
+    pcbiosCmosWrite(pDevIns, 0x18, u32 >> 8);       /* 18h - Extended Memory in K, High Byte */
+    pcbiosCmosWrite(pDevIns, 0x30, u32 & 0xff);     /* 30h - Extended Memory in K, Low Byte */
+    pcbiosCmosWrite(pDevIns, 0x31, u32 >> 8);       /* 31h - Extended Memory in K, High Byte */
 
     /* Bochs BIOS specific? Anyway, it's the amount of memory above 16MB
@@ -641 +642 @@
        be adjusted, we still have to chop it at 0xfffc0000 or it'll conflict
        with the high BIOS mapping.) */
-    uint64_t const offRamHole = _4G - pThis->cbRamHole;
-    if (pThis->cbRam > 16 * _1M)
-        u32 = (uint32_t)( (RT_MIN(RT_MIN(pThis->cbRam, offRamHole), UINT32_C(0xffe00000)) - 16U * _1M) / _64K );
+    if (cbRamSize > 16 * _1M)
+        u32 = (RT_MIN(cbBelow4GB, UINT32_C(0xffe00000)) - 16U * _1M) / _64K;
     else
         u32 = 0;
@@ -652 +652 @@
        Bochs got these in a different location which we've already used for SATA,
        it also lacks the last two. */
-    uint64_t c64KBAbove4GB;
-    if (pThis->cbRam <= offRamHole)
-        c64KBAbove4GB = 0;
-    else
-    {
-        c64KBAbove4GB = (pThis->cbRam - offRamHole) / _64K;
-        /* Make sure it doesn't hit the limits of the current BIOS code. */
-        AssertLogRelMsgReturn((c64KBAbove4GB >> (3 * 8)) < 255, ("%#RX64\n", c64KBAbove4GB), VERR_OUT_OF_RANGE);
-    }
+    uint64_t c64KBAbove4GB = cbAbove4GB / _64K;
+    /* Make sure it doesn't hit the limits of the current BIOS code (RAM limit of ~255TB). */
+    AssertLogRelMsgReturn((c64KBAbove4GB >> (3 * 8)) < 255, ("%#RX64\n", c64KBAbove4GB), VERR_OUT_OF_RANGE);
     pcbiosCmosWrite(pDevIns, 0x61,  c64KBAbove4GB        & 0xff);
     pcbiosCmosWrite(pDevIns, 0x62, (c64KBAbove4GB >>  8) & 0xff);
@@ -1097 +1091 @@
                               "BootDevice2\0"
                               "BootDevice3\0"
-                              "RamSize\0"
-                              "RamHoleSize\0"
                               "HardDiskDevice\0"
                               "SataHardDiskDevice\0"
@@ -1163 +1155 @@
      * Init the data.
      */
-    rc = CFGMR3QueryU64(pCfg, "RamSize", &pThis->cbRam);
-    if (RT_FAILURE(rc))
-        return PDMDEV_SET_ERROR(pDevIns, rc,
-                                N_("Configuration error: Querying \"RamSize\" as integer failed"));
-
-    rc = CFGMR3QueryU32Def(pCfg, "RamHoleSize", &pThis->cbRamHole, MM_RAM_HOLE_SIZE_DEFAULT);
-    if (RT_FAILURE(rc))
-        return PDMDEV_SET_ERROR(pDevIns, rc,
-                                N_("Configuration error: Querying \"RamHoleSize\" as integer failed"));
-
     rc = CFGMR3QueryU16Def(pCfg, "NumCPUs", &pThis->cCpus, 1);
     if (RT_FAILURE(rc))

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -4018 +4018 @@
                                   "KeepCredentials|"
                                   "HeapEnabled|"
-                                  "RamSize|"
                                   "RZEnabled|"
                                   "GuestCoreDumpEnabled|"
@@ -4030 +4029 @@
                                   ,
                                   "");
-
-    rc = CFGMR3QueryU64(pCfg, "RamSize", &pThis->cbGuestRAM);
-    if (RT_FAILURE(rc))
-        return PDMDEV_SET_ERROR(pDevIns, rc,
-                                N_("Configuration error: Failed querying \"RamSize\" as a 64-bit unsigned integer"));
 
     rc = CFGMR3QueryBoolDef(pCfg, "GetHostTimeDisabled", &pThis->fGetHostTimeDisabled, false);
@@ -4115 +4109 @@
     /** @todo image-to-load-filename? */
 #endif
+
+    pThis->cbGuestRAM = MMR3PhysGetRamSize(PDMDevHlpGetVM(pDevIns));
 
     /*

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -1684 +1684 @@
             InsertConfigInteger(pInst, "Trusted",              1); /* boolean */
             InsertConfigNode(pInst,    "Config", &pBiosCfg);
-            InsertConfigInteger(pBiosCfg,  "RamSize",              cbRam);
-            InsertConfigInteger(pBiosCfg,  "RamHoleSize",          cbRamHole);
             InsertConfigInteger(pBiosCfg,  "NumCPUs",              cCpus);
             InsertConfigString(pBiosCfg,   "HardDiskDevice",       "piix3ide");
@@ -1788 +1786 @@
             InsertConfigInteger(pInst, "Trusted", 1); /* boolean */
             InsertConfigNode(pInst,    "Config", &pCfg);
-            InsertConfigInteger(pCfg,  "RamSize",          cbRam);
-            InsertConfigInteger(pCfg,  "RamHoleSize",      cbRamHole);
             InsertConfigInteger(pCfg,  "NumCPUs",          cCpus);
             InsertConfigString(pCfg,   "EfiRom",           efiRomFile);
@@ -2765 +2761 @@
         Bstr hwVersion;
         hrc = pMachine->COMGETTER(HardwareVersion)(hwVersion.asOutParam());                 H();
-        InsertConfigInteger(pCfg, "RamSize",              cbRam);
         if (hwVersion.compare(Bstr("1").raw()) == 0) /* <= 2.0.x */
             InsertConfigInteger(pCfg, "HeapEnabled", 0);
@@ -3199 +3194 @@
             hrc = pBusMgr->assignPCIDevice("acpi", pInst);                                  H();
 
-            InsertConfigInteger(pCfg,  "RamSize",          cbRam);
-            InsertConfigInteger(pCfg,  "RamHoleSize",      cbRamHole);
             InsertConfigInteger(pCfg,  "NumCPUs",          cCpus);