From nobody Sun Nov 15 21:21:55 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 4jSP841CzMz71Bl0 for ; Sun, 15 Nov 2026 21:21:56 +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 4jSP835n3bz4Ct9 for ; Sun, 15 Nov 2026 21:21:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794777715; 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=uh6i8rwW/Al1yi7c8EdZGSRVsSJi0JOqGA9thkWqOOM=; b=ssXoTK9SpNKvD52b12hbavXtrcgQY4YrUfYODwsukr9TlnCduRkRTiV7Z6vu1ynr7TWIX+ /w5u6sySjffIll7XNEQJGoX006hWAhEviYuQJEmVKP09vrEFANDq174dkQDKUCcUxFpC26 S3QIaNi58S5fePyzsBHrZFdHUTvnYZt7rUkpf7RrM4Ff5DJjD05ggCHyOG7texf09sE88O Pi9CIRnTuHRc1sn0Fqnhinv0XsJHMZJYVMJa22sPDARME9h8sEzxYr9U/YBTjcoQmcqIB+ t81VXEJVmnQVBo9vLoFOj6nGQ0sPykVLu2k3Lyd52MFsUS+V65zlOfL7P7ZucQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794777715; b=Bm7oiXRMp8n7rEkCR1NxA+jMq9m5wO+qbUG3aQXBQhrW4t3P5nA+IWWHlyHdAifsJ9KEmo Hz7s+R2D0czOtRrAq9CmVi/Ar1It7da2036xpCndt528KuPiR1dVW29NzvT1yqBtJOoZnm bF5CCSaJ2S/2Cp117uSvC/xx31c6OP+B0uNbEDDwPtxyG2oOinuf9cLFUvHFVlcalGHM5b CJEhJDKjaeK7AhRtgdL8cUZBFpD2IpBy+foiGJiTZn2h9fN9QfCUQqs2Wfazz7d3FMFMej bXVSlqdpGsHp2SZIQKcrC8n+3mzERpsMWXGCHdnV9ymcb1RN8WZpgKPcpxn79A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794777715; 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=uh6i8rwW/Al1yi7c8EdZGSRVsSJi0JOqGA9thkWqOOM=; b=iF2j55ZRnJ9q8pDoNmFhP+Ov9/OQQdPIKINW0q3bFoB+gwQOhYNtoPc/JRDWxtEl3Gyois LPfeJUd6gwyJvVmMk7yFKJ0mR0/0PGU6pMI/gnrYdNVyxlJedj0I+767Xcfkd3L1bTyo4w xlOhlRnTNYFTCWDoJcfSFGfDkitwRvRM5ttRu3NiqSF+oY+HAGC7ygzgFdtAsBRAihLD+g HhefBW74LOYnAsmLvWasaswKjs3KT2UlleT8FJ45GKxdzGuYq/du6uzF9HWU7/2qZ4ZibX ctlNycGSN4p69GRnQBbywu6l1NB16b8/jyyKh4xcjbSKN0NbLvmysRz8uaDgEA== 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 4jSP835S6dzNgr for ; Sun, 15 Nov 2026 21:21:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 246bb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Nov 2026 21:21:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Abdelkader Boudih Subject: git: 49ba2878e6ec - main - asmc: report temperatures in deciKelvin List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: 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: 49ba2878e6ec412565caccd2d0990e9355123290 Auto-Submitted: auto-generated Date: Sun, 15 Nov 2026 21:21:55 +0000 Message-Id: <6afa2273.246bb.3820f677@gitrepo.freebsd.org> The branch main has been updated by seuros: URL: https://cgit.FreeBSD.org/src/commit/?id=49ba2878e6ec412565caccd2d0990e9355123290 commit 49ba2878e6ec412565caccd2d0990e9355123290 Author: Abdelkader Boudih AuthorDate: 2026-11-15 21:12:52 +0000 Commit: Abdelkader Boudih CommitDate: 2026-11-15 21:12:52 +0000 asmc: report temperatures in deciKelvin The handler returned the raw key's high byte, dropping the sign and fraction of the sp78 encoding, and published -1 on a failed read. Read through asmc_sensor_read() instead, convert to deciKelvin, and register the leaves as "IK". Changes the unit of dev.asmc.N.temp.*. MFC after: 3 days Reviewed by: ngie Differential Revision: https://reviews.freebsd.org/D61487 --- share/man/man4/asmc.4 | 10 ++++++++-- sys/dev/asmc/asmc_sysctl.c | 31 ++++++++++++------------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/share/man/man4/asmc.4 b/share/man/man4/asmc.4 index 052a52eb0e27..5edae8f2b3d6 100644 --- a/share/man/man4/asmc.4 +++ b/share/man/man4/asmc.4 @@ -4,7 +4,7 @@ .\" .\" SPDX-License-Identifier: BSD-2-Clause .\" -.Dd September 6, 2026 +.Dd November 10, 2026 .Dt ASMC 4 .Os .Sh NAME @@ -47,7 +47,13 @@ the .Va dev.asmc.temp sysctl MIB. .Pp -All values are in degrees celsius. +The sensors are reported in deciKelvin, the convention every other +temperature source in the kernel follows, so +.Xr sysctl 8 +displays them in degrees Celsius: +.Bd -literal -offset indent +dev.asmc.0.temp.TC0P: 42.1C +.Ed .Sh SYSTEM FANS The .Va dev.asmc.fan.%d diff --git a/sys/dev/asmc/asmc_sysctl.c b/sys/dev/asmc/asmc_sysctl.c index 37dbfca11a0f..4be3483e9ea9 100644 --- a/sys/dev/asmc/asmc_sysctl.c +++ b/sys/dev/asmc/asmc_sysctl.c @@ -30,6 +30,8 @@ #include #include +#define ASMC_ZERO_C_TO_DK 2731 /* deciKelvin at 0 degrees C */ + /* * Shutdown/sleep cause codes (MSSD/MSSP values). * @@ -331,7 +333,7 @@ asmc_sysctl_add_temp(device_t dev, struct sysctl_ctx_list *ctx) SYSCTL_CHILDREN(sc->sc_temp_tree), OID_AUTO, sc->sc_temp_sensors[i], CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, dev, i, - asmc_temp_sysctl, "I", + asmc_temp_sysctl, "IK", asmc_temp_desc(sc->sc_temp_sensors[i])); } } @@ -845,34 +847,25 @@ asmc_mb_sysctl_fanmanual(SYSCTL_HANDLER_ARGS) /* * Temperature functions. */ -static int -asmc_temp_getvalue(device_t dev, const char *key) -{ - uint8_t buf[2]; - - /* - * Check for invalid temperatures. - */ - if (asmc_key_read(dev, key, buf, sizeof(buf)) != 0) - return (-1); - - return (buf[0]); -} - static int asmc_temp_sysctl(SYSCTL_HANDLER_ARGS) { device_t dev = (device_t)arg1; struct asmc_softc *sc = device_get_softc(dev); - int error, val; + int error, millic, deci; if (arg2 < 0 || arg2 >= sc->sc_temp_count) return (EINVAL); - val = asmc_temp_getvalue(dev, sc->sc_temp_sensors[arg2]); - error = sysctl_handle_int(oidp, &val, 0, req); + error = asmc_sensor_read(dev, sc->sc_temp_sensors[arg2], &millic); + if (error != 0) + return (error); - return (error); + /* Round to the tenth of a degree that "IK" prints, then offset. */ + deci = millic >= 0 ? (millic + 50) / 100 : (millic - 50) / 100; + deci += ASMC_ZERO_C_TO_DK; + + return (sysctl_handle_int(oidp, &deci, 0, req)); } static int