From nobody Fri Feb 6 16:29:17 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 4f700Y69Xfz6RPxg for ; Fri, 06 Feb 2026 16:29:17 +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 4f700Y4D7Qz43sQ for ; Fri, 06 Feb 2026 16:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770395357; 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=lwXkydNfCsz10RJ3L8ZGxgpOrYKHnqbgExEPHgRQV18=; b=u5f+1Tk0hISKRkjY+e9o+cOq4D+puz839Dbjx6SUG7YyUzq2VH4u97PPrXm8mAlPXWoO1i Lixixz11oypTAWPieMVre2hrtVpYJ2eusCeNNCfASIccArBaD7itKWzZyyL8CyYkgi9leH wWIp2+DQusJcMm6rRo7DxbOpMfbpY1Jfsu2LzUnrWj5fhWf0ODMSJvWhbMGAieqzlLrUnn g709g/1K2XeFw888fWDgqS6sRNpQJwxLUSwjOqT5hdv77/sVqtE/9h+dxoe3EhkHdl0aB+ FD6vjJPAlOHoR8Ss46XbcVjQ9cX2iIu/ka7s31jFRyMh7yZeXj4w3F2qoiNIuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770395357; a=rsa-sha256; cv=none; b=xm3Ifob9QjtXP4tCoNBpLxIL4MEohrZfbmhwFIL04qJCLEkihrj2Xzb+dCeYhPlQsgsAWc y4A5GQvNsDDzhlFr71NvOy3MN8rs78Pvt4z/+rVAh/aSmxrHYHYkA7aadWFvEqxEqrn7Fm 80qz96PGx27N0lglT6DB74/xOHZVSHk1MdjuAT95rPdQIvgAQX+UOz61lV26a5cZOvKmYK sYmK5pftDSOI0TZCSqb3VIIwF23FWX7ytguULB3wTLxc/NhL1jz/X+ap31k9Rdq0PFlLe9 FMMjdiqrWgIXRYn2ih/dqhrTX/gY/JVpy27byw54IFBs9DLYNwG0MXDBwrh99Q== 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=1770395357; 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=lwXkydNfCsz10RJ3L8ZGxgpOrYKHnqbgExEPHgRQV18=; b=iPniyP3901ZzwUXVaTEtDP2IqPAQZgMrU0jDhPhv1/LYChCjxCVqDcNTbLw1BPxjQPFKCI oR4ozwHsrIsPpJfbh47XL4kpoOW1jsPBSAkHZ9jvHTKsw2qvJVgCazMq3WX9wiAlgek45g /OgVaYWcVCvF64dgubMGLW74/KZl424L/Wyb/SB00GJxR7JVFyLbdjwTkAjvpaDU+/wArX P0OvI6wE8Ch+rF5Xsv9Y0T1RnQVqSSz2pp8si5LgnVbU69a/APiyzINIFvYdET8CfTNAsq eUpcnp4AKnmUqdIElbapz2yCIK4e3dpDmdIZjpx8fG1nor6sLCzR1DTRheX4UQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f700Y3d4fz7ZG for ; Fri, 06 Feb 2026 16:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ea20 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 16:29:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: e938d57e0a88 - main - hwpstate_amd(4): Rename register dump sysctl handler 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: e938d57e0a8852e956a16dd4fc041047fd1b2c35 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 16:29:17 +0000 Message-Id: <698616dd.1ea20.255757f8@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=e938d57e0a8852e956a16dd4fc041047fd1b2c35 commit e938d57e0a8852e956a16dd4fc041047fd1b2c35 Author: Olivier Certner AuthorDate: 2026-01-29 10:43:53 +0000 Commit: Olivier Certner CommitDate: 2026-02-06 16:27:31 +0000 hwpstate_amd(4): Rename register dump sysctl handler While here, rename the callback function and structure to a more immediately informative name. While here, remove a superfluous cast and rename the variable containing the callback data to just 'data' instead of 'req' which can be confusing (because of CPPC_REQUEST but also the fact that 'req' is a parameter of sysctl handlers). No functional change intended. Reviewed by: aokblast Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55000 --- sys/x86/cpufreq/hwpstate_amd.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index aaaaa394058f..9e2d0fcbc8bb 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -202,7 +202,7 @@ static device_method_t hwpstate_methods[] = { {0, 0} }; -struct amdhwp_dump_sysctl_handler_request { +struct get_cppc_regs_data { uint64_t enable; uint64_t caps; uint64_t req; @@ -247,26 +247,25 @@ print_cppc_request(struct sbuf *const sb, const uint64_t request) } static void -amdhwp_dump_sysctl_handler_cb(void *args) +get_cppc_regs_cb(void *args) { - struct amdhwp_dump_sysctl_handler_request *req = - (struct amdhwp_dump_sysctl_handler_request *)args; - - req->res = rdmsr_safe(MSR_AMD_CPPC_ENABLE, &req->enable); - if (req->res == 0) - req->res = rdmsr_safe(MSR_AMD_CPPC_CAPS_1, &req->caps); - if (req->res == 0) - req->res = rdmsr_safe(MSR_AMD_CPPC_REQUEST, &req->req); + struct get_cppc_regs_data *data = args; + + data->res = rdmsr_safe(MSR_AMD_CPPC_ENABLE, &data->enable); + if (data->res == 0) + data->res = rdmsr_safe(MSR_AMD_CPPC_CAPS_1, &data->caps); + if (data->res == 0) + data->res = rdmsr_safe(MSR_AMD_CPPC_REQUEST, &data->req); } static int -amdhwp_dump_sysctl_handler(SYSCTL_HANDLER_ARGS) +sysctl_cppc_dump_handler(SYSCTL_HANDLER_ARGS) { device_t dev; struct pcpu *pc; struct sbuf *sb; struct hwpstate_softc *sc; - struct amdhwp_dump_sysctl_handler_request request; + struct get_cppc_regs_data request; uint64_t data; int ret; @@ -280,7 +279,7 @@ amdhwp_dump_sysctl_handler(SYSCTL_HANDLER_ARGS) sb = sbuf_new(NULL, NULL, 1024, SBUF_FIXEDLEN | SBUF_INCLUDENUL); sbuf_putc(sb, '\n'); smp_rendezvous_cpu(pc->pc_cpuid, smp_no_rendezvous_barrier, - amdhwp_dump_sysctl_handler_cb, smp_no_rendezvous_barrier, &request); + get_cppc_regs_cb, smp_no_rendezvous_barrier, &request); ret = request.res; if (ret) goto out; @@ -774,7 +773,7 @@ hwpstate_attach(device_t dev) SYSCTL_STATIC_CHILDREN(_debug), OID_AUTO, device_get_nameunit(dev), CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_SKIP | CTLFLAG_MPSAFE, - sc, 0, amdhwp_dump_sysctl_handler, "A", ""); + sc, 0, sysctl_cppc_dump_handler, "A", ""); SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO,