From nobody Sun Mar 1 19:03:47 2026 X-Original-To: dev-commits-src-main@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 4fPBLD19V0z6TW3q for ; Sun, 01 Mar 2026 19:03:48 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fPBLD03LWz3qgL for ; Sun, 01 Mar 2026 19:03:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772391828; 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=vKNy/pbPnCHtUnIWMWcUkBQYXC+kvXJ/arYiJATPI4I=; b=gjsWbba+XnzoegUh9XQqDwtqcxXVXvniBiNhAAO0yEw6f6chftGNZ3YttBUqow9EE8Ot89 GKf6E/GBK17QZtyRjBo83/hV5H5hD93rBPRNUGJhLstZdKe8hw1tpbMPXh2wYiE/R21xER Qqm+72gnN0XEJRe/rkikcp0S+7QOyMVHrtN0fdoAXfUJm8YrPUnpz+5TlhbOxWf56guNdN vCMHwfZ5wl9SqNXlD2UYjBvFhxYQJ8uMH3CgnmscNw/c/6nwS/6eHUNqnAlXaVTVGz5OeM 7iYf+1Vsx9z+N8vZ/183v27gy9+4HrJoHXTZRAraxe5KvobUZY1ibo7T3KE7dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772391828; a=rsa-sha256; cv=none; b=hRzP1GtxVMIqTS4OdZNr2ToHuwUFeAd/XH21t94Kz2BsUrab4dWVoi1n5nx2j/Q/fBAoJF 49CT5akPZEZf6JRM3XhRdt3ffKMMyE+BjyRlIGNclAyx6p+PtFjUnx1UiVm3YuySSfOFfK qRrqfGKdkzvLcKFwEZOpuGIhyQLX9OTJX5oj4W3ODSRZk2wnnX4Y3cYXfE0VImgnkV25r3 6J0nIKt0MHchqi0O4mWV1Be2PKZeh8JJD5Qbbj9BB0glwEtOTSiTfIR1KjvLWpj28D2Drs 4UICzg5fPxcqr10x8SEC4hKnghdKYG5rupMrcCHjGET8qA+8W6yoXNG2sNotqQ== 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=1772391828; 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=vKNy/pbPnCHtUnIWMWcUkBQYXC+kvXJ/arYiJATPI4I=; b=mZ7BROtE8foR32rKaPS3FE1KnXeE9noVK5n9RQwXTboAUqiCfwk2jtMEMJmK/5X7UnGcVM YC6wBNfEZIAe/8VH0JBNzB6KR4gz4jszrzCsuNbvHsYp48Ikk0JZU4TZ+yKMuIIDUj1vfl 2fLmJPBU7dQekiJE+iRB+TCrj7pHb5TEyzj6PjGjh7TcYrqIQX6AQg7kvcFmjAMxzjLavt YjMuB0TcMPrXsA1kudkuU7498bYlt+ogsB/OTPbn0v2rzOxpS6ysk8DSfbfg9Co2MT2wYL uMFdNOvpCTWSnvNuygUzBD2S+2ihp+om/SUyL8P65aXFSoadbPqli80E7L+QUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fPBLC6kCNz125f for ; Sun, 01 Mar 2026 19:03:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1965b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Mar 2026 19:03:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: e81e724358e4 - main - asmc: output the SMC firmware revision on attach List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: e81e724358e43dcf951e244a9df9df3eaa983fe9 Auto-Submitted: auto-generated Date: Sun, 01 Mar 2026 19:03:47 +0000 Message-Id: <69a48d93.1965b.3c23c832@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=e81e724358e43dcf951e244a9df9df3eaa983fe9 commit e81e724358e43dcf951e244a9df9df3eaa983fe9 Author: Enji Cooper AuthorDate: 2026-03-01 18:54:56 +0000 Commit: Enji Cooper CommitDate: 2026-03-01 19:03:38 +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 --- 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 cf977071cc69..726d52874026 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -51,6 +51,7 @@ #include #include +#include #include @@ -935,11 +936,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; @@ -1039,10 +1046,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 97e5076455c9..5afc1012849c 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. */