MdePkg/Register/Amd: define GHCB macros for hypervisor feature detection

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3275

Version 2 of GHCB introduces advertisement of features that are supported
by the hypervisor. See the GHCB spec section 2.2 for an additional details.

Cc: James Bottomley <jejb@linux.ibm.com>
Cc: Min Xu <min.m.xu@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Erdem Aktas <erdemaktas@google.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Zhiguang Liu <zhiguang.liu@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
Reviewed-by: Erdem Aktas <erdemaktas@google.com>
Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>
Message-Id: <20210519181949.6574-4-brijesh.singh@amd.com>

diff --git a/MdePkg/Include/Register/Amd/Fam17Msr.h b/MdePkg/Include/Register/Amd/Fam17Msr.h
index 7368ce7af02acda4bfa975b46e39e8f1bd3f2b62..cdb8f588ccf8677e90c5bb0e77da58806d1ae03e 100644 (file)
--- a/MdePkg/Include/Register/Amd/Fam17Msr.h
+++ b/MdePkg/Include/Register/Amd/Fam17Msr.h
@@ -48,6 +48,11 @@ typedef union {
     UINT32  Reserved2:32;\r
   } GhcbTerminate;\r
 \r
+  struct {\r
+    UINT64  Function:12;\r
+    UINT64  Features:52;\r
+  } GhcbHypervisorFeatures;\r
+\r
   VOID    *Ghcb;\r
 \r
   UINT64  GhcbPhysicalAddress;\r
@@ -57,6 +62,8 @@ typedef union {
 #define GHCB_INFO_SEV_INFO_GET                      2\r
 #define GHCB_INFO_CPUID_REQUEST                     4\r
 #define GHCB_INFO_CPUID_RESPONSE                    5\r
+#define GHCB_HYPERVISOR_FEATURES_REQUEST            128\r
+#define GHCB_HYPERVISOR_FEATURES_RESPONSE           129\r
 #define GHCB_INFO_TERMINATE_REQUEST                 256\r
 \r
 #define GHCB_TERMINATE_GHCB                0\r

diff --git a/MdePkg/Include/Register/Amd/Ghcb.h b/MdePkg/Include/Register/Amd/Ghcb.h
index 712dc8e769c03bc09d5884e00e0d6102672b7707..ec232ebd38072018afddc5e6edd4f15d13c4dd93 100644 (file)
--- a/MdePkg/Include/Register/Amd/Ghcb.h
+++ b/MdePkg/Include/Register/Amd/Ghcb.h
@@ -54,6 +54,7 @@
 #define SVM_EXIT_NMI_COMPLETE                   0x80000003ULL\r
 #define SVM_EXIT_AP_RESET_HOLD                  0x80000004ULL\r
 #define SVM_EXIT_AP_JUMP_TABLE                  0x80000005ULL\r
+#define SVM_EXIT_HYPERVISOR_FEATURES            0x8000FFFDULL\r
 #define SVM_EXIT_UNSUPPORTED                    0x8000FFFFULL\r
 \r
 //\r
@@ -154,4 +155,11 @@ typedef union {
 #define GHCB_EVENT_INJECTION_TYPE_EXCEPTION  3\r
 #define GHCB_EVENT_INJECTION_TYPE_SOFT_INT   4\r
 \r
+//\r
+// Hypervisor features\r
+//\r
+#define GHCB_HV_FEATURES_SNP                              BIT0\r
+#define GHCB_HV_FEATURES_SNP_AP_CREATE                    (GHCB_HV_FEATURES_SNP | BIT1)\r
+#define GHCB_HV_FEATURES_SNP_RESTRICTED_INJECTION         (GHCB_HV_FEATURES_SNP_AP_CREATE | BIT2)\r
+#define GHCB_HV_FEATURES_SNP_RESTRICTED_INJECTION_TIMER   (GHCB_HV_FEATURES_SNP_RESTRICTED_INJECTION | BIT3)\r
 #endif\r