From nobody Fri Jun 26 21:37:45 2026 X-Original-To: dev-commits-src-all@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 4gn8Cz6Tsxz6hyqp for ; Fri, 26 Jun 2026 21:37:51 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn8Cz1nmBz3fsj for ; Fri, 26 Jun 2026 21:37:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782509871; 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=dSc+A4HzMA/RiDIgfNrIviBE8nUE3NPzr7l2uvM/Cwg=; b=h8VdozA9qO3lE0VZT3NM7XqdZ71JcEPCA7532T4XFDQpnFfX4lVePnhaitXFAn+/Iz1pMt ElqNkg+yrQn81LUco624bs/3o1apJFnuVOMbh5a8kCG7/YFhJCBT4BVVOsWjtTpgCmaiYy hjlbaZ6KZd7z3Ku3q9hEwEy9Mm4lzWc1TFylfgUyUnm+If3plbmPDzE9WItU7JNL3DevaM 5Y/hMn1rlqOz7Z4QJ/jvptrjRLJZWuq7FWm5hRg2XdNeS1VYFS5+AMXaO1aAt0ushIEe8p 9NFfRG8u20Gt3wLsO/VuUi9495jRHhcsXRco6W+FbEf4xeFa/6tVsEfxgwrIHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782509871; a=rsa-sha256; cv=none; b=o7TzF5q2h1nDaWqS1weaGqnV6Kb915xPiczanjX2djNRnj3F47mb8xNvhRknvxUG1G1XX7 fgbhOzKdrv8x8gVoR0gtJ2MPsV60TXb+V4QhIifLdfDaHpfewa0Vslr+xCZSLd2ogoJc7x oX2mq0wKd47MX2aRrfKtgwvWHlC/C4FR90Y1UWZQ+GTo80qvdRQODVp8Nty9EzwpdrKiXM xwf+A/wKDkwBu7PYHOtyY4w5pOpWOcXpv9lLIJw/MGQtCaybYRuwrM1J9l9KNs47bkExNd svRe0oYVS9jmMppAUfna5NuXaJ8jxRbwT3m3+LL7f9xpD0nugQxcUoq5XAjVlQ== 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=1782509871; 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=dSc+A4HzMA/RiDIgfNrIviBE8nUE3NPzr7l2uvM/Cwg=; b=a+o4amat4aIQwc0BO7h1hQXywkRB+sv/ki81CUleLr1d3+PSncRtpGvOYcCJRjs6K+r2lm KPt0lm9KU1nq0nsOJA9Bp2SqsTDEMb0wQFIGMunZ5AXec3IQVF+1yxcFMBCGvhVA/0SkTN 9kpagh7BQ9kCAI3DNgSQvD07gQHW3AeW310wdozbed0zsktOt5Y8oKC0iRlwIEOkhNdyUF URUNAhzzz2ayt4D20KrX6F5LZ4jTTCJ1dhLCHhWiAShmrlkh31U/OKTIu7ScM/IYGn7WYl bbQ9vJPfNUpuEsuYIgcbqMBONmfj+BlTymOZxn/vZgAaCZOvZHEoCrOEW+2Inw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn8Cz0bF7zwL6 for ; Fri, 26 Jun 2026 21:37:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2284f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 21:37:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 9209e04d76c5 - main - hwpstate_intel(4): Debug sysctl: Rename struct/field List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 9209e04d76c577863210dbc9faa94d4dd7498af6 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 21:37:45 +0000 Message-Id: <6a3ef129.2284f.430bffd@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=9209e04d76c577863210dbc9faa94d4dd7498af6 commit 9209e04d76c577863210dbc9faa94d4dd7498af6 Author: Olivier Certner AuthorDate: 2026-06-26 13:51:10 +0000 Commit: Olivier Certner CommitDate: 2026-06-26 21:36:16 +0000 hwpstate_intel(4): Debug sysctl: Rename struct/field New names are better descriptions and match what is done in hwpstate_amd(4). No functional change (intended). MFC after: 2 weeks Event: Halifax Hackathon 202606 Location: Dalhousie CS Faculty building Sponsored by: The FreeBSD Foundation --- sys/x86/cpufreq/hwpstate_intel.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_intel.c b/sys/x86/cpufreq/hwpstate_intel.c index 3ee97772e122..d67e83b33af7 100644 --- a/sys/x86/cpufreq/hwpstate_intel.c +++ b/sys/x86/cpufreq/hwpstate_intel.c @@ -141,42 +141,45 @@ hwp_has_error(u_int res, u_int err) return ((res & err) != 0); } -struct dump_cppc_request_cb { +struct get_cppc_regs_data { + /* Inputs */ struct hwp_softc *sc; + /* Outputs */ uint64_t enabled; uint64_t caps; uint64_t request; uint64_t request_pkg; - int err; + /* HWP_ERROR_CPPC_* except HWP_ERROR_*_WRITE */ + u_int res; }; static void -dump_cppc_request_cb(void *args) +get_cppc_regs_cb(void *args) { - struct dump_cppc_request_cb *const data = args; + struct get_cppc_regs_data *const data = args; - data->err = 0; + data->res = 0; if (rdmsr_safe(MSR_IA32_PM_ENABLE, &data->enabled)) - data->err |= HWP_ERROR_CPPC_ENABLE; + data->res |= HWP_ERROR_CPPC_ENABLE; if (rdmsr_safe(MSR_IA32_HWP_CAPABILITIES, &data->caps)) - data->err |= HWP_ERROR_CPPC_CAPS; + data->res |= HWP_ERROR_CPPC_CAPS; if (rdmsr_safe(MSR_IA32_HWP_REQUEST, &data->request)) - data->err |= HWP_ERROR_CPPC_REQUEST; + data->res |= HWP_ERROR_CPPC_REQUEST; if (data->sc->hwp_pkg_ctrl && (data->request & IA32_HWP_REQUEST_PACKAGE_CONTROL)) { if (rdmsr_safe(MSR_IA32_HWP_REQUEST_PKG, &data->request_pkg)) - data->err |= HWP_ERROR_CPPC_REQUEST_PKG; + data->res |= HWP_ERROR_CPPC_REQUEST_PKG; } } static inline void -dump_cppc_request_one(struct hwp_softc *sc, struct dump_cppc_request_cb *req) +get_cppc_regs_one(struct hwp_softc *sc, struct get_cppc_regs_data *req) { req->sc = sc; smp_rendezvous_cpu(cpu_get_pcpu(sc->dev)->pc_cpuid, - smp_no_rendezvous_barrier, dump_cppc_request_cb, + smp_no_rendezvous_barrier, get_cppc_regs_cb, smp_no_rendezvous_barrier, req); } @@ -189,7 +192,7 @@ intel_hwp_dump_sysctl_handler(SYSCTL_HANDLER_ARGS) struct pcpu *pc; struct sbuf *sb; struct hwp_softc *sc; - struct dump_cppc_request_cb data; + struct get_cppc_regs_data data; int ret = 0; sc = (struct hwp_softc *)arg1; @@ -199,11 +202,11 @@ intel_hwp_dump_sysctl_handler(SYSCTL_HANDLER_ARGS) if (pc == NULL) return (ENXIO); - dump_cppc_request_one(sc, &data); + get_cppc_regs_one(sc, &data); sb = sbuf_new(NULL, NULL, 1024, SBUF_FIXEDLEN | SBUF_INCLUDENUL); sbuf_putc(sb, '\n'); - if (hwp_has_error(data.err, HWP_ERROR_CPPC_ENABLE)) + if (hwp_has_error(data.res, HWP_ERROR_CPPC_ENABLE)) sbuf_printf(sb, "CPU%u: IA32_PM_ENABLE: " MSR_NOT_READ_MSG "\n", pc->pc_cpuid); else @@ -212,7 +215,7 @@ intel_hwp_dump_sysctl_handler(SYSCTL_HANDLER_ARGS) if (data.enabled == 0) goto out; - if (hwp_has_error(data.err, HWP_ERROR_CPPC_CAPS)) { + if (hwp_has_error(data.res, HWP_ERROR_CPPC_CAPS)) { sbuf_printf(sb, "IA32_HWP_CAPABILITIES: " MSR_NOT_READ_MSG "\n"); } else { @@ -235,9 +238,9 @@ intel_hwp_dump_sysctl_handler(SYSCTL_HANDLER_ARGS) sbuf_printf(sb, "\t%s: %03u\n", name, \ (unsigned)(data.request_pkg >> offset) & 0xff); \ } while (0) - if (hwp_has_error(data.err, HWP_ERROR_CPPC_REQUEST)) { + if (hwp_has_error(data.res, HWP_ERROR_CPPC_REQUEST)) { sbuf_printf(sb, "IA32_HWP_REQUEST: " MSR_NOT_READ_MSG "\n"); - } else if (hwp_has_error(data.err, HWP_ERROR_CPPC_REQUEST_PKG)) { + } else if (hwp_has_error(data.res, HWP_ERROR_CPPC_REQUEST_PKG)) { sbuf_printf(sb, "IA32_HWP_REQUEST_PKG: " MSR_NOT_READ_MSG "\n"); } else { pkg_print(IA32_HWP_REQUEST_EPP_VALID,