Drop kvm-svm-correct-the-size-of-spec_ctrl-field-in-vmcb-.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.1/kvm-svm-correct-the-size-of-spec_ctrl-field-in-vmcb-.patch b/queue-6.1/kvm-svm-correct-the-size-of-spec_ctrl-field-in-vmcb-.patch
deleted file mode 100644 (file)
index c4f31a8..0000000
--- a/queue-6.1/kvm-svm-correct-the-size-of-spec_ctrl-field-in-vmcb-.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 11f5e505e7b73a1d76ba076f00630d72e0e4e3c2 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 17 Jul 2023 04:19:03 +0000
-Subject: KVM: SVM: correct the size of spec_ctrl field in VMCB save area
-
-From: Manali Shukla <manali.shukla@amd.com>
-
-[ Upstream commit f67063414c0e83bb4a9e12358cc179af53c2a8bb ]
-
-Correct the spec_ctrl field in the VMCB save area based on the AMD
-Programmer's manual.
-
-Originally, the spec_ctrl was listed as u32 with 4 bytes of reserved
-area.  The AMD Programmer's Manual now lists the spec_ctrl as 8 bytes
-in VMCB save area.
-
-The Public Processor Programming reference for Genoa, shows SPEC_CTRL
-as 64b register, but the AMD Programmer's Manual lists SPEC_CTRL as
-32b register. This discrepancy will be cleaned up in next revision of
-the AMD Programmer's Manual.
-
-Since remaining bits above bit 7 are reserved bits in SPEC_CTRL MSR
-and thus, not being used, the spec_ctrl added as u32 in the VMCB save
-area is currently not an issue.
-
-Fixes: 3dd2775b74c9 ("KVM: SVM: Create a separate mapping for the SEV-ES save area")
-Suggested-by: Tom Lendacky <thomas.lendacky@amd.com>
-Signed-off-by: Manali Shukla <manali.shukla@amd.com>
-Link: https://lore.kernel.org/r/20230717041903.85480-1-manali.shukla@amd.com
-Signed-off-by: Sean Christopherson <seanjc@google.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/x86/include/asm/svm.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/x86/include/asm/svm.h b/arch/x86/include/asm/svm.h
-index 770dcf75eaa97..a14e62a12d616 100644
---- a/arch/x86/include/asm/svm.h
-+++ b/arch/x86/include/asm/svm.h
-@@ -337,7 +337,7 @@ struct vmcb_save_area {
-       u64 last_excp_from;
-       u64 last_excp_to;
-       u8 reserved_0x298[72];
--      u32 spec_ctrl;          /* Guest version of SPEC_CTRL at 0x2E0 */
-+      u64 spec_ctrl;          /* Guest version of SPEC_CTRL at 0x2E0 */
- } __packed;
- 
- /* Save area definition for SEV-ES and SEV-SNP guests */
-@@ -504,7 +504,7 @@ struct ghcb {
- } __packed;
- 
- 
--#define EXPECTED_VMCB_SAVE_AREA_SIZE          740
-+#define EXPECTED_VMCB_SAVE_AREA_SIZE          744
- #define EXPECTED_GHCB_SAVE_AREA_SIZE          1032
- #define EXPECTED_SEV_ES_SAVE_AREA_SIZE                1648
- #define EXPECTED_VMCB_CONTROL_AREA_SIZE               1024
--- 
-2.40.1
-

diff --git a/queue-6.1/series b/queue-6.1/series
index ea009c2a34c2de2cc0c6e0216a906b16ff50fe91..571710a226ee960c0d7297a86140992b556e4b8a 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -71,7 +71,6 @@ perf-vendor-events-update-the-json-events-descriptio.patch
 perf-vendor-events-drop-some-of-the-json-events-for-.patch
 perf-vendor-events-drop-stores_per_inst-metric-event.patch
 perf-top-don-t-pass-an-err_ptr-directly-to-perf_sess.patch
-kvm-svm-correct-the-size-of-spec_ctrl-field-in-vmcb-.patch
 watchdog-intel-mid_wdt-add-module_alias-to-allow-aut.patch
 pwm-lpc32xx-remove-handling-of-pwm-channels.patch
 perf-test-stat_bpf_counters_cgrp-fix-shellcheck-issu.patch

