99cbc7
From 4fa3e47f1e63a9e29f9df466b73e1d332c98ef5e Mon Sep 17 00:00:00 2001
99cbc7
Message-Id: <4fa3e47f1e63a9e29f9df466b73e1d332c98ef5e@dist-git>
99cbc7
From: Jiri Denemark <jdenemar@redhat.com>
99cbc7
Date: Tue, 26 Feb 2019 12:59:37 +0100
99cbc7
Subject: [PATCH] cpu_map: Add more signatures for Nehalem 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 f349f3c53f6427d9955ab7c57900c094f06dfd87)
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_Nehalem-IBRS.xml
99cbc7
	src/cpu_map/x86_Nehalem.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 | 6 ++++++
99cbc7
 1 file changed, 6 insertions(+)
99cbc7
99cbc7
diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
99cbc7
index 33994be6a4..8733834071 100644
99cbc7
--- a/src/cpu/cpu_map.xml
99cbc7
+++ b/src/cpu/cpu_map.xml
99cbc7
@@ -858,6 +858,9 @@
99cbc7
 
99cbc7
     <model name='Nehalem'>
99cbc7
       <signature family='6' model='26'/> 
99cbc7
+      <signature family='6' model='30'/> 
99cbc7
+      <signature family='6' model='31'/> 
99cbc7
+      <signature family='6' model='46'/> 
99cbc7
       <vendor name='Intel'/>
99cbc7
       <feature name='apic'/>
99cbc7
       <feature name='clflush'/>
99cbc7
@@ -894,6 +897,9 @@
99cbc7
 
99cbc7
     <model name='Nehalem-IBRS'>
99cbc7
       <signature family='6' model='26'/> 
99cbc7
+      <signature family='6' model='30'/> 
99cbc7
+      <signature family='6' model='31'/> 
99cbc7
+      <signature family='6' model='46'/> 
99cbc7
       <vendor name='Intel'/>
99cbc7
       <feature name='apic'/>
99cbc7
       <feature name='clflush'/>
99cbc7
-- 
99cbc7
2.21.0
99cbc7