Skip to content

Commit ab977b6

Browse files
Tianxiang Penglanlanxiyiji
authored andcommitted
x86/cpu/hygon: Add missing resctrl_cpu_detect() in bsp_init helper
commit d8df126 upstream. Since 923f3a2 ("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: 923f3a2 ("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> (cherry picked from commit 7207923d8453ebfb35667c1736169f2dd796772e) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
1 parent 4691be7 commit ab977b6

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

arch/x86/kernel/cpu/hygon.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include <asm/page.h>
1919
#include <linux/module.h>
2020
#include <linux/init.h>
21+
#include <asm/resctrl.h>
2122

2223
#include "cpu.h"
2324

@@ -246,6 +247,8 @@ static void bsp_init_hygon(struct cpuinfo_x86 *c)
246247
x86_amd_ls_cfg_ssbd_mask = 1ULL << 10;
247248
}
248249
}
250+
251+
resctrl_cpu_detect(c);
249252
}
250253

251254
static void init_hygon_cap(struct cpuinfo_x86 *c)

0 commit comments

Comments
 (0)