d65131c
From: Eduardo Habkost <ehabkost@redhat.com>
d65131c
Date: Tue, 9 Jan 2018 13:45:18 -0200
a056f39
Subject: [PATCH] i386: Add EPYC-IBPB CPU model
d65131c
d65131c
EPYC-IBPB is a copy of the EPYC CPU model with
d65131c
just CPUID_8000_0008_EBX_IBPB added.
d65131c
d65131c
Cc: Jiri Denemark <jdenemar@redhat.com>
d65131c
Cc: Tom Lendacky <thomas.lendacky@amd.com>
d65131c
Cc: Brijesh Singh <brijesh.singh@amd.com>
d65131c
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
d65131c
Message-Id: <20180109154519.25634-7-ehabkost@redhat.com>
d65131c
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
d65131c
(cherry picked from commit 6cfbc54e8903a9bcc0346119949162d040c144c1)
d65131c
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
d65131c
(cherry picked from commit 8ebfafa796ca0cb2b035a7f06f836a675d8b48be)
d65131c
---
d65131c
 target/i386/cpu.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
d65131c
 1 file changed, 46 insertions(+)
d65131c
d65131c
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
d65131c
index 0862877973..e18623b8c3 100644
d65131c
--- a/target/i386/cpu.c
d65131c
+++ b/target/i386/cpu.c
d65131c
@@ -1963,6 +1963,52 @@ static X86CPUDefinition builtin_x86_defs[] = {
d65131c
         .xlevel = 0x8000000A,
d65131c
         .model_id = "AMD EPYC Processor",
d65131c
     },
d65131c
+    {
d65131c
+        .name = "EPYC-IBPB",
d65131c
+        .level = 0xd,
d65131c
+        .vendor = CPUID_VENDOR_AMD,
d65131c
+        .family = 23,
d65131c
+        .model = 1,
d65131c
+        .stepping = 2,
d65131c
+        .features[FEAT_1_EDX] =
d65131c
+            CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX | CPUID_CLFLUSH |
d65131c
+            CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA | CPUID_PGE |
d65131c
+            CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 | CPUID_MCE |
d65131c
+            CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE | CPUID_DE |
d65131c
+            CPUID_VME | CPUID_FP87,
d65131c
+        .features[FEAT_1_ECX] =
d65131c
+            CPUID_EXT_RDRAND | CPUID_EXT_F16C | CPUID_EXT_AVX |
d65131c
+            CPUID_EXT_XSAVE | CPUID_EXT_AES |  CPUID_EXT_POPCNT |
d65131c
+            CPUID_EXT_MOVBE | CPUID_EXT_SSE42 | CPUID_EXT_SSE41 |
d65131c
+            CPUID_EXT_CX16 | CPUID_EXT_FMA | CPUID_EXT_SSSE3 |
d65131c
+            CPUID_EXT_MONITOR | CPUID_EXT_PCLMULQDQ | CPUID_EXT_SSE3,
d65131c
+        .features[FEAT_8000_0001_EDX] =
d65131c
+            CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT2_PDPE1GB |
d65131c
+            CPUID_EXT2_FFXSR | CPUID_EXT2_MMXEXT | CPUID_EXT2_NX |
d65131c
+            CPUID_EXT2_SYSCALL,
d65131c
+        .features[FEAT_8000_0001_ECX] =
d65131c
+            CPUID_EXT3_OSVW | CPUID_EXT3_3DNOWPREFETCH |
d65131c
+            CPUID_EXT3_MISALIGNSSE | CPUID_EXT3_SSE4A | CPUID_EXT3_ABM |
d65131c
+            CPUID_EXT3_CR8LEG | CPUID_EXT3_SVM | CPUID_EXT3_LAHF_LM,
d65131c
+        .features[FEAT_8000_0008_EBX] =
d65131c
+            CPUID_8000_0008_EBX_IBPB,
d65131c
+        .features[FEAT_7_0_EBX] =
d65131c
+            CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_EBX_BMI1 | CPUID_7_0_EBX_AVX2 |
d65131c
+            CPUID_7_0_EBX_SMEP | CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_RDSEED |
d65131c
+            CPUID_7_0_EBX_ADX | CPUID_7_0_EBX_SMAP | CPUID_7_0_EBX_CLFLUSHOPT |
d65131c
+            CPUID_7_0_EBX_SHA_NI,
d65131c
+        /* Missing: XSAVES (not supported by some Linux versions,
d65131c
+         * including v4.1 to v4.12).
d65131c
+         * KVM doesn't yet expose any XSAVES state save component.
d65131c
+         */
d65131c
+        .features[FEAT_XSAVE] =
d65131c
+            CPUID_XSAVE_XSAVEOPT | CPUID_XSAVE_XSAVEC |
d65131c
+            CPUID_XSAVE_XGETBV1,
d65131c
+        .features[FEAT_6_EAX] =
d65131c
+            CPUID_6_EAX_ARAT,
d65131c
+        .xlevel = 0x8000000A,
d65131c
+        .model_id = "AMD EPYC Processor (with IBPB)",
d65131c
+    },
d65131c
 };
d65131c
 
d65131c
 typedef struct PropValue {