99cbc7
From 265ba06a2613a05c2b770bfd7ca9a83147d87362 Mon Sep 17 00:00:00 2001
99cbc7
Message-Id: <265ba06a2613a05c2b770bfd7ca9a83147d87362@dist-git>
99cbc7
From: Jiri Denemark <jdenemar@redhat.com>
99cbc7
Date: Tue, 26 Feb 2019 12:06:05 +0100
99cbc7
Subject: [PATCH] cpu_map: Add more signatures for Haswell CPU models
99cbc7
MIME-Version: 1.0
99cbc7
Content-Type: text/plain; charset=UTF-8
99cbc7
Content-Transfer-Encoding: 8bit
99cbc7
99cbc7
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
99cbc7
Reviewed-by: Ján Tomko <jtomko@redhat.com>
99cbc7
(cherry picked from commit e58ca588cc0deee36c8ae44f2ad75bf9b1680fc5)
99cbc7
99cbc7
https://bugzilla.redhat.com/show_bug.cgi?id=1558558
99cbc7
https://bugzilla.redhat.com/show_bug.cgi?id=1687515
99cbc7
99cbc7
Conflicts:
99cbc7
	src/cpu_map/x86_Haswell-IBRS.xml
99cbc7
	src/cpu_map/x86_Haswell-noTSX-IBRS.xml
99cbc7
	src/cpu_map/x86_Haswell-noTSX.xml
99cbc7
	src/cpu_map/x86_Haswell.xml
99cbc7
            - cpu_map split not backported
99cbc7
99cbc7
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
99cbc7
Reviewed-by: Ján Tomko <jtomko@redhat.com>
99cbc7
---
99cbc7
 src/cpu/cpu_map.xml | 12 ++++++++++++
99cbc7
 1 file changed, 12 insertions(+)
99cbc7
99cbc7
diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
99cbc7
index 68cecf7ac0..7c6f70113e 100644
99cbc7
--- a/src/cpu/cpu_map.xml
99cbc7
+++ b/src/cpu/cpu_map.xml
99cbc7
@@ -1204,6 +1204,9 @@
99cbc7
 
99cbc7
     <model name='Haswell-noTSX'>
99cbc7
       <signature family='6' model='60'/> 
99cbc7
+      <signature family='6' model='63'/> 
99cbc7
+      <signature family='6' model='69'/> 
99cbc7
+      <signature family='6' model='70'/> 
99cbc7
       <vendor name='Intel'/>
99cbc7
       <feature name='aes'/>
99cbc7
       <feature name='apic'/>
99cbc7
@@ -1257,6 +1260,9 @@
99cbc7
 
99cbc7
     <model name='Haswell-noTSX-IBRS'>
99cbc7
       <signature family='6' model='60'/> 
99cbc7
+      <signature family='6' model='63'/> 
99cbc7
+      <signature family='6' model='69'/> 
99cbc7
+      <signature family='6' model='70'/> 
99cbc7
       <vendor name='Intel'/>
99cbc7
       <feature name='aes'/>
99cbc7
       <feature name='apic'/>
99cbc7
@@ -1311,6 +1317,9 @@
99cbc7
 
99cbc7
     <model name='Haswell'>
99cbc7
       <signature family='6' model='60'/> 
99cbc7
+      <signature family='6' model='63'/> 
99cbc7
+      <signature family='6' model='69'/> 
99cbc7
+      <signature family='6' model='70'/> 
99cbc7
       <vendor name='Intel'/>
99cbc7
       <feature name='aes'/>
99cbc7
       <feature name='apic'/>
99cbc7
@@ -1366,6 +1375,9 @@
99cbc7
 
99cbc7
     <model name='Haswell-IBRS'>
99cbc7
       <signature family='6' model='60'/> 
99cbc7
+      <signature family='6' model='63'/> 
99cbc7
+      <signature family='6' model='69'/> 
99cbc7
+      <signature family='6' model='70'/> 
99cbc7
       <vendor name='Intel'/>
99cbc7
       <feature name='aes'/>
99cbc7
       <feature name='apic'/>
99cbc7
-- 
99cbc7
2.21.0
99cbc7