render / rpms / libvirt

Forked from rpms/libvirt 9 months ago
Clone
7548c0
From 7de3eaba72cecf596c732d12485e4f1a6115bf2f Mon Sep 17 00:00:00 2001
7548c0
Message-Id: <7de3eaba72cecf596c732d12485e4f1a6115bf2f@dist-git>
7548c0
From: Tim Wiederhake <twiederh@redhat.com>
7548c0
Date: Fri, 15 Jan 2021 15:17:19 +0100
7548c0
Subject: [PATCH] cpu_map: Add support for fsrm CPU feature
7548c0
7548c0
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
7548c0
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
7548c0
(cherry picked from commit 8c5c660b99101544d8cfcb8edbe48688c04bee25)
7548c0
7548c0
https://bugzilla.redhat.com/show_bug.cgi?id=1537734
7548c0
7548c0
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
7548c0
Message-Id: <20210115141722.14986-4-twiederh@redhat.com>
7548c0
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
7548c0
---
7548c0
 src/cpu_map/x86_features.xml                                | 3 +++
7548c0
 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml | 2 +-
7548c0
 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml    | 1 +
7548c0
 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml     | 1 +
7548c0
 4 files changed, 6 insertions(+), 1 deletion(-)
7548c0
7548c0
diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
7548c0
index 30d1375437..70e1c7b3fc 100644
7548c0
--- a/src/cpu_map/x86_features.xml
7548c0
+++ b/src/cpu_map/x86_features.xml
7548c0
@@ -332,6 +332,9 @@
7548c0
   <feature name='avx512-4fmaps'>
7548c0
     <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000008'/>
7548c0
   </feature>
7548c0
+  <feature name='fsrm'>
7548c0
+    <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000010'/>
7548c0
+  </feature>
7548c0
   <feature name='md-clear'> 
7548c0
     <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000400'/>
7548c0
   </feature>
7548c0
diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml
7548c0
index ce65579bcc..33bd1013f0 100644
7548c0
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml
7548c0
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml
7548c0
@@ -1,7 +1,7 @@
7548c0
 
7548c0
 <cpudata arch='x86'>
7548c0
   <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/>
7548c0
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001000' ecx='0x00400010' edx='0x00000000'/>
7548c0
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001000' ecx='0x00400010' edx='0x00000010'/>
7548c0
   <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
7548c0
   <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
7548c0
 </cpudata>
7548c0
diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
7548c0
index 9b75ace710..3a71b28cfb 100644
7548c0
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
7548c0
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
7548c0
@@ -24,6 +24,7 @@
7548c0
   <feature policy='require' name='sha-ni'/>
7548c0
   <feature policy='require' name='ospke'/>
7548c0
   <feature policy='require' name='rdpid'/>
7548c0
+  <feature policy='require' name='fsrm'/>
7548c0
   <feature policy='require' name='stibp'/>
7548c0
   <feature policy='require' name='arch-capabilities'/>
7548c0
   <feature policy='require' name='xsaves'/>
7548c0
diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
7548c0
index efbf9d363b..1582de0422 100644
7548c0
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
7548c0
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
7548c0
@@ -25,6 +25,7 @@
7548c0
   <feature name='sha-ni'/>
7548c0
   <feature name='ospke'/>
7548c0
   <feature name='rdpid'/>
7548c0
+  <feature name='fsrm'/>
7548c0
   <feature name='stibp'/>
7548c0
   <feature name='arch-capabilities'/>
7548c0
   <feature name='xsaves'/>
7548c0
-- 
7548c0
2.30.0
7548c0