397dc2
From b5716d1b191eb52cd88d7b94cb9bf0186f3e427b Mon Sep 17 00:00:00 2001
397dc2
Message-Id: <b5716d1b191eb52cd88d7b94cb9bf0186f3e427b@dist-git>
397dc2
From: Jiri Denemark <jdenemar@redhat.com>
397dc2
Date: Wed, 3 Mar 2021 11:11:54 +0100
397dc2
Subject: [PATCH] cpu_map: Add EPYC-Milan x86 CPU model
397dc2
MIME-Version: 1.0
397dc2
Content-Type: text/plain; charset=UTF-8
397dc2
Content-Transfer-Encoding: 8bit
397dc2
397dc2
Introduced in QEMU 6.0.0 by 623972ceae091b31331ae4a1dc94fe5cbb891937
397dc2
397dc2
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
397dc2
Reviewed-by: Ján Tomko <jtomko@redhat.com>
397dc2
(cherry picked from commit f321a4822e9fa6542e48a78611989ecd9acaa83a)
397dc2
397dc2
https://bugzilla.redhat.com/show_bug.cgi?id=1926864
397dc2
397dc2
Conflicts:
397dc2
	src/cpu_map/index.xml
397dc2
            - context: commit 82bebba1803c63a733e17f5ab2618e020e4abd8d
397dc2
              "cpu_map: Unify apostrophe and quotation mark usage" was
397dc2
              not backported
397dc2
397dc2
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
397dc2
Message-Id: <715abc0f90faafb7daa193dd24bad65046c36de0.1614766279.git.jdenemar@redhat.com>
397dc2
Reviewed-by: Ján Tomko <jtomko@redhat.com>
397dc2
---
397dc2
 src/cpu_map/index.xml          |  1 +
397dc2
 src/cpu_map/x86_EPYC-Milan.xml | 92 ++++++++++++++++++++++++++++++++++
397dc2
 2 files changed, 93 insertions(+)
397dc2
 create mode 100644 src/cpu_map/x86_EPYC-Milan.xml
397dc2
397dc2
diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
397dc2
index 2f58261e6d..c3dda794b1 100644
397dc2
--- a/src/cpu_map/index.xml
397dc2
+++ b/src/cpu_map/index.xml
397dc2
@@ -68,6 +68,7 @@
397dc2
     <include filename="x86_EPYC.xml"/>
397dc2
     <include filename="x86_EPYC-IBPB.xml"/>
397dc2
     <include filename="x86_EPYC-Rome.xml"/>
397dc2
+    <include filename='x86_EPYC-Milan.xml'/>
397dc2
 
397dc2
     
397dc2
     <include filename="x86_Dhyana.xml"/>
397dc2
diff --git a/src/cpu_map/x86_EPYC-Milan.xml b/src/cpu_map/x86_EPYC-Milan.xml
397dc2
new file mode 100644
397dc2
index 0000000000..53f0cd6aac
397dc2
--- /dev/null
397dc2
+++ b/src/cpu_map/x86_EPYC-Milan.xml
397dc2
@@ -0,0 +1,92 @@
397dc2
+<cpus>
397dc2
+  <model name='EPYC-Milan'>
397dc2
+    <decode host='on' guest='on'/>
397dc2
+    <signature family='25' model='1'/>
397dc2
+    <vendor name='AMD'/>
397dc2
+    <feature name='3dnowprefetch'/>
397dc2
+    <feature name='abm'/>
397dc2
+    <feature name='adx'/>
397dc2
+    <feature name='aes'/>
397dc2
+    <feature name='amd-ssbd'/>
397dc2
+    <feature name='amd-stibp'/>
397dc2
+    <feature name='apic'/>
397dc2
+    <feature name='arat'/>
397dc2
+    <feature name='avx'/>
397dc2
+    <feature name='avx2'/>
397dc2
+    <feature name='bmi1'/>
397dc2
+    <feature name='bmi2'/>
397dc2
+    <feature name='clflush'/>
397dc2
+    <feature name='clflushopt'/>
397dc2
+    <feature name='clwb'/>
397dc2
+    <feature name='clzero'/>
397dc2
+    <feature name='cmov'/>
397dc2
+    <feature name='cr8legacy'/>
397dc2
+    <feature name='cx16'/>
397dc2
+    <feature name='cx8'/>
397dc2
+    <feature name='de'/>
397dc2
+    <feature name='erms'/>
397dc2
+    <feature name='f16c'/>
397dc2
+    <feature name='fma'/>
397dc2
+    <feature name='fpu'/>
397dc2
+    <feature name='fsgsbase'/>
397dc2
+    <feature name='fsrm'/>
397dc2
+    <feature name='fxsr'/>
397dc2
+    <feature name='fxsr_opt'/>
397dc2
+    <feature name='ibpb'/>
397dc2
+    <feature name='ibrs'/>
397dc2
+    <feature name='invpcid'/>
397dc2
+    <feature name='lahf_lm'/>
397dc2
+    <feature name='lm'/>
397dc2
+    <feature name='mca'/>
397dc2
+    <feature name='mce'/>
397dc2
+    <feature name='misalignsse'/>
397dc2
+    <feature name='mmx'/>
397dc2
+    <feature name='mmxext'/>
397dc2
+    <feature name='movbe'/>
397dc2
+    <feature name='msr'/>
397dc2
+    <feature name='mtrr'/>
397dc2
+    <feature name='npt'/>
397dc2
+    <feature name='nrip-save'/>
397dc2
+    <feature name='nx'/>
397dc2
+    <feature name='osvw'/>
397dc2
+    <feature name='pae'/>
397dc2
+    <feature name='pat'/>
397dc2
+    <feature name='pcid'/>
397dc2
+    <feature name='pclmuldq'/>
397dc2
+    <feature name='pdpe1gb'/>
397dc2
+    <feature name='perfctr_core'/>
397dc2
+    <feature name='pge'/>
397dc2
+    <feature name='pku'/>
397dc2
+    <feature name='pni'/>
397dc2
+    <feature name='popcnt'/>
397dc2
+    <feature name='pse'/>
397dc2
+    <feature name='pse36'/>
397dc2
+    <feature name='rdpid'/>
397dc2
+    <feature name='rdrand'/>
397dc2
+    <feature name='rdseed'/>
397dc2
+    <feature name='rdtscp'/>
397dc2
+    <feature name='sep'/>
397dc2
+    <feature name='sha-ni'/>
397dc2
+    <feature name='smap'/>
397dc2
+    <feature name='smep'/>
397dc2
+    <feature name='sse'/>
397dc2
+    <feature name='sse2'/>
397dc2
+    <feature name='sse4.1'/>
397dc2
+    <feature name='sse4.2'/>
397dc2
+    <feature name='sse4a'/>
397dc2
+    <feature name='ssse3'/>
397dc2
+    <feature name='svm'/>
397dc2
+    <feature name='svme-addr-check'/>
397dc2
+    <feature name='syscall'/>
397dc2
+    <feature name='tsc'/>
397dc2
+    <feature name='umip'/>
397dc2
+    <feature name='vme'/>
397dc2
+    <feature name='wbnoinvd'/>
397dc2
+    <feature name='xgetbv1'/>
397dc2
+    <feature name='xsave'/>
397dc2
+    <feature name='xsavec'/>
397dc2
+    <feature name='xsaveerptr'/>
397dc2
+    <feature name='xsaveopt'/>
397dc2
+    <feature name='xsaves'/>
397dc2
+  </model>
397dc2
+</cpus>
397dc2
-- 
397dc2
2.30.0
397dc2