From nobody Sat Nov 07 22:15:03 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 4jMVj36z1xz6xtsk for ; Sat, 07 Nov 2026 22:15:03 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jMVj34BpVz4Mcs for ; Sat, 07 Nov 2026 22:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794089703; 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=wfuZCSLT4XVuuzlxGunI9NX01JSfiA55y70ZBnudC68=; b=NjmVKjqbLqOS6zXikCFhkj714OM3sV7BF+nScuIxhNCgFBAc+M/+p+zEj4R7mgx5tfHmON ghj6hS4JcHgBJwhmVDpee+jQqsDf0g9p6o9y0e2ERuHgozbG+n1hlgvNHA7kUkS5fRM3S+ 8CAnFhUuuJGXPmyVKS4H/qRk3VfFZvxesI0J/nB585pcCvQL1dRD6cWZVomXdCg4AMbEzt KuvpGdoINj/Hv+yMhCqJcY3DLoK1he435mvXhPzK0IKPAxSnubikSJwKAzC1A0Xda+Z98X VCXSLCtC87pvaG8CMMT+SqadWv1kFn//LZAvzX0KPhQagsz2pxSH0d0iSxRnCg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794089703; b=Dgbf4mrHz9iKdl0SWo5cMPb6B/jS+Wvfc0HPCV/RgKBT+dLjFs/gADUI0MhlbONQfIFmli uuv9tDAik7paJ/qHDuv7pDZSkOTm6vYSoZD1BtrVeYw610heiSgnzt6IDvwlqVjNL22zCB 3g3gqbvjeXESDg4vmHYJoDb+DBtMOH0Y6SmuVYNBjX5YzR9x85J2Rx5KGbkFRbzCvUg0xE ToTsFN2IKZD1oAMtnqhwa77rk7nQdV1eH1HOO08bi0/KV5m+nvTCOIgi/3GEdEs8VDcv3F R6RFz1yRek9uXX3Q4OwU0BJDjoO9ahwXk+wu7VDDYao6JO9/BUqWgBJHDblZYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794089703; 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=wfuZCSLT4XVuuzlxGunI9NX01JSfiA55y70ZBnudC68=; b=C4gVpYiGbbO4/WVV6+XsR/ACcj+gXfQ3hqWCDOlIOnsM3KtK9iFT0p4i/OFS90BlGIPQ9c dCzJ8miolyAHQefSacL+pI9U9qSahahBamly4JG6MqnVoaiVUIVE2tSarLbUYwJyyY4t/9 n5UtHphkEzR7jXggKJCpXTodZrY3nf+zBWUYD1JaLW7sq5BziUPkEzYAzgLLyrQlB/OT/e FJQQgcrETeGx4Da7MVqBXbUO9tJbKCkZSWhEZPEGyNc2tHeMT1cNgHaOpdaquW9YptrDM3 bm2WZx3qzap97hZ1Q8BQ+SrNtNg3+UzVdBJ93snC37BnKOTN4BNkZ/QuS2mK6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jMVj33cMNzgLw for ; Sat, 07 Nov 2026 22:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e939 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Nov 2026 22:15:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Abdelkader Boudih Subject: git: 12797df3a2d1 - main - asmc: collapse the per-fan speed sysctl handlers List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: seuros X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 12797df3a2d1f715e48592cb5443af5437b519ce Auto-Submitted: auto-generated Date: Sat, 07 Nov 2026 22:15:03 +0000 Message-Id: <6aefa2e7.3e939.230b5e71@gitrepo.freebsd.org> The branch main has been updated by seuros: URL: https://cgit.FreeBSD.org/src/commit/?id=12797df3a2d1f715e48592cb5443af5437b519ce commit 12797df3a2d1f715e48592cb5443af5437b519ce Author: Abdelkader Boudih AuthorDate: 2026-11-07 20:26:33 +0000 Commit: Abdelkader Boudih CommitDate: 2026-11-07 20:26:33 +0000 asmc: collapse the per-fan speed sysctl handlers The five fan speed handlers differed only in which key they read and whether they wrote back. Select the key from a table through arg2, the way asmc_sensor_sysctl() already packs a type and an index, and keep one handler. A second table drives the seven registration calls. No functional change, Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D61286 --- sys/dev/asmc/asmc.c | 197 +++++++++++++++++++--------------------------------- 1 file changed, 73 insertions(+), 124 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 17da56b5ceb4..6084fac53fc7 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -125,10 +125,6 @@ static int asmc_key_dump(device_t, int); */ static int asmc_mb_sysctl_fanid(SYSCTL_HANDLER_ARGS); static int asmc_mb_sysctl_fanspeed(SYSCTL_HANDLER_ARGS); -static int asmc_mb_sysctl_fansafespeed(SYSCTL_HANDLER_ARGS); -static int asmc_mb_sysctl_fanminspeed(SYSCTL_HANDLER_ARGS); -static int asmc_mb_sysctl_fanmaxspeed(SYSCTL_HANDLER_ARGS); -static int asmc_mb_sysctl_fantargetspeed(SYSCTL_HANDLER_ARGS); static int asmc_mb_sysctl_fanmanual(SYSCTL_HANDLER_ARGS); static int asmc_temp_sysctl(SYSCTL_HANDLER_ARGS); static int asmc_mb_sysctl_sms_x(SYSCTL_HANDLER_ARGS); @@ -473,6 +469,56 @@ asmc_try_probe(device_t dev) return (ENOMEM); } +/* + * The per-fan speed keys, selected by the high byte of a fan sysctl's arg2. + * Writable keys accept a new speed; the rest are reported only. + */ +#define ASMC_FAN_ARG2(which, fan) (((which) << 8) | (fan)) +#define ASMC_FAN_ARG2_WHICH(arg2) (((arg2) >> 8) & 0xff) +#define ASMC_FAN_ARG2_FAN(arg2) ((arg2) & 0xff) + +#define ASMC_FANSPEED_CUR 0 +#define ASMC_FANSPEED_SAFE 1 +#define ASMC_FANSPEED_MIN 2 +#define ASMC_FANSPEED_MAX 3 +#define ASMC_FANSPEED_TARGET 4 + +static const struct { + const char *key; + bool writable; +} asmc_fan_speed_keys[] = { + [ASMC_FANSPEED_CUR] = { ASMC_KEY_FANSPEED, false }, + [ASMC_FANSPEED_SAFE] = { ASMC_KEY_FANSAFESPEED, false }, + [ASMC_FANSPEED_MIN] = { ASMC_KEY_FANMINSPEED, true }, + [ASMC_FANSPEED_MAX] = { ASMC_KEY_FANMAXSPEED, true }, + [ASMC_FANSPEED_TARGET] = { ASMC_KEY_FANTARGETSPEED, true }, +}; + +/* The dev.asmc.n.fan.m leaves, in registration order. */ +static const struct { + const char *name; + const char *desc; + int ctlflags; + int (*handler)(SYSCTL_HANDLER_ARGS); + int which; + bool needs_safespeed; +} asmc_fan_sysctls[] = { + { "id", "Fan ID", CTLTYPE_STRING | CTLFLAG_RD, + asmc_mb_sysctl_fanid, 0, false }, + { "speed", "Fan speed in RPM", CTLTYPE_INT | CTLFLAG_RD, + asmc_mb_sysctl_fanspeed, ASMC_FANSPEED_CUR, false }, + { "safespeed", "Fan safe speed in RPM", CTLTYPE_INT | CTLFLAG_RD, + asmc_mb_sysctl_fanspeed, ASMC_FANSPEED_SAFE, true }, + { "minspeed", "Fan minimum speed in RPM", CTLTYPE_INT | CTLFLAG_RW, + asmc_mb_sysctl_fanspeed, ASMC_FANSPEED_MIN, false }, + { "maxspeed", "Fan maximum speed in RPM", CTLTYPE_INT | CTLFLAG_RW, + asmc_mb_sysctl_fanspeed, ASMC_FANSPEED_MAX, false }, + { "targetspeed", "Fan target speed in RPM", CTLTYPE_INT | CTLFLAG_RW, + asmc_mb_sysctl_fanspeed, ASMC_FANSPEED_TARGET, false }, + { "manual", "Fan manual mode (0=auto, 1=manual)", + CTLTYPE_INT | CTLFLAG_RW, asmc_mb_sysctl_fanmanual, 0, false }, +}; + static int asmc_attach(device_t dev) { @@ -522,54 +568,20 @@ asmc_attach(device_t dev) SYSCTL_CHILDREN(sc->sc_fan_tree[0]), OID_AUTO, name, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "Fan Subtree"); - SYSCTL_ADD_PROC(sysctlctx, - SYSCTL_CHILDREN(sc->sc_fan_tree[i]), - OID_AUTO, "id", - CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, dev, j, - asmc_mb_sysctl_fanid, "I", "Fan ID"); - - SYSCTL_ADD_PROC(sysctlctx, - SYSCTL_CHILDREN(sc->sc_fan_tree[i]), - OID_AUTO, "speed", - CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, dev, j, - asmc_mb_sysctl_fanspeed, "I", "Fan speed in RPM"); + for (unsigned int k = 0; k < nitems(asmc_fan_sysctls); k++) { + if (asmc_fan_sysctls[k].needs_safespeed && + !sc->sc_has_safespeed) + continue; - if (sc->sc_has_safespeed) { - SYSCTL_ADD_PROC(sysctlctx, + /* SYSCTL_ADD_PROC() asserts flags at compile time. */ + sysctl_add_oid(sysctlctx, SYSCTL_CHILDREN(sc->sc_fan_tree[i]), - OID_AUTO, "safespeed", - CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, dev, j, - asmc_mb_sysctl_fansafespeed, "I", - "Fan safe speed in RPM"); + OID_AUTO, asmc_fan_sysctls[k].name, + asmc_fan_sysctls[k].ctlflags | CTLFLAG_MPSAFE, + dev, ASMC_FAN_ARG2(asmc_fan_sysctls[k].which, j), + asmc_fan_sysctls[k].handler, "I", + asmc_fan_sysctls[k].desc, NULL); } - - SYSCTL_ADD_PROC(sysctlctx, - SYSCTL_CHILDREN(sc->sc_fan_tree[i]), - OID_AUTO, "minspeed", - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, dev, j, - asmc_mb_sysctl_fanminspeed, "I", - "Fan minimum speed in RPM"); - - SYSCTL_ADD_PROC(sysctlctx, - SYSCTL_CHILDREN(sc->sc_fan_tree[i]), - OID_AUTO, "maxspeed", - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, dev, j, - asmc_mb_sysctl_fanmaxspeed, "I", - "Fan maximum speed in RPM"); - - SYSCTL_ADD_PROC(sysctlctx, - SYSCTL_CHILDREN(sc->sc_fan_tree[i]), - OID_AUTO, "targetspeed", - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, dev, j, - asmc_mb_sysctl_fantargetspeed, "I", - "Fan target speed in RPM"); - - SYSCTL_ADD_PROC(sysctlctx, - SYSCTL_CHILDREN(sc->sc_fan_tree[i]), - OID_AUTO, "manual", - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, dev, j, - asmc_mb_sysctl_fanmanual, "I", - "Fan manual mode (0=auto, 1=manual)"); } /* @@ -2046,13 +2058,21 @@ static int asmc_mb_sysctl_fanspeed(SYSCTL_HANDLER_ARGS) { device_t dev = (device_t)arg1; - int fan = arg2; + int which = ASMC_FAN_ARG2_WHICH(arg2); + int fan = ASMC_FAN_ARG2_FAN(arg2); int error; int32_t v; - v = asmc_fan_getvalue(dev, ASMC_KEY_FANSPEED, fan); + v = asmc_fan_getvalue(dev, asmc_fan_speed_keys[which].key, fan); error = sysctl_handle_int(oidp, &v, 0, req); + if (error == 0 && req->newptr != NULL && + asmc_fan_speed_keys[which].writable) { + unsigned int newspeed = v; + asmc_fan_setvalue(dev, asmc_fan_speed_keys[which].key, fan, + newspeed); + } + return (error); } @@ -2061,7 +2081,7 @@ asmc_mb_sysctl_fanid(SYSCTL_HANDLER_ARGS) { uint8_t buf[16]; device_t dev = (device_t)arg1; - int fan = arg2; + int fan = ASMC_FAN_ARG2_FAN(arg2); int error = true; char *desc; @@ -2073,83 +2093,12 @@ asmc_mb_sysctl_fanid(SYSCTL_HANDLER_ARGS) return (error); } -static int -asmc_mb_sysctl_fansafespeed(SYSCTL_HANDLER_ARGS) -{ - device_t dev = (device_t)arg1; - int fan = arg2; - int error; - int32_t v; - - v = asmc_fan_getvalue(dev, ASMC_KEY_FANSAFESPEED, fan); - error = sysctl_handle_int(oidp, &v, 0, req); - - return (error); -} - -static int -asmc_mb_sysctl_fanminspeed(SYSCTL_HANDLER_ARGS) -{ - device_t dev = (device_t)arg1; - int fan = arg2; - int error; - int32_t v; - - v = asmc_fan_getvalue(dev, ASMC_KEY_FANMINSPEED, fan); - error = sysctl_handle_int(oidp, &v, 0, req); - - if (error == 0 && req->newptr != NULL) { - unsigned int newspeed = v; - asmc_fan_setvalue(dev, ASMC_KEY_FANMINSPEED, fan, newspeed); - } - - return (error); -} - -static int -asmc_mb_sysctl_fanmaxspeed(SYSCTL_HANDLER_ARGS) -{ - device_t dev = (device_t)arg1; - int fan = arg2; - int error; - int32_t v; - - v = asmc_fan_getvalue(dev, ASMC_KEY_FANMAXSPEED, fan); - error = sysctl_handle_int(oidp, &v, 0, req); - - if (error == 0 && req->newptr != NULL) { - unsigned int newspeed = v; - asmc_fan_setvalue(dev, ASMC_KEY_FANMAXSPEED, fan, newspeed); - } - - return (error); -} - -static int -asmc_mb_sysctl_fantargetspeed(SYSCTL_HANDLER_ARGS) -{ - device_t dev = (device_t)arg1; - int fan = arg2; - int error; - int32_t v; - - v = asmc_fan_getvalue(dev, ASMC_KEY_FANTARGETSPEED, fan); - error = sysctl_handle_int(oidp, &v, 0, req); - - if (error == 0 && req->newptr != NULL) { - unsigned int newspeed = v; - asmc_fan_setvalue(dev, ASMC_KEY_FANTARGETSPEED, fan, newspeed); - } - - return (error); -} - static int asmc_mb_sysctl_fanmanual(SYSCTL_HANDLER_ARGS) { device_t dev = (device_t)arg1; struct asmc_softc *sc = device_get_softc(dev); - int fan = arg2; + int fan = ASMC_FAN_ARG2_FAN(arg2); int error; int32_t v; uint8_t buf[2];