From nobody Sat Apr 25 16:26:56 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 4g2wFs1K9Qz6bm5Z for ; Sat, 25 Apr 2026 16:26:57 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2wFr4pdrz42cx for ; Sat, 25 Apr 2026 16:26:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777134416; 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=2OIMNdnFif/kbJzDw8ggtlbMCzIjlWUT7Qv6kp59og8=; b=qA5x4AapSPIHZRumIJ0+JaAzcw/OL50cw1cGeXR8EoB0AUxKlmgvgwenFBqsqN36TJJFIc 2hrCbBBKtUVYXM83daFabEh4Mhlk9vuqEn6Z3UKXCBSnrT7BNzLCM/60bFMzyZr8aeZULD itPQ1/kPW+catBI7GkXdg8rNNyHv0zeyqie9nbZGLqClxXBZT3xopIK8005Re/p7ekudvE 1l885zSYhovaDPmRUmHfSwazBw0zBfz84JSfxoKFuJw/GukzYV7+da0LV3I/Yi6qv9gvWw aNXaXHsRe8wIdbtzPcNCh7xl2FxBB1vC75w6dY13jrvwECqZuHU/w05qJQ7XYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777134416; a=rsa-sha256; cv=none; b=F/sfEbwwtFCuBZGGy2EUqOrJE/QEZaVWh7T/wMTvKjFXIWBFGV+ubxRUp/F8HYUy7vkpjy YA3H7XC06jm6KKvg+bYWv9sM3Qj1lbGR4PVZyX4FjekBNOmmK2yPQqKBXgIOIqRgRKo+9O e7Rn8wibNoeAVN6WjCxRxseqgYU5+j7OL/SzE3nVPbhj2v5Q0qbiQQq9iBtKYc2hELnqIM zIXnSKk9vK3qrr9KwNnh5PqIHdigZFPDLKMOHZ2bfbRQ7c0N/Z2A/IT11+scyqk6d4gFhr +gnrnE29D11Vy5QppRTjlj96krg9W3jObRGP94I3lsIPotgq3XzjVyp7az3+Hg== 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=1777134416; 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=2OIMNdnFif/kbJzDw8ggtlbMCzIjlWUT7Qv6kp59og8=; b=VQlz4tPLjhVb0F3t2cC4HePwF0gQa2JtobhjqIKLP6x+VxjLONzEbWv/fhJL23V8tIp90I +yEqvLH5v1pMSF/QvZMGAYr8XpzaWZ8Ri+MooxXSQeqFtWpTGzFjNzedYIdsDgLoGY8fdZ TlglWhLrWaqQjLBzKBA2AevJ3GyBdf3U44Djcc9ynB+8B0VN92qi6pDfH+Y1RDPInZ8XVc biR5AiNwltkUh2Hrn94deha5lt0nbyuzwqpJTXtGkZCzUAH+DcxoNl2I8ijQpg0O38tC83 kVKYfGxQ//EP9EYyjbPqYO7o1obmgOv//snMD4XKElDuUmBQns16Xt7y/m8EUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2wFr4KxLzj0r for ; Sat, 25 Apr 2026 16:26:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43c3a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Apr 2026 16:26:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 78e9708c98aa - stable/14 - asmc: output the SMC firmware revision on attach 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 78e9708c98aa7b1362cdb909f3530592c97ee904 Auto-Submitted: auto-generated Date: Sat, 25 Apr 2026 16:26:56 +0000 Message-Id: <69eceb50.43c3a.2ecc694b@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=78e9708c98aa7b1362cdb909f3530592c97ee904 commit 78e9708c98aa7b1362cdb909f3530592c97ee904 Author: Enji Cooper AuthorDate: 2026-03-01 18:54:56 +0000 Commit: Enji Cooper CommitDate: 2026-04-25 16:25:43 +0000 asmc: output the SMC firmware revision on attach The SMC firmware revision can prove helpful when determining why the behavior of a given controller varies from the maintainers' expected behavior. This should be a sysctl (eventually), but for now dumping out the information via `device_printf(..)` suffices, given that only one asmc(4) compatible device can exist in an Apple platform at any given point in time. This will become a sysctl in the future after additional improvements are incorporated from OpenBSD and NetBSD. MFC after: 1 week Obtained from: https://github.com/openbsd/src/ (sys/dev/acpi/asmc.c @ 142d064) Differential Revision: https://reviews.freebsd.org/D55577 (cherry picked from commit e81e724358e43dcf951e244a9df9df3eaa983fe9) --- sys/dev/asmc/asmc.c | 11 +++++++++-- sys/dev/asmc/asmcvar.h | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 079689e2ec2b..066b9c80de23 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -51,6 +51,7 @@ #include #include +#include #include @@ -937,11 +938,17 @@ asmc_init(device_t dev) { struct asmc_softc *sc = device_get_softc(dev); struct sysctl_ctx_list *sysctlctx; + uint8_t buf[6]; int i, error = 1; - uint8_t buf[4]; sysctlctx = device_get_sysctl_ctx(dev); + error = asmc_key_read(dev, ASMC_KEY_REV, buf, 6); + if (error != 0) + goto out_err; + device_printf(dev, "SMC revision: %x.%x%x%x\n", buf[0], buf[1], buf[2], + ntohs(*(uint16_t *)buf + 4)); + if (sc->sc_model->smc_sms_x == NULL) goto nosms; @@ -1040,10 +1047,10 @@ nosms: sc->sc_nkeys = 0; } +out_err: #ifdef ASMC_DEBUG asmc_dumpall(dev); #endif - return (error); } diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index 602f363594b9..d216fd1416e4 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -78,6 +78,9 @@ struct asmc_softc { /* Number of keys */ #define ASMC_NKEYS "#KEY" /* RO; 4 bytes */ +/* Query the ASMC revision */ +#define ASMC_KEY_REV "REV " /* RO: 6 bytes */ + /* * Fan control via SMC. */