Changeset 57218 in vbox for trunk/include

Timestamp:

Aug 6, 2015 2:53:27 PM (10 years ago)

Author:

vboxsync

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

101971

Message:

SUPDrv, tstGIP-2: Add support for GIP flags and testing TSC frequency compatibility.

Location:

trunk/include/VBox

Files:

• sup.h (modified) (5 diffs)
• sup.mac (modified) (1 diff)

trunk/include/VBox/sup.h

@@ -389 +389 @@
      * can be accessed from ring-3 and raw-mode context. */
     uint32_t            fGetGipCpu;
+    /** GIP flags, see SUPGIP_FLAGS_XXX. */
+    volatile uint32_t   fFlags;
 
     /** Padding / reserved space for future data. */
-    uint32_t            au32Padding1[25];
+    uint32_t            au32Padding1[24];
 
     /** Table indexed by the CPU APIC ID to get the CPU table index. */
@@ -424 +426 @@
  * Upper 16 bits is the major version. Major version is only changed with
  * incompatible changes in the GIP. */
-#define SUPGLOBALINFOPAGE_VERSION   0x00060000
+#define SUPGLOBALINFOPAGE_VERSION   0x00060001
 
 /**
@@ -491 +493 @@
 SUPDECL(PSUPGLOBALINFOPAGE)             SUPGetGIP(void);
 
+/** @name SUPGIP_FLAGS_XXX - SUPR3GipSetFlags flags.
+ * @{ */
+/** Enable GIP test mode. */
+#define SUPGIP_FLAGS_TESTING_ENABLE          RT_BIT_32(0)
+/** Valid mask of flags that can be set through the ioctl. */
+#define SUPGIP_FLAGS_VALID_MASK              RT_BIT_32(0)
+/** GIP test mode needs to be checked (e.g. when enabled or being disabled). */
+#define SUPGIP_FLAGS_TESTING                 RT_BIT_32(24)
+/** Prepare to start GIP test mode. */
+#define SUPGIP_FLAGS_TESTING_START           RT_BIT_32(25)
+/** Prepare to stop GIP test mode. */
+#define SUPGIP_FLAGS_TESTING_STOP            RT_BIT_32(26)
+/** @} */
 
 /** @internal  */
@@ -1708 +1723 @@
 SUPR3DECL(int) SUPR3TscDeltaMeasure(RTCPUID idCpu, bool fAsync, bool fForce, uint8_t cRetries, uint8_t cMsWaitRetry);
 
+
 /**
  * Reads the delta-adjust TSC value.
@@ -1718 +1734 @@
 SUPR3DECL(int) SUPR3ReadTsc(uint64_t *puTsc, uint16_t *pidApic);
 
+
+/**
+ * Sets the GIP flags.
+ *
+ * @returns VBox status code.
+ * @param   fOrMask         The OR mask of the GIP flags, see SUPGIP_FLAGS_XXX.
+ * @param   fAndMask        The AND mask of the GIP flags, see SUPGIP_FLAGS_XXX.
+ */
+SUPR3DECL(int) SUPR3GipSetFlags(uint32_t fOrMask, uint32_t fAndMask);
 /** @} */
 #endif /* IN_RING3 */

trunk/include/VBox/sup.mac

@@ -80 +80 @@
     .enmUseTscDelta             resd 1
     .fGetGipCpu                 resd 1
-    .au32Padding1               resd 25
+    .fFlags                     resd 1
+    .au32Padding1               resd 24
     .aiCpuFromApicId            resw 256
     .aiCpuFromCpuSetIdx         resw 256