]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop x86 patch that is already applied
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Jul 2025 14:07:04 +0000 (16:07 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Jul 2025 14:07:04 +0000 (16:07 +0200)
queue-5.15/series
queue-5.15/x86-cpu-amd-properly-check-the-tsa-microcode.patch [deleted file]
queue-6.1/series
queue-6.1/x86-cpu-amd-properly-check-the-tsa-microcode.patch [deleted file]
queue-6.12/series
queue-6.12/x86-cpu-amd-properly-check-the-tsa-microcode.patch [deleted file]
queue-6.6/series
queue-6.6/x86-cpu-amd-properly-check-the-tsa-microcode.patch [deleted file]

index 826a1454fe3406ebfa34d03841e71e7ae8d6023a..12323c78a67f79ca12b0125f87f5b9359a70a679 100644 (file)
@@ -14,7 +14,6 @@ atm-clip-fix-memory-leak-of-struct-clip_vcc.patch
 atm-clip-fix-infinite-recursive-call-of-clip_push.patch
 atm-clip-fix-null-pointer-dereference-in-vcc_sendmsg.patch
 net-sched-abort-__tc_modify_qdisc-if-parent-class-do.patch
-x86-cpu-amd-properly-check-the-tsa-microcode.patch
 fs-proc-do_task_stat-use-__for_each_thread.patch
 ice-safer-stats-processing.patch
 rxrpc-fix-oops-due-to-non-existence-of-prealloc-backlog-struct.patch
diff --git a/queue-5.15/x86-cpu-amd-properly-check-the-tsa-microcode.patch b/queue-5.15/x86-cpu-amd-properly-check-the-tsa-microcode.patch
deleted file mode 100644 (file)
index 1591a54..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-From bp@alien8.de  Sat Jul 12 14:03:30 2025
-From: Borislav Petkov <bp@alien8.de>
-Date: Fri, 11 Jul 2025 21:45:58 +0200
-Subject: x86/CPU/AMD: Properly check the TSA microcode
-To: stable@vger.kernel.org
-Cc: Thomas Voegtle <tv@lio96.de>, kim.phillips@amd.com
-Message-ID: <20250711194558.GLaHFp9kw1s5dSmBUa@fat_crate.local>
-Content-Disposition: inline
-
-From: "Borislav Petkov (AMD)" <bp@alien8.de>
-
-In order to simplify backports, I resorted to an older version of the
-microcode revision checking which didn't pull in the whole struct
-x86_cpu_id matching machinery.
-
-My simpler method, however, forgot to add the extended CPU model to the
-patch revision, which lead to mismatches when determining whether TSA
-mitigation support is present.
-
-So add that forgotten extended model.
-
-Also, fix a backport mismerge which put tsa_init() where it doesn't
-belong.
-
-This is a stable-only fix and the preference is to do it this way
-because it is a lot simpler. Also, the Fixes: tag below points to the
-respective stable patch.
-
-Fixes: 90293047df18 ("x86/bugs: Add a Transient Scheduler Attacks mitigation")
-Reported-by: Thomas Voegtle <tv@lio96.de>
-Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
-Tested-by: Thomas Voegtle <tv@lio96.de>
-Message-ID: <04ea0a8e-edb0-c59e-ce21-5f3d5d167af3@lio96.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/x86/kernel/cpu/amd.c |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
---- a/arch/x86/kernel/cpu/amd.c
-+++ b/arch/x86/kernel/cpu/amd.c
-@@ -590,6 +590,7 @@ static bool amd_check_tsa_microcode(void
-       p.ext_fam       = c->x86 - 0xf;
-       p.model         = c->x86_model;
-+      p.ext_model     = c->x86_model >> 4;
-       p.stepping      = c->x86_stepping;
-       if (c->x86 == 0x19) {
-@@ -704,6 +705,8 @@ static void bsp_init_amd(struct cpuinfo_
-       }
-       resctrl_cpu_detect(c);
-+
-+      tsa_init(c);
- }
- static void early_detect_mem_encrypt(struct cpuinfo_x86 *c)
-@@ -743,8 +746,6 @@ static void early_detect_mem_encrypt(str
-                       goto clear_sev;
--      tsa_init(c);
--
-               return;
- clear_all:
index ab3351dbeacec736005410de43dd4f673a5980fd..92cd62f2a31a8b01a98e6a8698311e05fccef2df 100644 (file)
@@ -16,7 +16,6 @@ atm-clip-fix-memory-leak-of-struct-clip_vcc.patch
 atm-clip-fix-infinite-recursive-call-of-clip_push.patch
 atm-clip-fix-null-pointer-dereference-in-vcc_sendmsg.patch
 net-sched-abort-__tc_modify_qdisc-if-parent-class-do.patch
-x86-cpu-amd-properly-check-the-tsa-microcode.patch
 maple_tree-fix-ma_state_prealloc-flag-in-mas_preallocate.patch
 rxrpc-fix-oops-due-to-non-existence-of-prealloc-backlog-struct.patch
 x86-boot-compile-boot-code-with-std-gnu11-too.patch
diff --git a/queue-6.1/x86-cpu-amd-properly-check-the-tsa-microcode.patch b/queue-6.1/x86-cpu-amd-properly-check-the-tsa-microcode.patch
deleted file mode 100644 (file)
index a97099e..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-From bp@alien8.de  Sat Jul 12 14:03:07 2025
-From: Borislav Petkov <bp@alien8.de>
-Date: Fri, 11 Jul 2025 21:30:39 +0200
-Subject: x86/CPU/AMD: Properly check the TSA microcode
-To: stable@vger.kernel.org
-Cc: Thomas Voegtle <tv@lio96.de>, kim.phillips@amd.com
-Message-ID: <20250711193039.GKaHFmX8215MRwSR_z@fat_crate.local>
-Content-Disposition: inline
-
-From: "Borislav Petkov (AMD)" <bp@alien8.de>
-
-In order to simplify backports, I resorted to an older version of the
-microcode revision checking which didn't pull in the whole struct
-x86_cpu_id matching machinery.
-
-My simpler method, however, forgot to add the extended CPU model to the
-patch revision, which lead to mismatches when determining whether TSA
-mitigation support is present.
-
-So add that forgotten extended model.
-
-Also, fix a backport mismerge which put tsa_init() where it doesn't
-belong.
-
-This is a stable-only fix and the preference is to do it this way
-because it is a lot simpler. Also, the Fixes: tag below points to the
-respective stable patch.
-
-Fixes: 90293047df18 ("x86/bugs: Add a Transient Scheduler Attacks mitigation")
-Reported-by: Thomas Voegtle <tv@lio96.de>
-Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
-Message-ID: <04ea0a8e-edb0-c59e-ce21-5f3d5d167af3@lio96.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/x86/kernel/cpu/amd.c |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
---- a/arch/x86/kernel/cpu/amd.c
-+++ b/arch/x86/kernel/cpu/amd.c
-@@ -561,6 +561,7 @@ static bool amd_check_tsa_microcode(void
-       p.ext_fam       = c->x86 - 0xf;
-       p.model         = c->x86_model;
-+      p.ext_model     = c->x86_model >> 4;
-       p.stepping      = c->x86_stepping;
-       if (c->x86 == 0x19) {
-@@ -675,6 +676,8 @@ static void bsp_init_amd(struct cpuinfo_
-       }
-       resctrl_cpu_detect(c);
-+
-+      tsa_init(c);
- }
- static void early_detect_mem_encrypt(struct cpuinfo_x86 *c)
-@@ -719,8 +722,6 @@ static void early_detect_mem_encrypt(str
-                       goto clear_sev;
--      tsa_init(c);
--
-               return;
- clear_all:
index f60ca9cc0f47808916295d9316215e32c158ce2d..90e15fcf1e63020951d47602139840cafde4ae67 100644 (file)
@@ -1,6 +1,5 @@
 eventpoll-don-t-decrement-ep-refcount-while-still-holding-the-ep-mutex.patch
 drm-exynos-exynos7_drm_decon-add-vblank-check-in-irq-handling.patch
-x86-cpu-amd-properly-check-the-tsa-microcode.patch
 drm-amdgpu-discovery-use-specific-ip_discovery.bin-for-legacy-asics.patch
 drm-amdgpu-ip_discovery-add-missing-ip_discovery-fw.patch
 crypto-s390-sha-fix-uninitialized-variable-in-sha-1-and-sha-2.patch
diff --git a/queue-6.12/x86-cpu-amd-properly-check-the-tsa-microcode.patch b/queue-6.12/x86-cpu-amd-properly-check-the-tsa-microcode.patch
deleted file mode 100644 (file)
index 36db3e8..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-From bp@alien8.de  Sat Jul 12 14:01:48 2025
-From: Borislav Petkov <bp@alien8.de>
-Date: Fri, 11 Jul 2025 21:18:44 +0200
-Subject: x86/CPU/AMD: Properly check the TSA microcode
-To: stable@vger.kernel.org
-Cc: Thomas Voegtle <tv@lio96.de>, kim.phillips@amd.com
-Message-ID: <20250711191844.GIaHFjlJiQi_HxyyWG@fat_crate.local>
-Content-Disposition: inline
-
-From: "Borislav Petkov (AMD)" <bp@alien8.de>
-
-In order to simplify backports, I resorted to an older version of the
-microcode revision checking which didn't pull in the whole struct
-x86_cpu_id matching machinery.
-
-My simpler method, however, forgot to add the extended CPU model to the
-patch revision, which lead to mismatches when determining whether TSA
-mitigation support is present.
-
-So add that forgotten extended model.
-
-This is a stable-only fix and the preference is to do it this way
-because it is a lot simpler. Also, the Fixes: tag below points to the
-respective stable patch.
-
-Fixes: 7a0395f6607a ("x86/bugs: Add a Transient Scheduler Attacks mitigation")
-Reported-by: Thomas Voegtle <tv@lio96.de>
-Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
-Tested-by: Thomas Voegtle <tv@lio96.de>
-Message-ID: <04ea0a8e-edb0-c59e-ce21-5f3d5d167af3@lio96.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/x86/kernel/cpu/amd.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/arch/x86/kernel/cpu/amd.c
-+++ b/arch/x86/kernel/cpu/amd.c
-@@ -376,6 +376,7 @@ static bool amd_check_tsa_microcode(void
-       p.ext_fam       = c->x86 - 0xf;
-       p.model         = c->x86_model;
-+      p.ext_model     = c->x86_model >> 4;
-       p.stepping      = c->x86_stepping;
-       if (cpu_has(c, X86_FEATURE_ZEN3) ||
index ea254d3f0df9da2e08fc26c736f541c56db18ab9..056f0d6284903b4a23b530ecbf81251d63954e13 100644 (file)
@@ -25,7 +25,6 @@ atm-clip-fix-infinite-recursive-call-of-clip_push.patch
 atm-clip-fix-null-pointer-dereference-in-vcc_sendmsg.patch
 net-sched-abort-__tc_modify_qdisc-if-parent-class-do.patch
 rxrpc-fix-bug-due-to-prealloc-collision.patch
-x86-cpu-amd-properly-check-the-tsa-microcode.patch
 maple_tree-fix-ma_state_prealloc-flag-in-mas_preallocate.patch
 perf-build-setup-pkg_config_libdir-for-cross-compilation.patch
 bluetooth-hci-set-extended-advertising-data-synchronously.patch
diff --git a/queue-6.6/x86-cpu-amd-properly-check-the-tsa-microcode.patch b/queue-6.6/x86-cpu-amd-properly-check-the-tsa-microcode.patch
deleted file mode 100644 (file)
index b036cfc..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-From bp@alien8.de  Sat Jul 12 14:02:17 2025
-From: Borislav Petkov <bp@alien8.de>
-Date: Fri, 11 Jul 2025 21:23:58 +0200
-Subject: x86/CPU/AMD: Properly check the TSA microcode
-To: stable@vger.kernel.org
-Cc: Thomas Voegtle <tv@lio96.de>, kim.phillips@amd.com
-Message-ID: <20250711192358.GJaHFkzpM1GPcNQz6v@fat_crate.local>
-Content-Disposition: inline
-
-
-From: "Borislav Petkov (AMD)" <bp@alien8.de>
-
-In order to simplify backports, I resorted to an older version of the
-microcode revision checking which didn't pull in the whole struct
-x86_cpu_id matching machinery.
-
-My simpler method, however, forgot to add the extended CPU model to the
-patch revision, which lead to mismatches when determining whether TSA
-mitigation support is present.
-
-So add that forgotten extended model.
-
-This is a stable-only fix and the preference is to do it this way
-because it is a lot simpler. Also, the Fixes: tag below points to the
-respective stable patch.
-
-Fixes: 90293047df18 ("x86/bugs: Add a Transient Scheduler Attacks mitigation")
-Reported-by: Thomas Voegtle <tv@lio96.de>
-Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
-Tested-by: Thomas Voegtle <tv@lio96.de>
-Message-ID: <04ea0a8e-edb0-c59e-ce21-5f3d5d167af3@lio96.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/x86/kernel/cpu/amd.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/arch/x86/kernel/cpu/amd.c
-+++ b/arch/x86/kernel/cpu/amd.c
-@@ -547,6 +547,7 @@ static bool amd_check_tsa_microcode(void
-       p.ext_fam       = c->x86 - 0xf;
-       p.model         = c->x86_model;
-+      p.ext_model     = c->x86_model >> 4;
-       p.stepping      = c->x86_stepping;
-       if (cpu_has(c, X86_FEATURE_ZEN3) ||