From cee34ab14f42a5ac9c317f3271a8afd2853990e2 Mon Sep 17 00:00:00 2001
From: Nikita Kalyazin <kalyazin@amazon.com>
Date: Tue, 28 May 2024 12:53:35 +0000
Subject: [PATCH] fix(cpu-template-helper): exclude TSC_DEADLINE MSR from
 fingerprints

The TSC_DEADLINE MSR value is volatile is it is getting updated
by the guest kernel based on the current TSC value.

Signed-off-by: Nikita Kalyazin <kalyazin@amazon.com>
---
 .../cpu_template_helper/fingerprint_AMD_MILAN_4.14host.json   | 4 ----
 .../cpu_template_helper/fingerprint_AMD_MILAN_5.10host.json   | 4 ----
 .../cpu_template_helper/fingerprint_AMD_MILAN_6.1host.json    | 4 ----
 .../fingerprint_INTEL_CASCADELAKE_4.14host.json               | 4 ----
 .../fingerprint_INTEL_CASCADELAKE_5.10host.json               | 4 ----
 .../fingerprint_INTEL_CASCADELAKE_6.1host.json                | 4 ----
 .../fingerprint_INTEL_ICELAKE_4.14host.json                   | 4 ----
 .../fingerprint_INTEL_ICELAKE_5.10host.json                   | 4 ----
 .../fingerprint_INTEL_ICELAKE_6.1host.json                    | 4 ----
 .../fingerprint_INTEL_SKYLAKE_4.14host.json                   | 4 ----
 .../fingerprint_INTEL_SKYLAKE_5.10host.json                   | 4 ----
 .../fingerprint_INTEL_SKYLAKE_6.1host.json                    | 4 ----
 12 files changed, 48 deletions(-)

diff --git a/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_4.14host.json b/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_4.14host.json
index 5c0805211de..e1252ee67a7 100644
--- a/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_4.14host.json
+++ b/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_4.14host.json
@@ -1276,10 +1276,6 @@
         "addr": "0x277",
         "bitmap": "0b0000000000000111000001000000011000000000000001110000010000000110"
       },
-      {
-        "addr": "0x6e0",
-        "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000"
-      },
       {
         "addr": "0x4b564d00",
         "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000"
diff --git a/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_5.10host.json b/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_5.10host.json
index feafc6061ba..5501ca88ce4 100644
--- a/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_5.10host.json
+++ b/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_5.10host.json
@@ -1426,10 +1426,6 @@
         "addr": "0x277",
         "bitmap": "0b0000000000000111000001000000011000000000000001110000010000000110"
       },
-      {
-        "addr": "0x6e0",
-        "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000"
-      },
       {
         "addr": "0x4b564d00",
         "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000"
diff --git a/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_6.1host.json b/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_6.1host.json
index 17520de539a..e0330895de7 100644
--- a/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_6.1host.json
+++ b/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_6.1host.json
@@ -1472,10 +1472,6 @@
         "addr": "0x277",
         "bitmap": "0b0000000000000111000001000000011000000000000001110000010000000110"
       },
-      {
-        "addr": "0x6e0",
-        "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000"
-      },
       {
         "addr": "0x4b564d00",
         "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000"
diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_4.14host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_4.14host.json
index 65faa69f424..bb9ce77cb16 100644
--- a/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_4.14host.json
+++ b/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_4.14host.json
@@ -962,10 +962,6 @@
         "addr": "0x277",
         "bitmap": "0b0000000000000111000001000000011000000000000001110000010000000110"
       },
-      {
-        "addr": "0x6e0",
-        "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000"
-      },
       {
         "addr": "0xd90",
         "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000"
diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_5.10host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_5.10host.json
index 31f8dad2924..8568992dcef 100644
--- a/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_5.10host.json
+++ b/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_5.10host.json
@@ -1158,10 +1158,6 @@
         "addr": "0x277",
         "bitmap": "0b0000000000000111000001000000011000000000000001110000010000000110"
       },
-      {
-        "addr": "0x6e0",
-        "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000"
-      },
       {
         "addr": "0xd90",
         "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000"
diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_6.1host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_6.1host.json
index d19fc9254bf..fc9ee8dddf8 100644
--- a/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_6.1host.json
+++ b/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_6.1host.json
@@ -1158,10 +1158,6 @@
         "addr": "0x277",
         "bitmap": "0b0000000000000111000001000000011000000000000001110000010000000110"
       },
-      {
-        "addr": "0x6e0",
-        "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000"
-      },
       {
         "addr": "0xd90",
         "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000"
diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_4.14host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_4.14host.json
index 3c0c51dd927..61c717defd6 100644
--- a/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_4.14host.json
+++ b/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_4.14host.json
@@ -916,10 +916,6 @@
         "addr": "0x277",
         "bitmap": "0b0000000000000111000001000000011000000000000001110000010000000110"
       },
-      {
-        "addr": "0x6e0",
-        "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000"
-      },
       {
         "addr": "0x4b564d00",
         "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000"
diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_5.10host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_5.10host.json
index 863ffd2851d..3a6c8d5123e 100644
--- a/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_5.10host.json
+++ b/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_5.10host.json
@@ -1250,10 +1250,6 @@
         "addr": "0x277",
         "bitmap": "0b0000000000000111000001000000011000000000000001110000010000000110"
       },
-      {
-        "addr": "0x6e0",
-        "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000"
-      },
       {
         "addr": "0x4b564d00",
         "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000"
diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_6.1host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_6.1host.json
index c5fd825edd0..d307c491d2a 100644
--- a/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_6.1host.json
+++ b/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_6.1host.json
@@ -1273,10 +1273,6 @@
         "addr": "0x277",
         "bitmap": "0b0000000000000111000001000000011000000000000001110000010000000110"
       },
-      {
-        "addr": "0x6e0",
-        "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000"
-      },
       {
         "addr": "0x4b564d00",
         "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000"
diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_4.14host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_4.14host.json
index 1714ac56edd..35c73d0e8af 100644
--- a/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_4.14host.json
+++ b/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_4.14host.json
@@ -962,10 +962,6 @@
         "addr": "0x277",
         "bitmap": "0b0000000000000111000001000000011000000000000001110000010000000110"
       },
-      {
-        "addr": "0x6e0",
-        "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000"
-      },
       {
         "addr": "0xd90",
         "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000"
diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_5.10host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_5.10host.json
index 1681b9f7d24..c80924adefa 100644
--- a/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_5.10host.json
+++ b/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_5.10host.json
@@ -1158,10 +1158,6 @@
         "addr": "0x277",
         "bitmap": "0b0000000000000111000001000000011000000000000001110000010000000110"
       },
-      {
-        "addr": "0x6e0",
-        "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000"
-      },
       {
         "addr": "0xd90",
         "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000"
diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_6.1host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_6.1host.json
index 6fc76c794e1..324619e3268 100644
--- a/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_6.1host.json
+++ b/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_6.1host.json
@@ -1158,10 +1158,6 @@
         "addr": "0x277",
         "bitmap": "0b0000000000000111000001000000011000000000000001110000010000000110"
       },
-      {
-        "addr": "0x6e0",
-        "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000"
-      },
       {
         "addr": "0xd90",
         "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000"