Date: Fri, 06 Feb 2026 16:29:17 +0000 From: Olivier Certner <olce@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: e938d57e0a88 - main - hwpstate_amd(4): Rename register dump sysctl handler Message-ID: <698616dd.1ea20.255757f8@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=e938d57e0a8852e956a16dd4fc041047fd1b2c35 commit e938d57e0a8852e956a16dd4fc041047fd1b2c35 Author: Olivier Certner <olce@FreeBSD.org> AuthorDate: 2026-01-29 10:43:53 +0000 Commit: Olivier Certner <olce@FreeBSD.org> 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,home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?698616dd.1ea20.255757f8>