6.1-stable patches

added patches:
	x86-cpu-hygon-add-missing-resctrl_cpu_detect-in-bsp_init-helper.patch

diff --git a/queue-6.1/series b/queue-6.1/series
index c06358b298c790d1e999efb20158b6f75cdd8872..95f646f5833570c02b0cd4fbb4b3f3b55d74c3c9 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -449,3 +449,4 @@ tracing-limit-access-to-parser-buffer-when-trace_get_user-failed.patch
 iio-light-as73211-ensure-buffer-holes-are-zeroed.patch
 iio-temperature-maxim_thermocouple-use-dma-safe-buffer-for-spi_read.patch
 compiler-remove-__addressable_asm-_str-again.patch
+x86-cpu-hygon-add-missing-resctrl_cpu_detect-in-bsp_init-helper.patch

diff --git a/queue-6.1/x86-cpu-hygon-add-missing-resctrl_cpu_detect-in-bsp_init-helper.patch b/queue-6.1/x86-cpu-hygon-add-missing-resctrl_cpu_detect-in-bsp_init-helper.patch
new file mode 100644 (file)
index 0000000..dc112c5
--- /dev/null
+++ b/queue-6.1/x86-cpu-hygon-add-missing-resctrl_cpu_detect-in-bsp_init-helper.patch
@@ -0,0 +1,56 @@
+From d8df126349dad855cdfedd6bbf315bad2e901c2f Mon Sep 17 00:00:00 2001
+From: Tianxiang Peng <txpeng@tencent.com>
+Date: Mon, 23 Jun 2025 17:31:53 +0800
+Subject: x86/cpu/hygon: Add missing resctrl_cpu_detect() in bsp_init helper
+
+From: Tianxiang Peng <txpeng@tencent.com>
+
+commit d8df126349dad855cdfedd6bbf315bad2e901c2f upstream.
+
+Since
+
+  923f3a2b48bd ("x86/resctrl: Query LLC monitoring properties once during boot")
+
+resctrl_cpu_detect() has been moved from common CPU initialization code to
+the vendor-specific BSP init helper, while Hygon didn't put that call in their
+code.
+
+This triggers a division by zero fault during early booting stage on our
+machines with X86_FEATURE_CQM* supported, where get_rdt_mon_resources() tries
+to calculate mon_l3_config with uninitialized boot_cpu_data.x86_cache_occ_scale.
+
+Add the missing resctrl_cpu_detect() in the Hygon BSP init helper.
+
+  [ bp: Massage commit message. ]
+
+Fixes: 923f3a2b48bd ("x86/resctrl: Query LLC monitoring properties once during boot")
+Signed-off-by: Tianxiang Peng <txpeng@tencent.com>
+Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
+Reviewed-by: Hui Li <caelli@tencent.com>
+Cc: <stable@kernel.org>
+Link: https://lore.kernel.org/20250623093153.3016937-1-txpeng@tencent.com
+Signed-off-by: Tianxiang Peng <txpeng@tencent.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/x86/kernel/cpu/hygon.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/arch/x86/kernel/cpu/hygon.c
++++ b/arch/x86/kernel/cpu/hygon.c
+@@ -14,6 +14,7 @@
+ #include <asm/cacheinfo.h>
+ #include <asm/spec-ctrl.h>
+ #include <asm/delay.h>
++#include <asm/resctrl.h>
+ 
+ #include "cpu.h"
+ 
+@@ -239,6 +240,8 @@ static void bsp_init_hygon(struct cpuinf
+                       x86_amd_ls_cfg_ssbd_mask = 1ULL << 10;
+               }
+       }
++
++      resctrl_cpu_detect(c);
+ }
+ 
+ static void early_init_hygon(struct cpuinfo_x86 *c)