From nobody Fri Jun 26 13:39:07 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gmxbc0JkPz6jWPG for ; Fri, 26 Jun 2026 13:39:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmxbb2lZNz3NkZ for ; Fri, 26 Jun 2026 13:39:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782481147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NBw7SG0+077XLN29AVCPBQUgFd7OI0M1IhEqDJtGi9A=; b=M4TZkRReO/zgWf2DC0E5lnkToJWEwHP8GZ7NFmbQ6sDCDgXdLdnW9H3eJeAY734UjKah15 z8I0psc1LNT1NzMkxT5//ii1OK7pKicePCwL9CS9nEiVtEWx1xFkWl3uG/HD3AGer1z39O qPXvOwpXtX/NWSqnZjlwB3QDJvQnsZQ4a4shzVNgv7jpuhc5ss66BJMSZlQr8PXSE8eD2o 01EacFNMdgGjLaGqrPHkZ4g6oWvUMxMEM31P8uchUhw7mTAe6BBado0ztKamnH0JnoyQ+E UM5h49awuhWqeUqOvP+2Nu/pJD1AzzdCg0AEry8IPgC9i9IXchFy/g/v3bxj3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782481147; a=rsa-sha256; cv=none; b=f6fJNdnPjJ4ROr17czbDmU8SoBvIj2QodsfUkLefQEfu0QBAvp37EnAt9PJi67KendiWgG wpISMnTy6o1H3KHK2kNDtY0/lpfqZQwKyF0Pnyzg3KnfZxGHOPXrQDl30EDxxv0T4/U8qo OgDpoTxFaKZIRHqX0b//84ARMD5tk4VKNMzgpe4FdvESrpF6DE2iEZuVjYEgxoQ2QywI/v 5QeiB9NBjcphhLWzKiO4jzNl1owBK/Zr0J8i7bU8zv2ttz1XHrtJimadQE3gpC5dt0OkNZ vhPSvExLR4BUtyC6gRwMUR0HQpYDhQzUvCbrox5oH+mRgOrO4kJbfq5oN3Ahcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782481147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NBw7SG0+077XLN29AVCPBQUgFd7OI0M1IhEqDJtGi9A=; b=MfeR1WEspfceZsVqa8t3DEe9GqOvBOLDsg1NSFiBuNVAP3jOb92OIMXIfdWT6VgLqFWxDP ewKUpcb7JTkDyyb1OgQhfIOQjhmZumGBiyfIZh2F3VE7YuZIc8OFVKMNOkjqaLp7+xMJwO J98rDNPKQp5UiE/5n6GPVEHCHj/l2ojAinGwQ+2Hm05JMY+/cZ2xBAlTYz/s8GBvBAlFJa 1+z/FMFUFQuXTHHJFhhQfd5Q3h2dtyof2GvvJkilQncHEmpWjZczpH2Rm30RB5uaa36fbG aQ3sxgxT/ZTQaoRshOV4EYpthR+Ftko+wS9TkgWB7vyusATU+FRboxneC7/2hw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmxbb1YD2zg2m for ; Fri, 26 Jun 2026 13:39:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 465c9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 13:39:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: c0acab934a17 - main - hwpstate_intel(4): Fix two MSR errors being conflated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0acab934a174761b4f0e94c263bbe90c0529fab Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 13:39:07 +0000 Message-Id: <6a3e80fb.465c9.342e779d@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=c0acab934a174761b4f0e94c263bbe90c0529fab commit c0acab934a174761b4f0e94c263bbe90c0529fab Author: Olivier Certner AuthorDate: 2026-06-25 14:35:32 +0000 Commit: Olivier Certner 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)