diff --git a/queue-6.5/kvm-svm-correct-the-size-of-spec_ctrl-field-in-vmcb-.patch b/queue-6.5/kvm-svm-correct-the-size-of-spec_ctrl-field-in-vmcb-.patch
deleted file mode 100644 (file)
index 32bb257..0000000
--- a/queue-6.5/kvm-svm-correct-the-size-of-spec_ctrl-field-in-vmcb-.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 578a5cd9dc2ccde736f91d2def6e3d808e414838 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 17 Jul 2023 04:19:03 +0000
-Subject: KVM: SVM: correct the size of spec_ctrl field in VMCB save area
-
-From: Manali Shukla <manali.shukla@amd.com>
-
-[ Upstream commit f67063414c0e83bb4a9e12358cc179af53c2a8bb ]
-
-Correct the spec_ctrl field in the VMCB save area based on the AMD
-Programmer's manual.
-
-Originally, the spec_ctrl was listed as u32 with 4 bytes of reserved
-area.  The AMD Programmer's Manual now lists the spec_ctrl as 8 bytes
-in VMCB save area.
-
-The Public Processor Programming reference for Genoa, shows SPEC_CTRL
-as 64b register, but the AMD Programmer's Manual lists SPEC_CTRL as
-32b register. This discrepancy will be cleaned up in next revision of
-the AMD Programmer's Manual.
-
-Since remaining bits above bit 7 are reserved bits in SPEC_CTRL MSR
-and thus, not being used, the spec_ctrl added as u32 in the VMCB save
-area is currently not an issue.
-
-Fixes: 3dd2775b74c9 ("KVM: SVM: Create a separate mapping for the SEV-ES save area")
-Suggested-by: Tom Lendacky <thomas.lendacky@amd.com>
-Signed-off-by: Manali Shukla <manali.shukla@amd.com>
-Link: https://lore.kernel.org/r/20230717041903.85480-1-manali.shukla@amd.com
-Signed-off-by: Sean Christopherson <seanjc@google.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/x86/include/asm/svm.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/x86/include/asm/svm.h b/arch/x86/include/asm/svm.h
-index e7c7379d6ac7b..dee9fa91120bc 100644
---- a/arch/x86/include/asm/svm.h
-+++ b/arch/x86/include/asm/svm.h
-@@ -345,7 +345,7 @@ struct vmcb_save_area {
-       u64 last_excp_from;
-       u64 last_excp_to;
-       u8 reserved_0x298[72];
--      u32 spec_ctrl;          /* Guest version of SPEC_CTRL at 0x2E0 */
-+      u64 spec_ctrl;          /* Guest version of SPEC_CTRL at 0x2E0 */
- } __packed;
- 
- /* Save area definition for SEV-ES and SEV-SNP guests */
-@@ -512,7 +512,7 @@ struct ghcb {
- } __packed;
- 
- 
--#define EXPECTED_VMCB_SAVE_AREA_SIZE          740
-+#define EXPECTED_VMCB_SAVE_AREA_SIZE          744
- #define EXPECTED_GHCB_SAVE_AREA_SIZE          1032
- #define EXPECTED_SEV_ES_SAVE_AREA_SIZE                1648
- #define EXPECTED_VMCB_CONTROL_AREA_SIZE               1024
--- 
-2.40.1
-

diff --git a/queue-6.5/series b/queue-6.5/series
index 9917992ad42e8279d1400c44be81df94cbb06006..f2472c968bd1085e6bc01629d290f6a2c2c0c990 100644 (file)
--- a/queue-6.5/series
+++ b/queue-6.5/series
@@ -88,7 +88,6 @@ perf-vendor-events-move-json-events-to-appropriate-f.patch
 perf-vendor-events-update-metric-event-names-for-pow.patch
 perf-top-don-t-pass-an-err_ptr-directly-to-perf_sess.patch
 perf-lock-don-t-pass-an-err_ptr-directly-to-perf_ses.patch
-kvm-svm-correct-the-size-of-spec_ctrl-field-in-vmcb-.patch
 watchdog-intel-mid_wdt-add-module_alias-to-allow-aut.patch
 perf-vendor-events-arm64-remove-l1d_cache_lmiss-from.patch
 pwm-lpc32xx-remove-handling-of-pwm-channels.patch