Date: Fri, 26 Jun 2026 13:39:07 +0000 From: Olivier Certner <olce@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: c0acab934a17 - main - hwpstate_intel(4): Fix two MSR errors being conflated Message-ID: <6a3e80fb.465c9.342e779d@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=c0acab934a174761b4f0e94c263bbe90c0529fab commit c0acab934a174761b4f0e94c263bbe90c0529fab Author: Olivier Certner <olce@FreeBSD.org> AuthorDate: 2026-06-25 14:35:32 +0000 Commit: Olivier Certner <olce@FreeBSD.org> CommitDate: 2026-06-26 13:37:51 +0000 hwpstate_intel(4): Fix two MSR errors being conflated HWP_ERROR_CPPC_REQUEST_WRITE and HWP_ERROR_CPPC_REQUEST_PKG had been assigned the same number. Fixes: 29b8220b179b ("hwpstate_intel: Use ipi instead of thread_lock + sched_bind") Event: Halifax Hackathon 202606 Location: jrm@'s living room Sponsored by: The FreeBSD Foundation --- sys/x86/cpufreq/hwpstate_intel.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_intel.c b/sys/x86/cpufreq/hwpstate_intel.c index 844bebfc7274..3ee97772e122 100644 --- a/sys/x86/cpufreq/hwpstate_intel.c +++ b/sys/x86/cpufreq/hwpstate_intel.c @@ -128,12 +128,12 @@ MODULE_VERSION(hwpstate_intel, 1); /* * Internal errors conveyed by code executing on another CPU. */ -#define HWP_ERROR_CPPC_ENABLE (1 << 0) -#define HWP_ERROR_CPPC_CAPS (1 << 1) -#define HWP_ERROR_CPPC_REQUEST (1 << 2) -#define HWP_ERROR_CPPC_REQUEST_WRITE (1 << 3) -#define HWP_ERROR_CPPC_REQUEST_PKG (1 << 3) -#define HWP_ERROR_CPPC_EPP_WRITE (1 << 4) +#define HWP_ERROR_CPPC_ENABLE (1 << 0) +#define HWP_ERROR_CPPC_CAPS (1 << 1) +#define HWP_ERROR_CPPC_REQUEST (1 << 2) +#define HWP_ERROR_CPPC_REQUEST_WRITE (1 << 3) +#define HWP_ERROR_CPPC_REQUEST_PKG (1 << 4) +#define HWP_ERROR_CPPC_EPP_WRITE (1 << 5) static inline bool hwp_has_error(u_int res, u_int err)home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a3e80fb.465c9.342e779d>