From a4fe8dfb0c2df61f1b903e8858cd6430954f30e2 Mon Sep 17 00:00:00 2001 Message-Id: From: Jiri Denemark Date: Wed, 20 Mar 2019 17:15:16 +0100 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 Reviewed-by: Ján Tomko (cherry picked from commit 4ff74a806ad42820eef3877c8ec146770914d8df) https://bugzilla.redhat.com/show_bug.cgi?id=1558558 https://bugzilla.redhat.com/show_bug.cgi?id=1687515 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 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml - context: intel-pt feature does not exist in RHEL-7.6 Signed-off-by: Jiri Denemark Reviewed-by: Ján Tomko --- 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 7c6f70113e..095ea0a839 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -1434,6 +1434,9 @@ + + + @@ -1491,6 +1494,9 @@ + + + @@ -1549,6 +1555,9 @@ + + + @@ -1608,6 +1617,9 @@ + + + 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 d4f303ecce..e2ad344497 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 @@ - Skylake-Client-IBRS + Broadwell-IBRS Intel + @@ -18,14 +19,16 @@ + + + + + - - - 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 @@ - Skylake-Client-IBRS + Broadwell-IBRS Intel + + + + + - - - + 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 2fac54355c..c670b1f4df 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 @@ - Skylake-Client + Broadwell Intel + @@ -18,13 +19,15 @@ + + + + + - - - 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 @@ - Skylake-Client + Broadwell Intel + + + + + - - - + 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 2fac54355c..c670b1f4df 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 @@ - Skylake-Client + Broadwell Intel + @@ -18,13 +19,15 @@ + + + + + - - - 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 @@ - Skylake-Client + Broadwell Intel + + + + + - - - + -- 2.21.0