From nobody Wed Feb 11 20:44:09 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 4fB9QK6ckTz6SBnX for ; Wed, 11 Feb 2026 20:44:09 +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 4fB9QK3dxBz3Pn6 for ; Wed, 11 Feb 2026 20:44:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770842649; 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=wawx9PRU5nFxmIYfcvZysqZyqtNL98tkIHarX7ppMU0=; b=b+VGcLEDomYVAHLjDr7PcGcSP4AbHzVOdZ19+btdmvuFHOU6XZ/Ys5bfTPBeTFroJp18B2 L9+/Fia6eFlupe7SnFa4dmvGVzHR4w7AiHtk8s88pINz3NXiJXnTOhDgtjZJ5RD9KI/c1k 9Wvbx18HW9BhuO0G5bTCRC7aVuI4OD12U0kUSHpPVbT7sANtnl19XII5FHIBsPjSBtz2ub 6QA+Fokn00ch5/YPcgMSMS/pu+NU9fA45HBTMOJr53aEMQN4HbXAoM753cwpF1Bbt42aaV yF4LShT9XqzmbEIqhr558cz5PB+okVSNWuf6FAI81ve3o35k6sJBYTEIacENAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770842649; a=rsa-sha256; cv=none; b=d1orSkncI0gxEWQK1QI/n3df+LNYg8tvlx4AUPv/jN1NoscbjN7j8ZSaeuOlO6/IXhLvBO SyKv5l5VAjiD/JZkUH7h3q+ZIVBNUq9V7pUDIUuMGzJOoZaw54CfGMkFmg90ARg/UX1W+f gz1NnbaOVtgu/I/6RW+Ke6PHxI1XcEkPzTHCEweeYLp7Za4LJeUfJ7pTHsMCxq31p9+cXG bqYd0ANlNFKjlamxUPCwTrTOfoBPa16k7sm3tD0ms0RCQeWlIyht/mWKaqa/qIPRJfHQEF ywdPlbU2Cf86HD6RoxK4hhpLilDPLuCTJJL92Q+logH58kxXlmntr1TvNcnoOQ== 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=1770842649; 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=wawx9PRU5nFxmIYfcvZysqZyqtNL98tkIHarX7ppMU0=; b=b9D7wyfwMrTL/L8kLgzIUkK+ctrKEJo81XEOOnjVIdQkEPreWTpR3l/ZKYFpcQqsQ9zx0H ukFLfv5pHLJOIMD/uPafqLOXHzKFC1ODFFcRIpeUtKZMQuv4nolYBZXD3pXiV5Qjs/K86i zkciqGTJt3hjxJpXpQe8sEJ/sJ5nNtawIfo8TzZYkfQ1Y24E9iXnjgM2WMhbjzz2m6klTu l5b5x0ZUlDireJGP+/Io4eCciVYdKpx26C81+Z92G0EHQLNwO8eWuSANbkxN4FrX8J/d1Q wHgDrUllTtcp1bjO5XS5ItsIUrupPrEYsT65xa7NUpMHL/q5gqO7p97ax9YSeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB9QK3CG1z14ZV for ; Wed, 11 Feb 2026 20:44:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46972 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 20:44:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: ebcd80f76ed1 - main - hwpstate_amd(4): Rename PSTATE_CPPC internal flag 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: ebcd80f76ed117afa90419e5ac60cd558715f584 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 20:44:09 +0000 Message-Id: <698cea19.46972.64a7c0b4@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=ebcd80f76ed117afa90419e5ac60cd558715f584 commit ebcd80f76ed117afa90419e5ac60cd558715f584 Author: Olivier Certner AuthorDate: 2026-02-09 09:21:28 +0000 Commit: Olivier Certner CommitDate: 2026-02-11 20:43:22 +0000 hwpstate_amd(4): Rename PSTATE_CPPC internal flag While here, also rename check_cppc_enabled() => check_cppc_in_use(). No functional change (intended). Sponsored by: The FreeBSD Foundation --- sys/x86/cpufreq/hwpstate_amd.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index 6901327c9bb5..688b86e1ad35 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -149,9 +149,7 @@ struct hwpstate_setting { int pstate_id; /* P-State id */ }; -enum hwpstate_flags { - PSTATE_CPPC = 1, -}; +#define HWPFL_USE_CPPC (1 << 0) /* * Atomicity is achieved by only modifying a given softc on its associated CPU @@ -223,10 +221,10 @@ static device_method_t hwpstate_methods[] = { }; static inline void -check_cppc_enabled(const struct hwpstate_softc *const sc, const char *const func) +check_cppc_in_use(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)); + KASSERT((sc->flags & HWPFL_USE_CPPC) != 0, (HWP_AMD_CLASSNAME + ": %s() called but HWPFL_USE_CPPC not set", func)); } /* @@ -334,8 +332,8 @@ sysctl_cppc_dump_handler(SYSCTL_HANDLER_ARGS) struct get_cppc_regs_data data; int error; - /* Sysctl knob does not exist if PSTATE_CPPC is not set. */ - check_cppc_enabled(sc, __func__); + /* Sysctl knob does not exist if HWPFL_USE_CPPC is not set. */ + check_cppc_in_use(sc, __func__); sb = sbuf_new_for_sysctl(&sbs, NULL, 0, req); @@ -438,8 +436,8 @@ sysctl_cppc_request_field_handler(SYSCTL_HANDLER_ARGS) u_int val; int error; - /* Sysctl knob does not exist if PSTATE_CPPC is not set. */ - check_cppc_enabled(sc, __func__); + /* Sysctl knob does not exist if HWPFL_USE_CPPC is not set. */ + check_cppc_in_use(sc, __func__); val = BITS_VALUE(arg2, sc->cppc.request); @@ -564,7 +562,7 @@ hwpstate_set(device_t dev, const struct cf_setting *cf) if (cf == NULL) return (EINVAL); sc = device_get_softc(dev); - if (sc->flags & PSTATE_CPPC) + if ((sc->flags & HWPFL_USE_CPPC) != 0) return (EOPNOTSUPP); set = sc->hwpstate_settings; for (i = 0; i < sc->cfnum; i++) @@ -590,7 +588,7 @@ hwpstate_get(device_t dev, struct cf_setting *cf) if (cf == NULL) return (EINVAL); - if (sc->flags & PSTATE_CPPC) { + if ((sc->flags & HWPFL_USE_CPPC) != 0) { pc = cpu_get_pcpu(dev); if (pc == NULL) return (ENXIO); @@ -626,7 +624,7 @@ hwpstate_settings(device_t dev, struct cf_setting *sets, int *count) if (sets == NULL || count == NULL) return (EINVAL); sc = device_get_softc(dev); - if (sc->flags & PSTATE_CPPC) + if ((sc->flags & HWPFL_USE_CPPC) != 0) return (EOPNOTSUPP); if (*count < sc->cfnum) @@ -654,7 +652,7 @@ hwpstate_type(device_t dev, int *type) sc = device_get_softc(dev); *type = CPUFREQ_TYPE_ABSOLUTE; - *type |= sc->flags & PSTATE_CPPC ? + *type |= (sc->flags & HWPFL_USE_CPPC) != 0 ? CPUFREQ_FLAG_INFO_ONLY | CPUFREQ_FLAG_UNCACHED : 0; return (0); @@ -832,7 +830,7 @@ hwpstate_probe(device_t dev) if (hwpstate_amd_cppc_enable && (amd_extended_feature_extensions & AMDFEID_CPPC)) { - sc->flags |= PSTATE_CPPC; + sc->flags |= HWPFL_USE_CPPC; device_set_desc(dev, "AMD Collaborative Processor Performance Control (CPPC)"); } else { @@ -846,7 +844,7 @@ hwpstate_probe(device_t dev) } sc->dev = dev; - if (sc->flags & PSTATE_CPPC) + if ((sc->flags & HWPFL_USE_CPPC) != 0) return (0); /* @@ -909,7 +907,7 @@ hwpstate_attach(device_t dev) int res; sc = device_get_softc(dev); - if ((sc->flags & PSTATE_CPPC) != 0) { + if ((sc->flags & HWPFL_USE_CPPC) != 0) { if ((res = amd_set_autonomous_hwp(sc))) return (res); SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), @@ -1103,7 +1101,7 @@ hwpstate_detach(device_t dev) struct hwpstate_softc *sc; sc = device_get_softc(dev); - if (!(sc->flags & PSTATE_CPPC)) + if ((sc->flags & HWPFL_USE_CPPC) == 0) hwpstate_goto_pstate(dev, 0); return (cpufreq_unregister(dev)); }