255 lines
11 KiB
Diff
255 lines
11 KiB
Diff
From 77ad41e460c2e91f2c2e187c80581069654b741d Mon Sep 17 00:00:00 2001
|
|
Message-Id: <77ad41e460c2e91f2c2e187c80581069654b741d@dist-git>
|
|
From: Jiri Denemark <Jiri.Denemark@gmail.com>
|
|
Date: Fri, 21 Jun 2019 09:25:16 +0200
|
|
Subject: [PATCH] cpu_map: Add more signatures for Broadwell CPU models
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This fixes several CPUs which were incorrectly detected as
|
|
Skylake-Client.
|
|
|
|
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
(cherry picked from commit 4ff74a806ad42820eef3877c8ec146770914d8df)
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1686895
|
|
|
|
Conflicts:
|
|
src/cpu_map/x86_Broadwell-IBRS.xml
|
|
src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
|
|
src/cpu_map/x86_Broadwell-noTSX.xml
|
|
src/cpu_map/x86_Broadwell.xml
|
|
- cpu_map split not backported
|
|
|
|
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
Message-Id: <543534b544d2d09470c218aeb6c7d945facaf2c8.1561068591.git.jdenemar@redhat.com>
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
---
|
|
src/cpu/cpu_map.xml | 12 ++++++++++++
|
|
.../x86_64-cpuid-Xeon-E5-2623-v4-guest.xml | 11 +++++++----
|
|
.../x86_64-cpuid-Xeon-E5-2623-v4-json.xml | 11 +++++++----
|
|
.../x86_64-cpuid-Xeon-E5-2630-v4-guest.xml | 11 +++++++----
|
|
.../x86_64-cpuid-Xeon-E5-2630-v4-json.xml | 11 +++++++----
|
|
.../x86_64-cpuid-Xeon-E5-2650-v4-guest.xml | 11 +++++++----
|
|
.../x86_64-cpuid-Xeon-E5-2650-v4-json.xml | 11 +++++++----
|
|
7 files changed, 54 insertions(+), 24 deletions(-)
|
|
|
|
diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
|
|
index ed6006643b..04369d1eda 100644
|
|
--- a/src/cpu/cpu_map.xml
|
|
+++ b/src/cpu/cpu_map.xml
|
|
@@ -1473,6 +1473,9 @@
|
|
|
|
<model name='Broadwell-noTSX'>
|
|
<signature family='6' model='61'/> <!-- 0306d0 -->
|
|
+ <signature family='6' model='71'/> <!-- 040670 -->
|
|
+ <signature family='6' model='79'/> <!-- 0406f0 -->
|
|
+ <signature family='6' model='86'/> <!-- 050660 -->
|
|
<vendor name='Intel'/>
|
|
<feature name='3dnowprefetch'/>
|
|
<feature name='adx'/>
|
|
@@ -1530,6 +1533,9 @@
|
|
|
|
<model name='Broadwell-noTSX-IBRS'>
|
|
<signature family='6' model='61'/> <!-- 0306d0 -->
|
|
+ <signature family='6' model='71'/> <!-- 040670 -->
|
|
+ <signature family='6' model='79'/> <!-- 0406f0 -->
|
|
+ <signature family='6' model='86'/> <!-- 050660 -->
|
|
<vendor name='Intel'/>
|
|
<feature name='3dnowprefetch'/>
|
|
<feature name='adx'/>
|
|
@@ -1588,6 +1594,9 @@
|
|
|
|
<model name='Broadwell'>
|
|
<signature family='6' model='61'/> <!-- 0306d0 -->
|
|
+ <signature family='6' model='71'/> <!-- 040670 -->
|
|
+ <signature family='6' model='79'/> <!-- 0406f0 -->
|
|
+ <signature family='6' model='86'/> <!-- 050660 -->
|
|
<vendor name='Intel'/>
|
|
<feature name='3dnowprefetch'/>
|
|
<feature name='adx'/>
|
|
@@ -1647,6 +1656,9 @@
|
|
|
|
<model name='Broadwell-IBRS'>
|
|
<signature family='6' model='61'/> <!-- 0306d0 -->
|
|
+ <signature family='6' model='71'/> <!-- 040670 -->
|
|
+ <signature family='6' model='79'/> <!-- 0406f0 -->
|
|
+ <signature family='6' model='86'/> <!-- 050660 -->
|
|
<vendor name='Intel'/>
|
|
<feature name='3dnowprefetch'/>
|
|
<feature name='adx'/>
|
|
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
|
|
index 7718d7ca59..a5c6d9b471 100644
|
|
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
|
|
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
|
|
@@ -1,6 +1,7 @@
|
|
<cpu mode='custom' match='exact'>
|
|
- <model fallback='forbid'>Skylake-Client-IBRS</model>
|
|
+ <model fallback='forbid'>Broadwell-IBRS</model>
|
|
<vendor>Intel</vendor>
|
|
+ <feature policy='require' name='vme'/>
|
|
<feature policy='require' name='ds'/>
|
|
<feature policy='require' name='acpi'/>
|
|
<feature policy='require' name='ss'/>
|
|
@@ -18,15 +19,17 @@
|
|
<feature policy='require' name='pdcm'/>
|
|
<feature policy='require' name='dca'/>
|
|
<feature policy='require' name='osxsave'/>
|
|
+ <feature policy='require' name='f16c'/>
|
|
+ <feature policy='require' name='rdrand'/>
|
|
+ <feature policy='require' name='arat'/>
|
|
<feature policy='require' name='tsc_adjust'/>
|
|
<feature policy='require' name='cmt'/>
|
|
<feature policy='require' name='intel-pt'/>
|
|
<feature policy='require' name='stibp'/>
|
|
+ <feature policy='require' name='xsaveopt'/>
|
|
<feature policy='require' name='mbm_total'/>
|
|
<feature policy='require' name='mbm_local'/>
|
|
<feature policy='require' name='pdpe1gb'/>
|
|
+ <feature policy='require' name='abm'/>
|
|
<feature policy='require' name='invtsc'/>
|
|
- <feature policy='disable' name='mpx'/>
|
|
- <feature policy='disable' name='xsavec'/>
|
|
- <feature policy='disable' name='xgetbv1'/>
|
|
</cpu>
|
|
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-json.xml
|
|
index 167a9028ab..de082dbd93 100644
|
|
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-json.xml
|
|
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-json.xml
|
|
@@ -1,11 +1,14 @@
|
|
<cpu mode='custom' match='exact'>
|
|
- <model fallback='forbid'>Skylake-Client-IBRS</model>
|
|
+ <model fallback='forbid'>Broadwell-IBRS</model>
|
|
<vendor>Intel</vendor>
|
|
+ <feature policy='require' name='vme'/>
|
|
<feature policy='require' name='ss'/>
|
|
+ <feature policy='require' name='f16c'/>
|
|
+ <feature policy='require' name='rdrand'/>
|
|
<feature policy='require' name='hypervisor'/>
|
|
+ <feature policy='require' name='arat'/>
|
|
<feature policy='require' name='tsc_adjust'/>
|
|
+ <feature policy='require' name='xsaveopt'/>
|
|
<feature policy='require' name='pdpe1gb'/>
|
|
- <feature policy='disable' name='mpx'/>
|
|
- <feature policy='disable' name='xsavec'/>
|
|
- <feature policy='disable' name='xgetbv1'/>
|
|
+ <feature policy='require' name='abm'/>
|
|
</cpu>
|
|
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
|
|
index cd7e25b52a..e2999db8e9 100644
|
|
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
|
|
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
|
|
@@ -1,6 +1,7 @@
|
|
<cpu mode='custom' match='exact'>
|
|
- <model fallback='forbid'>Skylake-Client</model>
|
|
+ <model fallback='forbid'>Broadwell</model>
|
|
<vendor>Intel</vendor>
|
|
+ <feature policy='require' name='vme'/>
|
|
<feature policy='require' name='ds'/>
|
|
<feature policy='require' name='acpi'/>
|
|
<feature policy='require' name='ss'/>
|
|
@@ -18,14 +19,16 @@
|
|
<feature policy='require' name='pdcm'/>
|
|
<feature policy='require' name='dca'/>
|
|
<feature policy='require' name='osxsave'/>
|
|
+ <feature policy='require' name='f16c'/>
|
|
+ <feature policy='require' name='rdrand'/>
|
|
+ <feature policy='require' name='arat'/>
|
|
<feature policy='require' name='tsc_adjust'/>
|
|
<feature policy='require' name='cmt'/>
|
|
<feature policy='require' name='intel-pt'/>
|
|
+ <feature policy='require' name='xsaveopt'/>
|
|
<feature policy='require' name='mbm_total'/>
|
|
<feature policy='require' name='mbm_local'/>
|
|
<feature policy='require' name='pdpe1gb'/>
|
|
+ <feature policy='require' name='abm'/>
|
|
<feature policy='require' name='invtsc'/>
|
|
- <feature policy='disable' name='mpx'/>
|
|
- <feature policy='disable' name='xsavec'/>
|
|
- <feature policy='disable' name='xgetbv1'/>
|
|
</cpu>
|
|
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml
|
|
index 5dfce947b2..5b8891093a 100644
|
|
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml
|
|
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml
|
|
@@ -1,11 +1,14 @@
|
|
<cpu mode='custom' match='exact'>
|
|
- <model fallback='forbid'>Skylake-Client</model>
|
|
+ <model fallback='forbid'>Broadwell</model>
|
|
<vendor>Intel</vendor>
|
|
+ <feature policy='require' name='vme'/>
|
|
<feature policy='require' name='ss'/>
|
|
+ <feature policy='require' name='f16c'/>
|
|
+ <feature policy='require' name='rdrand'/>
|
|
<feature policy='require' name='hypervisor'/>
|
|
+ <feature policy='require' name='arat'/>
|
|
<feature policy='require' name='tsc_adjust'/>
|
|
+ <feature policy='require' name='xsaveopt'/>
|
|
<feature policy='require' name='pdpe1gb'/>
|
|
- <feature policy='disable' name='mpx'/>
|
|
- <feature policy='disable' name='xsavec'/>
|
|
- <feature policy='disable' name='xgetbv1'/>
|
|
+ <feature policy='require' name='abm'/>
|
|
</cpu>
|
|
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
|
|
index cd7e25b52a..e2999db8e9 100644
|
|
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
|
|
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
|
|
@@ -1,6 +1,7 @@
|
|
<cpu mode='custom' match='exact'>
|
|
- <model fallback='forbid'>Skylake-Client</model>
|
|
+ <model fallback='forbid'>Broadwell</model>
|
|
<vendor>Intel</vendor>
|
|
+ <feature policy='require' name='vme'/>
|
|
<feature policy='require' name='ds'/>
|
|
<feature policy='require' name='acpi'/>
|
|
<feature policy='require' name='ss'/>
|
|
@@ -18,14 +19,16 @@
|
|
<feature policy='require' name='pdcm'/>
|
|
<feature policy='require' name='dca'/>
|
|
<feature policy='require' name='osxsave'/>
|
|
+ <feature policy='require' name='f16c'/>
|
|
+ <feature policy='require' name='rdrand'/>
|
|
+ <feature policy='require' name='arat'/>
|
|
<feature policy='require' name='tsc_adjust'/>
|
|
<feature policy='require' name='cmt'/>
|
|
<feature policy='require' name='intel-pt'/>
|
|
+ <feature policy='require' name='xsaveopt'/>
|
|
<feature policy='require' name='mbm_total'/>
|
|
<feature policy='require' name='mbm_local'/>
|
|
<feature policy='require' name='pdpe1gb'/>
|
|
+ <feature policy='require' name='abm'/>
|
|
<feature policy='require' name='invtsc'/>
|
|
- <feature policy='disable' name='mpx'/>
|
|
- <feature policy='disable' name='xsavec'/>
|
|
- <feature policy='disable' name='xgetbv1'/>
|
|
</cpu>
|
|
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-json.xml
|
|
index 5dfce947b2..5b8891093a 100644
|
|
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-json.xml
|
|
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-json.xml
|
|
@@ -1,11 +1,14 @@
|
|
<cpu mode='custom' match='exact'>
|
|
- <model fallback='forbid'>Skylake-Client</model>
|
|
+ <model fallback='forbid'>Broadwell</model>
|
|
<vendor>Intel</vendor>
|
|
+ <feature policy='require' name='vme'/>
|
|
<feature policy='require' name='ss'/>
|
|
+ <feature policy='require' name='f16c'/>
|
|
+ <feature policy='require' name='rdrand'/>
|
|
<feature policy='require' name='hypervisor'/>
|
|
+ <feature policy='require' name='arat'/>
|
|
<feature policy='require' name='tsc_adjust'/>
|
|
+ <feature policy='require' name='xsaveopt'/>
|
|
<feature policy='require' name='pdpe1gb'/>
|
|
- <feature policy='disable' name='mpx'/>
|
|
- <feature policy='disable' name='xsavec'/>
|
|
- <feature policy='disable' name='xgetbv1'/>
|
|
+ <feature policy='require' name='abm'/>
|
|
</cpu>
|
|
--
|
|
2.22.0
|
|
|