Changeset 49548 in vbox for trunk

Timestamp:

Nov 19, 2013 1:07:10 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

90738

Message:

DevAPIC: reverted r90537, r90540, r90551 -- actually we need to clear the CPUID bit if the APIC enable bit is unset

Location:

trunk

Files:

• include/VBox/vmm/pdmdev.h (modified) (4 diffs)
• src/VBox/Devices/PC/DevAPIC.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/PDMR0Device.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMRC/PDMRCDevice.cpp (modified) (2 diffs)

trunk/include/VBox/vmm/pdmdev.h

@@ -1313 +1313 @@
 
     /**
+     * Modifies APIC-related bits in the CPUID feature mask.
+     *
+     * @param   pDevIns         Device instance of the APIC.
+     * @param   enmVersion      Supported APIC version.
+     */
+    DECLRCCALLBACKMEMBER(void, pfnChangeFeature,(PPDMDEVINS pDevIns, PDMAPICVERSION enmVersion));
+
+    /**
      * Acquires the PDM lock.
      *
@@ -1345 +1353 @@
 
 /** Current PDMAPICHLPRC version number. */
-#define PDM_APICHLPRC_VERSION                   PDM_VERSION_MAKE(0xfff5, 3, 0)
+#define PDM_APICHLPRC_VERSION                   PDM_VERSION_MAKE(0xfff5, 2, 0)
 
 
@@ -1382 +1390 @@
      */
     DECLR0CALLBACKMEMBER(uint32_t, pfnCalcIrqTag,(PPDMDEVINS pDevIns, uint8_t u8Level));
+
+    /**
+     * Modifies APIC-related bits in the CPUID feature mask.
+     *
+     * @param   pDevIns         Device instance of the APIC.
+     * @param   enmVersion      Supported APIC version.
+     */
+    DECLR0CALLBACKMEMBER(void, pfnChangeFeature,(PPDMDEVINS pDevIns, PDMAPICVERSION enmVersion));
 
     /**
@@ -1416 +1432 @@
 
 /** Current PDMAPICHLPR0 version number. */
-#define PDM_APICHLPR0_VERSION                   PDM_VERSION_MAKE(0xfff4, 3, 0)
+#define PDM_APICHLPR0_VERSION                   PDM_VERSION_MAKE(0xfff4, 2, 0)
 
 /**

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

@@ -607 +607 @@
                 /* Clear any pending APIC interrupt action flag. */
                 apicCpuClearInterrupt(pDev, pApic);
+                /* See @bugref{7097}. Intel IA-32/64 Spec 10.4.3:
+                 * "When IA32_APIC_BASE[11] is 0, the processor is functionally equivalent to
+                 * an IA-32 processor without an on-chip APIC. The CPUID feature flag for the
+                 * APIC (see Section 10.4.2, 'Presence of the Local APIC') is also set to 0."
+                 */
+                pDev->CTX_SUFF(pApicHlp)->pfnChangeFeature(pDevIns, PDMAPICVERSION_NONE);
                 break;
             }

trunk/src/VBox/VMM/VMMR0/PDMR0Device.cpp

@@ -599 +599 @@
 
 
+/** @interface_method_impl{PDMAPICHLPR0,pfnChangeFeature} */
+static DECLCALLBACK(void) pdmR0ApicHlp_ChangeFeature(PPDMDEVINS pDevIns, PDMAPICVERSION enmVersion)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    LogFlow(("pdmR0ApicHlp_ChangeFeature: caller=%p/%d: version=%d\n", pDevIns, pDevIns->iInstance, (int)enmVersion));
+    switch (enmVersion)
+    {
+        case PDMAPICVERSION_NONE:
+            CPUMClearGuestCpuIdFeature(pDevIns->Internal.s.pVMR0, CPUMCPUIDFEATURE_APIC);
+            CPUMClearGuestCpuIdFeature(pDevIns->Internal.s.pVMR0, CPUMCPUIDFEATURE_X2APIC);
+            break;
+        case PDMAPICVERSION_APIC:
+            CPUMSetGuestCpuIdFeature(pDevIns->Internal.s.pVMR0, CPUMCPUIDFEATURE_APIC);
+            CPUMClearGuestCpuIdFeature(pDevIns->Internal.s.pVMR0, CPUMCPUIDFEATURE_X2APIC);
+            break;
+        case PDMAPICVERSION_X2APIC:
+            CPUMSetGuestCpuIdFeature(pDevIns->Internal.s.pVMR0, CPUMCPUIDFEATURE_X2APIC);
+            CPUMSetGuestCpuIdFeature(pDevIns->Internal.s.pVMR0, CPUMCPUIDFEATURE_APIC);
+            break;
+        default:
+            AssertMsgFailed(("Unknown APIC version: %d\n", (int)enmVersion));
+    }
+}
+
+
 /** @interface_method_impl{PDMAPICHLPR0,pfnLock} */
 static DECLCALLBACK(int) pdmR0ApicHlp_Lock(PPDMDEVINS pDevIns, int rc)
@@ -632 +657 @@
     pdmR0ApicHlp_ClearInterruptFF,
     pdmR0ApicHlp_CalcIrqTag,
+    pdmR0ApicHlp_ChangeFeature,
     pdmR0ApicHlp_Lock,
     pdmR0ApicHlp_Unlock,

trunk/src/VBox/VMM/VMMRC/PDMRCDevice.cpp

@@ -562 +562 @@
 
 
+/** @interface_method_impl{PDMAPICHLPRC,pfnChangeFeature} */
+static DECLCALLBACK(void) pdmRCApicHlp_ChangeFeature(PPDMDEVINS pDevIns, PDMAPICVERSION enmVersion)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    LogFlow(("pdmRCApicHlp_ChangeFeature: caller=%p/%d: version=%d\n", pDevIns, pDevIns->iInstance, (int)enmVersion));
+    switch (enmVersion)
+    {
+        case PDMAPICVERSION_NONE:
+            CPUMClearGuestCpuIdFeature(pDevIns->Internal.s.pVMRC, CPUMCPUIDFEATURE_APIC);
+            CPUMClearGuestCpuIdFeature(pDevIns->Internal.s.pVMRC, CPUMCPUIDFEATURE_X2APIC);
+            break;
+        case PDMAPICVERSION_APIC:
+            CPUMSetGuestCpuIdFeature(pDevIns->Internal.s.pVMRC, CPUMCPUIDFEATURE_APIC);
+            CPUMClearGuestCpuIdFeature(pDevIns->Internal.s.pVMRC, CPUMCPUIDFEATURE_X2APIC);
+            break;
+        case PDMAPICVERSION_X2APIC:
+            CPUMSetGuestCpuIdFeature(pDevIns->Internal.s.pVMRC, CPUMCPUIDFEATURE_X2APIC);
+            CPUMSetGuestCpuIdFeature(pDevIns->Internal.s.pVMRC, CPUMCPUIDFEATURE_APIC);
+            break;
+        default:
+            AssertMsgFailed(("Unknown APIC version: %d\n", (int)enmVersion));
+    }
+}
+
+
 /** @interface_method_impl{PDMAPICHLPRC,pfnLock} */
 static DECLCALLBACK(int) pdmRCApicHlp_Lock(PPDMDEVINS pDevIns, int rc)
@@ -595 +620 @@
     pdmRCApicHlp_ClearInterruptFF,
     pdmRCApicHlp_CalcIrqTag,
+    pdmRCApicHlp_ChangeFeature,
     pdmRCApicHlp_Lock,
     pdmRCApicHlp_Unlock,