[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <175551267061.1420.18279444837028370483.tip-bot2@tip-bot2>
Date: Mon, 18 Aug 2025 10:24:30 -0000
From: "tip-bot2 for Tianxiang Peng" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Tianxiang Peng <txpeng@...cent.com>,
"Borislav Petkov (AMD)" <bp@...en8.de>, Hui Li <caelli@...cent.com>,
<stable@...nel.org>, x86@...nel.org, linux-kernel@...r.kernel.org
Subject: [tip: x86/urgent] x86/cpu/hygon: Add missing resctrl_cpu_detect() in
bsp_init helper
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: d8df126349dad855cdfedd6bbf315bad2e901c2f
Gitweb: https://git.kernel.org/tip/d8df126349dad855cdfedd6bbf315bad2e901c2f
Author: Tianxiang Peng <txpeng@...cent.com>
AuthorDate: Mon, 23 Jun 2025 17:31:53 +08:00
Committer: Borislav Petkov (AMD) <bp@...en8.de>
CommitterDate: Mon, 18 Aug 2025 12:09:26 +02:00
x86/cpu/hygon: Add missing resctrl_cpu_detect() in bsp_init helper
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@...cent.com>
Signed-off-by: Borislav Petkov (AMD) <bp@...en8.de>
Reviewed-by: Hui Li <caelli@...cent.com>
Cc: <stable@...nel.org>
Link: https://lore.kernel.org/20250623093153.3016937-1-txpeng@tencent.com
---
arch/x86/kernel/cpu/hygon.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/x86/kernel/cpu/hygon.c b/arch/x86/kernel/cpu/hygon.c
index 2154f12..1fda6c3 100644
--- a/arch/x86/kernel/cpu/hygon.c
+++ b/arch/x86/kernel/cpu/hygon.c
@@ -16,6 +16,7 @@
#include <asm/spec-ctrl.h>
#include <asm/delay.h>
#include <asm/msr.h>
+#include <asm/resctrl.h>
#include "cpu.h"
@@ -117,6 +118,8 @@ static void bsp_init_hygon(struct cpuinfo_x86 *c)
x86_amd_ls_cfg_ssbd_mask = 1ULL << 10;
}
}
+
+ resctrl_cpu_detect(c);
}
static void early_init_hygon(struct cpuinfo_x86 *c)
Powered by blists - more mailing lists