c313de
From 41472ea4967eed29a41f619aca9c3d78504d0031 Mon Sep 17 00:00:00 2001
c313de
Message-Id: <41472ea4967eed29a41f619aca9c3d78504d0031@dist-git>
c313de
From: Jiri Denemark <jdenemar@redhat.com>
c313de
Date: Fri, 21 Jun 2019 09:25:15 +0200
c313de
Subject: [PATCH] cpu_map: Add more signatures for Haswell CPU models
c313de
MIME-Version: 1.0
c313de
Content-Type: text/plain; charset=UTF-8
c313de
Content-Transfer-Encoding: 8bit
c313de
c313de
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
c313de
Reviewed-by: Ján Tomko <jtomko@redhat.com>
c313de
(cherry picked from commit e58ca588cc0deee36c8ae44f2ad75bf9b1680fc5)
c313de
c313de
https://bugzilla.redhat.com/show_bug.cgi?id=1686895
c313de
c313de
Conflicts:
c313de
	src/cpu_map/x86_Haswell-IBRS.xml
c313de
	src/cpu_map/x86_Haswell-noTSX-IBRS.xml
c313de
	src/cpu_map/x86_Haswell-noTSX.xml
c313de
	src/cpu_map/x86_Haswell.xml
c313de
            - cpu_map split not backported
c313de
c313de
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
c313de
Message-Id: <f2154885afb3bb49b36ae3468b11251c7ebf896f.1561068591.git.jdenemar@redhat.com>
c313de
Reviewed-by: Ján Tomko <jtomko@redhat.com>
c313de
---
c313de
 src/cpu/cpu_map.xml | 12 ++++++++++++
c313de
 1 file changed, 12 insertions(+)
c313de
c313de
diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
c313de
index 9bd8bbbfbb..ed6006643b 100644
c313de
--- a/src/cpu/cpu_map.xml
c313de
+++ b/src/cpu/cpu_map.xml
c313de
@@ -1243,6 +1243,9 @@
c313de
 
c313de
     <model name='Haswell-noTSX'>
c313de
       <signature family='6' model='60'/> 
c313de
+      <signature family='6' model='63'/> 
c313de
+      <signature family='6' model='69'/> 
c313de
+      <signature family='6' model='70'/> 
c313de
       <vendor name='Intel'/>
c313de
       <feature name='aes'/>
c313de
       <feature name='apic'/>
c313de
@@ -1296,6 +1299,9 @@
c313de
 
c313de
     <model name='Haswell-noTSX-IBRS'>
c313de
       <signature family='6' model='60'/> 
c313de
+      <signature family='6' model='63'/> 
c313de
+      <signature family='6' model='69'/> 
c313de
+      <signature family='6' model='70'/> 
c313de
       <vendor name='Intel'/>
c313de
       <feature name='aes'/>
c313de
       <feature name='apic'/>
c313de
@@ -1350,6 +1356,9 @@
c313de
 
c313de
     <model name='Haswell'>
c313de
       <signature family='6' model='60'/> 
c313de
+      <signature family='6' model='63'/> 
c313de
+      <signature family='6' model='69'/> 
c313de
+      <signature family='6' model='70'/> 
c313de
       <vendor name='Intel'/>
c313de
       <feature name='aes'/>
c313de
       <feature name='apic'/>
c313de
@@ -1405,6 +1414,9 @@
c313de
 
c313de
     <model name='Haswell-IBRS'>
c313de
       <signature family='6' model='60'/> 
c313de
+      <signature family='6' model='63'/> 
c313de
+      <signature family='6' model='69'/> 
c313de
+      <signature family='6' model='70'/> 
c313de
       <vendor name='Intel'/>
c313de
       <feature name='aes'/>
c313de
       <feature name='apic'/>
c313de
-- 
c313de
2.22.0
c313de