From nobody Fri Feb 6 16:29:18 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 4f700b01wcz6RPkK for ; Fri, 06 Feb 2026 16:29:19 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f700Z4wTlz43w7 for ; Fri, 06 Feb 2026 16:29:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770395358; 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=Q+0du1dcDAsurhjQF18mxAhHlMxFQYk0o7dRDsLhKqE=; b=XAdO5XfjF7stPWMohjvfG3BNf85ZOGqUIW2TYl+SrmjxdDpJvIyZwMglRf532hYG4h/8CV xcavN9+15uOqDMzEshzJtTOzrxRtAUG+k3+ZwtYVdwOm0u2FRn29Apit0iB8fYKxSPAUYh 1mPzcwk7H5YPEZfH+T6ABZuH5R8GDa/hn6MIlWYk8AymhxFE9EdohXJY8MArDPaugrHw90 oD1fe6hDkR8IhfNpCIZWaQgL0IVqmUwOMRwue94nZQzKY5aYE6uHD4BlWllMCDqb+cKkbZ XvvLkTp2nWZFSdLTbJQi5LNJ/qPe0cARPZ1Ac3VmXnUYIlAIl9tylpRqcoBXkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770395358; a=rsa-sha256; cv=none; b=FhBVVS7vwGoY/zhnYc/46mGG19c6BxfbOHGcdp/YdUdJ48QfkukX8AKxXFYIahXYNVfGBs CfmMY0WJi+3fyB9prnv7+QS4EioRlYtHNNfP1RvKUC5M6hDRwHtVtRqhNQrAeErlSTd7aE yC+prVjusUo3eKco3uYEP77le22Tv2PmDn/5MSzJmmEo8ov24elWMOdb9Ds7sF6Mn2KSzn P0//NDjyCWxeNZKCeT645YEZeWyhAs2Qn8ghi74zRrFg5CtAX7Js3Dn9mIyAa6wbmloT8x xUEy3c7XWnNm327pqHiDfUOObhQmtgBZxfBSHL6+Vmt5HsYwDiRp0z3mKU4VTg== 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=1770395358; 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=Q+0du1dcDAsurhjQF18mxAhHlMxFQYk0o7dRDsLhKqE=; b=UFzSYJVo9MxPtYRxjDV1JfXiPzAj4/rZ2SDVfdTngVgo3GaKwkdFfmAmF85/ay/irX3oat RHcbdZ4dE3czGQuQoc5LX/gWNVW/Yv3tQKelWfqkqg/kybXQe+41sZVRzQ0M3T/cmGw3zP E9WqRrcqTXL7rudKzxO6mF3fMPGE07MdtZr+0WR3uL6yfrpcIC3F2KxjQMrBxJsFd0GecV BZYNEd/H4ES8u1H9HjH7tJtAfdnSGFBrY3TPqahzF6u/5b1MsdBe9+qJ2TqlfV0KSzKEKe bvtuSgTDugBfjMHvFpLAn+wcOMp6XvaDxqDreIYBqDh1XHYzL1C7l1HFk32n4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f700Z4T1Yz7fg for ; Fri, 06 Feb 2026 16:29:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f285 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 16:29:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: fa0512f7156d - main - hwpstate_amd(4): Assert PSTATE_CPPC is on in corresponding sysctl handlers 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 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: fa0512f7156d1851a7d498d42c32655e390399cf Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 16:29:18 +0000 Message-Id: <698616de.1f285.1b223152@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=fa0512f7156d1851a7d498d42c32655e390399cf commit fa0512f7156d1851a7d498d42c32655e390399cf Author: Olivier Certner AuthorDate: 2026-01-29 10:48:55 +0000 Commit: Olivier Certner CommitDate: 2026-02-06 16:27:32 +0000 hwpstate_amd(4): Assert PSTATE_CPPC is on in corresponding sysctl handlers No functional change intended. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55001 --- sys/x86/cpufreq/hwpstate_amd.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index 9e2d0fcbc8bb..c31bde247aaa 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -202,6 +202,13 @@ static device_method_t hwpstate_methods[] = { {0, 0} }; +static inline void +check_cppc_enabled(const struct hwpstate_softc *const sc, const char *const func) +{ + KASSERT((sc->flags & PSTATE_CPPC) != 0, (HWP_AMD_CLASSNAME + ": %s() called but PSTATE_CPPC not set", func)); +} + struct get_cppc_regs_data { uint64_t enable; uint64_t caps; @@ -270,8 +277,10 @@ sysctl_cppc_dump_handler(SYSCTL_HANDLER_ARGS) int ret; sc = (struct hwpstate_softc *)arg1; - dev = sc->dev; + /* Sysctl knob does not exist if PSTATE_CPPC is not set. */ + check_cppc_enabled(sc, __func__); + dev = sc->dev; pc = cpu_get_pcpu(dev); if (pc == NULL) return (ENXIO); @@ -336,8 +345,8 @@ sysctl_epp_select(SYSCTL_HANDLER_ARGS) dev = oidp->oid_arg1; sc = device_get_softc(dev); - if (!(sc->flags & PSTATE_CPPC)) - return (ENODEV); + /* Sysctl knob does not exist if PSTATE_CPPC is not set. */ + check_cppc_enabled(sc, __func__); val = BITS_VALUE(AMD_CPPC_REQUEST_EPP_BITS, sc->req) * 100 / max_energy_perf;