From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 25 Aug 2025 08:10:31 +0000 (+0200)
Subject: 6.12-stable patches
X-Git-Tag: v5.4.297~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd08a27cbeb85b73c9575214c3b53fe98540f4c4;p=thirdparty%2Fkernel%2Fstable-queue.git

6.12-stable patches

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

diff --git a/queue-6.12/series b/queue-6.12/series
index 364cb6b81a..81be94795b 100644
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -248,3 +248,4 @@ iio-imu-inv_icm42600-switch-timestamp-type-from-int64_t-__aligned-8-to-aligned_s
 iio-imu-inv_icm42600-use-instead-of-memset.patch
 iio-imu-inv_icm42600-convert-to-uxx-and-sxx-integer-types.patch
 iio-imu-inv_icm42600-change-invalid-data-error-to-ebusy.patch
+x86-cpu-hygon-add-missing-resctrl_cpu_detect-in-bsp_init-helper.patch
diff --git a/queue-6.12/x86-cpu-hygon-add-missing-resctrl_cpu_detect-in-bsp_init-helper.patch b/queue-6.12/x86-cpu-hygon-add-missing-resctrl_cpu_detect-in-bsp_init-helper.patch
new file mode 100644
index 0000000000..13e50415b3
--- /dev/null
+++ b/queue-6.12/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
+@@ -15,6 +15,7 @@
+ #include <asm/cacheinfo.h>
+ #include <asm/spec-ctrl.h>
+ #include <asm/delay.h>
++#include <asm/resctrl.h>
+ 
+ #include "cpu.h"
+ 
+@@ -116,6 +117,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)