vbox的更動 12311 路徑 trunk/src/VBox/Devices/PC

時間撮記:

2008-9-9 下午04:14:09 (16 年 以前)

作者:

vboxsync

訊息:

further work on SMP BIOS tables (some ACPI code still TBD)

位置:

trunk/src/VBox/Devices/PC

檔案:

• DevACPI.cpp (修改) (4 筆差異)
• DevPcBios.cpp (修改) (8 筆差異)

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

@@ -188 +188 @@
     uint8_t             u8UseFdc;
     bool                fPowerButtonHandled;
-
+   
     /** ACPI port base interface. */
     PDMIBASE            IBase;
@@ -199 +199 @@
     /** Pointer to the driver connector interface */
     R3PTRTYPE(PPDMIACPICONNECTOR) pDrv;
+#if 0
+  /** Number of logical CPUs in guest */
+    uint16_t             cCpus;
+#endif
 };
 
@@ -1574 +1578 @@
 
     /* Validate and read the configuration. */
-    if (!CFGMR3AreValuesValid (pCfgHandle, "RamSize\0IOAPIC\0GCEnabled\0R0Enabled\0FdcEnabled\0"))
+    if (!CFGMR3AreValuesValid (pCfgHandle, 
+                               "RamSize\0"
+                               "IOAPIC\0"
+                               "NumCPUs\0"
+                               "GCEnabled\0"
+                               "R0Enabled\0"
+                               "FdcEnabled\0"))
         return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
                                 N_("Configuration error: Invalid config key for ACPI device"));
@@ -1587 +1597 @@
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to read \"IOAPIC\""));
+
+#if 0
+    rc = CFGMR3QueryU16Def(pCfgHandle, "NumCPUs", &s->cCpus, 1);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Querying \"NumCPUs\" as integer failed"));
+#endif
 
     /* query whether we are supposed to present an FDC controller */

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

@@ -1109 +1109 @@
  * @param   addr       physical address in guest memory.
  */
-static void pcbiosPlantMPStable(PPDMDEVINS pDevIns, uint8_t *pTable)
+static void pcbiosPlantMPStable(PPDMDEVINS pDevIns, uint8_t *pTable, uint16_t numCpus)
 {
     /* configuration table */
@@ -1119 +1119 @@
     pCfgTab->u32OemTablePtr        =  0;
     pCfgTab->u16OemTableSize       =  0;
-    pCfgTab->u16EntryCount         =  1 /* Processor */
+    pCfgTab->u16EntryCount         =  numCpus /* Processors */
                                    +  1 /* ISA Bus */
                                    +  1 /* I/O-APIC */
@@ -1140 +1140 @@
         u32FeatureFlags = u32Edx | X86_CPUID_FEATURE_EDX_APIC;
     }
-
+#ifdef VBOX_WITH_SMP_GUESTS
+    PMPSPROCENTRY pProcEntry       = (PMPSPROCENTRY)(pCfgTab+1);
+    for (int i = 0; i<numCpus; i++) 
+    {
+      pProcEntry->u8EntryType        = 0; /* processor entry */
+      pProcEntry->u8LocalApicId      = i;
+      pProcEntry->u8LocalApicVersion = 0x11;
+      pProcEntry->u8CPUFlags         = (i == 0 ? 2 /* bootstrap processor */ : 0 /* application processor */) | 1 /* enabled */;
+      pProcEntry->u32CPUSignature    = u32CPUSignature;
+      pProcEntry->u32CPUFeatureFlags = u32FeatureFlags;
+      pProcEntry->u32Reserved[0]     =
+        pProcEntry->u32Reserved[1]     = 0;
+      pProcEntry++;
+    }
+#else
     /* one processor so far */
     PMPSPROCENTRY pProcEntry       = (PMPSPROCENTRY)(pCfgTab+1);
@@ -1151 +1165 @@
     pProcEntry->u32Reserved[0]     =
     pProcEntry->u32Reserved[1]     = 0;
+#endif
 
     /* ISA bus */
@@ -1164 +1179 @@
      *           ... At least one I/O APIC must be enabled." */
     PMPSIOAPICENTRY pIOAPICEntry   = (PMPSIOAPICENTRY)(pBusEntry+1);
+    uint16_t apicId = numCpus;
     pIOAPICEntry->u8EntryType      = 2; /* I/O-APIC entry */
-    pIOAPICEntry->u8Id             = 1; /* this ID is referenced by the interrupt entries */
+    pIOAPICEntry->u8Id             = apicId; /* this ID is referenced by the interrupt entries */
     pIOAPICEntry->u8Version        = 0x11;
     pIOAPICEntry->u8Flags          = 1 /* enable */;
@@ -1179 +1195 @@
         pIrqEntry->u8SrcBusId      = 0; /* ISA bus */
         pIrqEntry->u8SrcBusIrq     = i;
-        pIrqEntry->u8DstIOAPICId   = 1;
+        pIrqEntry->u8DstIOAPICId   = apicId;
         pIrqEntry->u8DstIOAPICInt  = i;
     }
@@ -1221 +1237 @@
 
     if (pThis->u8IOAPIC)
-        pcbiosPlantMPStable(pDevIns, pThis->au8DMIPage + VBOX_DMI_TABLE_SIZE);
+        pcbiosPlantMPStable(pDevIns, pThis->au8DMIPage + VBOX_DMI_TABLE_SIZE, pThis->cCpus);
 }
 
@@ -1467 +1483 @@
         return rc;
     if (pThis->u8IOAPIC)
-        pcbiosPlantMPStable(pDevIns, pThis->au8DMIPage + VBOX_DMI_TABLE_SIZE);
+        pcbiosPlantMPStable(pDevIns, pThis->au8DMIPage + VBOX_DMI_TABLE_SIZE, pThis->cCpus);
 
     rc = PDMDevHlpROMRegister(pDevIns, VBOX_DMI_TABLE_BASE, _4K, pThis->au8DMIPage, false /* fShadow */, "DMI tables");