From 021adef212f3f5a472662bdcfabf07d081310582 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 25 Aug 2025 10:10:03 +0200 Subject: [PATCH] 5.15-stable patches added patches: x86-cpu-hygon-add-missing-resctrl_cpu_detect-in-bsp_init-helper.patch --- queue-5.15/series | 1 + ...esctrl_cpu_detect-in-bsp_init-helper.patch | 56 +++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 queue-5.15/x86-cpu-hygon-add-missing-resctrl_cpu_detect-in-bsp_init-helper.patch diff --git a/queue-5.15/series b/queue-5.15/series index e59c7f6978..9f5562336c 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -616,3 +616,4 @@ tracing-remove-unneeded-goto-out-logic.patch tracing-limit-access-to-parser-buffer-when-trace_get_user-failed.patch iio-light-as73211-ensure-buffer-holes-are-zeroed.patch mm-memory-failure-fix-infinite-uce-for-vm_pfnmap-pfn.patch +x86-cpu-hygon-add-missing-resctrl_cpu_detect-in-bsp_init-helper.patch diff --git a/queue-5.15/x86-cpu-hygon-add-missing-resctrl_cpu_detect-in-bsp_init-helper.patch b/queue-5.15/x86-cpu-hygon-add-missing-resctrl_cpu_detect-in-bsp_init-helper.patch new file mode 100644 index 0000000000..dc112c5a67 --- /dev/null +++ b/queue-5.15/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 +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 + +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 +Signed-off-by: Borislav Petkov (AMD) +Reviewed-by: Hui Li +Cc: +Link: https://lore.kernel.org/20250623093153.3016937-1-txpeng@tencent.com +Signed-off-by: Tianxiang Peng +Signed-off-by: Greg Kroah-Hartman +--- + 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 + #include + #include ++#include + + #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) -- 2.47.3