From nobody Sat Apr 25 16:23:23 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 4g2w9l70gTz6blhr for ; Sat, 25 Apr 2026 16:23:23 +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 4g2w9l4Y4sz424B for ; Sat, 25 Apr 2026 16:23:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777134203; 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=4c8l18JSL9/IRM3uIJgGT5w3FNEHOqud3KLYmFMqxY4=; b=fLzDmR1zbwN68Rg5HXsH1oJaxvS2YF1aFnrR1I16TvF+o58nqJtVd3qprSm4xsfqt/VI3R Zb8g98qSDR4FF44CC5nM8uPXOi8H0bvEHU2OGPwo0DUp8PjlalgPC+ykvhdD2DTfQtySe/ 4fQFqtJIuuw837BxWOg8P3TZQQBBXPdFRIIf9fuBZYiRJ0LGGOwO2i6klBI+ymG/Q5Mx2Q RGZLf5Fx7tLy9JfcgCL8DnsR0Oj/arO5yAFb1qxWxqGbTNlz4fSHoaXyblK9nnk7qzdGDS OyLz72UyfsNJ96wxh2hKoVE7UfrtWtrsDCQbh4S/7blo8ZvDBNeSV+aRx1MC5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777134203; a=rsa-sha256; cv=none; b=Nm7GBo1MqjrK9q8yV7gaWRhcExXEkZy+1G7Cf9XvxBczCDQ/yZ7XG1Jrtn3OMXaM+qog9t QcW8nO+GrCTH3nND61SYNwaATu4JRL6vlpLTfHa7kOxbnHv8YyOObLfDKMTbBLH5d8Pxdb etyI6OrLl0O2cvxivoma+IRpJTJjKIQKsWjPHRNVN7Hr1vAjH380DZqT5eidlG6eVfodKV a1UZhuh4xsbg1aCFWgNqevpfrdUNdPg9Ky6Q1x2yK6yMhw+tBHnSGgJO/++btMMw0Ku5zH Mgqy09p1BJEfiL4Be0mN+NlTCnC7/tMZ3SciDHmkI8fjFlsbdEFQfvVcSdVHiA== 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=1777134203; 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=4c8l18JSL9/IRM3uIJgGT5w3FNEHOqud3KLYmFMqxY4=; b=vkln5F9Ql386NQLUAm8ORQN6Q+Rh5yO1p5/xjAGonfNSwJ2IZx6qVBjlJNyywoIT/uzVDe eb/Ji6kxJ/JnGhtXV4PnXVK6ZP9FHSg0oiwqh909vAQmTTHo4nZmY2GC+OG94fZE3khWq+ /3PVta1CcHPa6FOeoYW7qtjrpjv0CSgQsv6qh2Ikpaiz5UDNmpZ9f1X5D2MxKnQsnF5v6D oDX3dyXUxHIHDOp75ww1GmBY4f3u0XPgjVOH7Qb/hRoXT+ZclZ4QlgvASPgg1dIkdj/nwJ IlGWX8eYY1zVtnCiap2IzSN6UYFp2W86qdMoDPKA0dNT+cD9vjUVBXTXPyAkQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2w9l3mT7zj0n for ; Sat, 25 Apr 2026 16:23:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 433d9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Apr 2026 16:23:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: b44a9bd37e60 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: b44a9bd37e605e5f9a06af5a39ac26eb6962239c Auto-Submitted: auto-generated Date: Sat, 25 Apr 2026 16:23:23 +0000 Message-Id: <69ecea7b.433d9.1bbd9a6d@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=b44a9bd37e605e5f9a06af5a39ac26eb6962239c commit b44a9bd37e605e5f9a06af5a39ac26eb6962239c Author: Enji Cooper AuthorDate: 2026-03-01 18:54:56 +0000 Commit: Enji Cooper CommitDate: 2026-04-25 16:23:18 +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 756f4c12e43d..58a0b573d4c9 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -51,6 +51,7 @@ #include #include +#include #include @@ -938,11 +939,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; @@ -1041,10 +1048,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. */