From nobody Fri Jun 26 21:37:46 2026 X-Original-To: dev-commits-src-main@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 4gn8Cv5W6Mz6hyhR for ; Fri, 26 Jun 2026 21:37:47 +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 4gn8Cv16Ggz3fsY for ; Fri, 26 Jun 2026 21:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782509867; 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=7Z77vMw+pVosRObCWhcNgi5RBzXLDqRSct21xEvXlmU=; b=A+cTpsTMX5vVUNMtTstMEPGHzwJo0lXQhBL+Xl0cfCFply0BZHWcRFtoz45dWj1wiEaeSA O1S5O9O6uLlKLKYuSrFJTf+HT1xbOw4NMUou0LKre33KEQL+7vkZ4M++/K69RMgdF7ZoVd LAZiralwx6VF/SXcfG6bXD//SpCfFEiDw/oBCuUGC06Yd9+IYfJerih4rHTSXAxBeIdS+l 09c25BKnizw3NaDhI1/p4tGDXxdpvb4ygmU54H9jtk3yWUNnjCL/4ymIuwVB4hdY6SE6j9 rul8Cxp9da7bJIl7Wo1snpz3g8huizmOYq8XvkLxPyMlEQ06CUUi5mwrawdJlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782509867; a=rsa-sha256; cv=none; b=YT01sWAfSF1Ji8wM42EuFovsGpJZCJFSjaKTvtRvUEMwhGyZTUfuFlG7ajycIEl086M7nQ bDpmLnAeOyzIgh/UXeU1Ha9nbqlqz4Z80MiaCaA51a26H/VrH8w/s+f6UH9r85s2kqblsf wm7eFAfAFf/r2q68uH/SXZ5gYyo/0cxdyhakCBqezHy2OVakrv99UIMaOQY5vNKGrqpoum kcpyzr/mbCmNWHuOzwnOYkmdIwX8h6bCOBbgNX4qmS5oPDYe1df27RwP8ZK/6Fxwo+N3pY zma+/WXLHo+1nC6QdzLwqP5Ufn/s061xo44Q8ElIrgjUTi0bpQax5l+wIOxoCQ== 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=1782509867; 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=7Z77vMw+pVosRObCWhcNgi5RBzXLDqRSct21xEvXlmU=; b=botJBVrWt27gmeL/qKScbWc2xdXL8KCBgo/zCkxgzbyYRiSltPhQLVyVg1Bk6GlbUr9KDT lvkaCNwVLK0E1Ylzy3L+sDsCTJfMOhDo+kTvPfL2J++7nQwAlrHqDJ/Csa2+q81vhmTZAj 6BydBUqDSqs5th0X51pi7R6RXa7hc4zKTIdDIrZZcJtrYqchehcWB7uckUga1M9iuarJC2 ZVXT27XA2AVZWg5n7V+WRer+lmicb5INohr2B1RHjIIVfKhTRr6E1tBxOI/StM24p6vsTC /9l8XeIFfkB0teEz+Yi30gsrWuDHemoC4/CAo++o0tVl3PoLiiV46w8QXL0zSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn8Ct6tjWzwL3 for ; Fri, 26 Jun 2026 21:37:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24062 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 21:37:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 9320b99017d5 - main - hwpstate_intel(4): Debug sysctl: Fix retrieving the pkg-level MSR List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 9320b99017d598cb7295a1bf21f227aaaefcf9df Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 21:37:46 +0000 Message-Id: <6a3ef12a.24062.3739685c@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=9320b99017d598cb7295a1bf21f227aaaefcf9df commit 9320b99017d598cb7295a1bf21f227aaaefcf9df Author: Olivier Certner AuthorDate: 2026-06-26 13:57:38 +0000 Commit: Olivier Certner CommitDate: 2026-06-26 21:36:31 +0000 hwpstate_intel(4): Debug sysctl: Fix retrieving the pkg-level MSR IA32_HWP_REQUEST_PACKAGE_CONTROL is never set in 'sc->req'. Just discriminate on 'hwp_pkg_ctrl', which indicates the hardware capability as indicated by CPUID. Fixes: 29b8220b179b ("hwpstate_intel: Use ipi instead of thread_lock + sched_bind") MFC after: 2 weeks Event: Halifax Hackathon 202606 Location: Dalhousie CS Faculty building Sponsored by: The FreeBSD Foundation --- sys/x86/cpufreq/hwpstate_intel.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_intel.c b/sys/x86/cpufreq/hwpstate_intel.c index d67e83b33af7..71f490a00bdc 100644 --- a/sys/x86/cpufreq/hwpstate_intel.c +++ b/sys/x86/cpufreq/hwpstate_intel.c @@ -167,8 +167,7 @@ get_cppc_regs_cb(void *args) if (rdmsr_safe(MSR_IA32_HWP_REQUEST, &data->request)) data->res |= HWP_ERROR_CPPC_REQUEST; - if (data->sc->hwp_pkg_ctrl && - (data->request & IA32_HWP_REQUEST_PACKAGE_CONTROL)) { + if (data->sc->hwp_pkg_ctrl) { if (rdmsr_safe(MSR_IA32_HWP_REQUEST_PKG, &data->request_pkg)) data->res |= HWP_ERROR_CPPC_REQUEST_PKG; }