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