0a7476
From 4fa3e47f1e63a9e29f9df466b73e1d332c98ef5e Mon Sep 17 00:00:00 2001
0a7476
Message-Id: <4fa3e47f1e63a9e29f9df466b73e1d332c98ef5e@dist-git>
bba56f
From: Jiri Denemark <jdenemar@redhat.com>
bba56f
Date: Tue, 26 Feb 2019 12:59:37 +0100
bba56f
Subject: [PATCH] cpu_map: Add more signatures for Nehalem CPU models
bba56f
MIME-Version: 1.0
bba56f
Content-Type: text/plain; charset=UTF-8
bba56f
Content-Transfer-Encoding: 8bit
bba56f
bba56f
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
bba56f
Reviewed-by: Ján Tomko <jtomko@redhat.com>
bba56f
(cherry picked from commit f349f3c53f6427d9955ab7c57900c094f06dfd87)
bba56f
bba56f
https://bugzilla.redhat.com/show_bug.cgi?id=1558558
bba56f
https://bugzilla.redhat.com/show_bug.cgi?id=1687515
bba56f
bba56f
Conflicts:
bba56f
	src/cpu_map/x86_Nehalem-IBRS.xml
bba56f
	src/cpu_map/x86_Nehalem.xml
bba56f
            - cpu_map split not backported
bba56f
bba56f
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
bba56f
Reviewed-by: Ján Tomko <jtomko@redhat.com>
bba56f
---
bba56f
 src/cpu/cpu_map.xml | 6 ++++++
bba56f
 1 file changed, 6 insertions(+)
bba56f
bba56f
diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
bba56f
index 33994be6a4..8733834071 100644
bba56f
--- a/src/cpu/cpu_map.xml
bba56f
+++ b/src/cpu/cpu_map.xml
bba56f
@@ -858,6 +858,9 @@
bba56f
 
bba56f
     <model name='Nehalem'>
bba56f
       <signature family='6' model='26'/> 
bba56f
+      <signature family='6' model='30'/> 
bba56f
+      <signature family='6' model='31'/> 
bba56f
+      <signature family='6' model='46'/> 
bba56f
       <vendor name='Intel'/>
bba56f
       <feature name='apic'/>
bba56f
       <feature name='clflush'/>
bba56f
@@ -894,6 +897,9 @@
bba56f
 
bba56f
     <model name='Nehalem-IBRS'>
bba56f
       <signature family='6' model='26'/> 
bba56f
+      <signature family='6' model='30'/> 
bba56f
+      <signature family='6' model='31'/> 
bba56f
+      <signature family='6' model='46'/> 
bba56f
       <vendor name='Intel'/>
bba56f
       <feature name='apic'/>
bba56f
       <feature name='clflush'/>
bba56f
-- 
bba56f
2.21.0
bba56f