From nobody Fri Feb 6 16:29:19 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 4f700c0hsDz6RPSH for ; Fri, 06 Feb 2026 16:29:20 +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 4f700b5fz1z43sl for ; Fri, 06 Feb 2026 16:29:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770395359; 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=GKL8l3LFqti2svgZiqTTixjFz7u2JgYWV7J4Rx7oGLQ=; b=SiM3GEtSHMB7LRxZXVanBh4ekviXzVZbhT8GTlBLITjTdtgVRI6bctvI62lfnZP5pJv81A qTGZW7DLAsDh4qHMDfIbXiiJEDmmhAEYOodFFpHb+ljzXR7n36YDd5gk6YsVIIqGnBsJ3i hc4+GzYWdBMmdLc9Pde9HW8ubfs0hGpBjQIpVLTGMcETs9QAMeGRYemndnflS+I4mpz5zg LX/y7kQrgc6LGPy/jae7LVrCDP3/qGrs2zGbvPRCtDupm4A95+kgCoTwT6GJ5dGwtyZLBi yeNfuLj5VLjBlqSN0kdC/2d8ZZDMpA+pKs5rki4BEJ23liVxezf+iKU0H98PRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770395359; a=rsa-sha256; cv=none; b=fgEs/tLhMD0Nr3ZW1LuHQcN+2xmjdsGVrCXevDkq0AXGisPwDoXk48t/mGmjznqFlFMk+J xJVuYYZGaVfRqUDPblxHiwA4I6Elzesa67RBOjLu1/85Mw9ya2GVB/KDMCg2LByWRE05ac nXIH5ixqpyqceTpQKQCiRoTMkyas24Hei37vfsAfdAmP4DoiE3RLLhqfCT58Ff/qACLUis +O/mOPyjuIG/mRKmfOfIQsFIrzlcCZ9A+jZ1jVYbwBfsbPQ7FIL6I8FG+tIfiBHTteTs3R kKHyppXUS7o/58ocEWNsnIFONwuGnAJQSSKI6nTRTTq2ROw4tZ89J+O5C3gmhw== 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=1770395359; 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=GKL8l3LFqti2svgZiqTTixjFz7u2JgYWV7J4Rx7oGLQ=; b=hoXmHLfDy49JE8KdUfyJ9oud4IPcXD2Z8tMp1ywbvJAfAizGO9ULdPdOdfK630JeF7JgRF sfc5A5ZoK379XWVIavQFEMBGZVMb6iYAnjY0BcrYrwgqKABfm1hCZwNscvU5BDmdoKtVGN ejakHpSiwlQTpBIVwjgDaDCs1ujdzJAKZVEoGMj9x321ykY7qW2IpHKHOHOi4fNYmi58An hxilcGUOD+55fe7KVBp3Lljk5fKFtfqc6M1bOXPqPX3XejTlHisvAcdK9YglMU9sVTHih4 myD55tpd7XDVruoMLGZWnx1vvFORKCvW7IxYppetGzhM13f/F79KVPfz7UhXwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f700b55M7z7fh for ; Fri, 06 Feb 2026 16:29:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e8c0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 16:29:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 461bac05a145 - main - hwpstate_amd(4): Rename EPP handler, convert to unsigned int 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: 461bac05a1454e8a1656cc35f1308cbd6b374f51 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 16:29:19 +0000 Message-Id: <698616df.1e8c0.10f4dd35@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=461bac05a1454e8a1656cc35f1308cbd6b374f51 commit 461bac05a1454e8a1656cc35f1308cbd6b374f51 Author: Olivier Certner AuthorDate: 2026-01-29 14:06:08 +0000 Commit: Olivier Certner CommitDate: 2026-02-06 16:27:32 +0000 hwpstate_amd(4): Rename EPP handler, convert to unsigned int 'val' is supposed to be the storage for a sysctl knob of an 'unsigned int', so consistently don't specify its width. While here, rename variables in the handler. The new names feel clearer, and the 'ret' => 'error' rename is to be more in line with our tradition. No functional change intended. Reviewed by: aokblast Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55002 --- sys/x86/cpufreq/hwpstate_amd.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index c31bde247aaa..d0eccf0d3eaa 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -316,7 +316,7 @@ out: } static void -sysctl_epp_select_per_core(device_t hwp_device, uint32_t val) +set_epp(device_t hwp_device, u_int val) { struct hwpstate_softc *sc; @@ -331,15 +331,15 @@ sysctl_epp_select_per_core(device_t hwp_device, uint32_t val) } static int -sysctl_epp_select(SYSCTL_HANDLER_ARGS) +sysctl_epp_handler(SYSCTL_HANDLER_ARGS) { device_t dev, hwp_dev; devclass_t dc; struct hwpstate_softc *sc; - const uint32_t max_energy_perf = + const u_int max_epp = BITS_VALUE(AMD_CPPC_REQUEST_EPP_BITS, (uint64_t)-1); - uint32_t val; - int ret = 0; + u_int val; + int error = 0; int cpu; dev = oidp->oid_arg1; @@ -349,29 +349,27 @@ sysctl_epp_select(SYSCTL_HANDLER_ARGS) check_cppc_enabled(sc, __func__); val = BITS_VALUE(AMD_CPPC_REQUEST_EPP_BITS, sc->req) * 100 / - max_energy_perf; - ret = sysctl_handle_int(oidp, &val, 0, req); - if (ret != 0 || req->newptr == NULL) + max_epp; + error = sysctl_handle_int(oidp, &val, 0, req); + if (error != 0 || req->newptr == NULL) goto end; if (val > 100) { - ret = EINVAL; + error = EINVAL; goto end; } - val = (val * max_energy_perf) / 100; + val = (val * max_epp) / 100; if (hwpstate_pkg_ctrl_enable) { dc = devclass_find(HWP_AMD_CLASSNAME); - KASSERT(dc != NULL, - (HWP_AMD_CLASSNAME ": devclass cannot be null")); CPU_FOREACH(cpu) { hwp_dev = devclass_get_device(dc, cpu); - sysctl_epp_select_per_core(hwp_dev, val); + set_epp(hwp_dev, val); } } else - sysctl_epp_select_per_core(dev, val); + set_epp(dev, val); end: - return (ret); + return (error); } static driver_t hwpstate_driver = { @@ -786,8 +784,8 @@ hwpstate_attach(device_t dev) SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, - "epp", CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, dev, 0, - sysctl_epp_select, "I", + "epp", CTLTYPE_UINT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, dev, 0, + sysctl_epp_handler, "IU", "Efficiency/Performance Preference " "(range from 0, most performant, through 100, most efficient)"); }