From nobody Sun Nov 15 21:21:46 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 4jSP7t3HbXz71BLD for ; Sun, 15 Nov 2026 21:21:46 +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 4jSP7t2jL2z4Bsk for ; Sun, 15 Nov 2026 21:21:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794777706; 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=9eBU4hubpKxK7zPNysHQ8oJBvgSpDbij6W0QKokfnJY=; b=DvyjP/wvk3ifC7rwCaasIZcmPbgI9f5hG9kw36q4NH02r551os0dymqT8UNGa1lyO/8cGC HzTTN7BroeocPvU7GP1styqXwT98D1jg2+NxRhyjQkTRK0BNHA+3wTHll8q7h7Py4Mqihf LyPqxo1H6EUfn7uxPx+uPpOcF5LiuDIL1kO+Z+Eqz/W7yPPqu7To3a9+NBPvjxhrrPYdsl c7OQE/mC7O8l3wuL1L2P4znjjYJLwmvjTFUFfTf/YEcCgaehis8BbEmfiz8doMmExxVLPR vp+GyJPEejmzhcfGaNXCBsWukTqnt6NyCD0eYTgk4jWRr+h73oPq0hfajD+d7g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794777706; b=iZULJerqealNz6LHNcQ1u3m1LCSEp5pBEYr+ketXan2PeSNCwXbtXgAS7wjUeX1KrfS0pM Rj7WxORoS/KGJ2ZrD3bccZ4tKQAoIqS4sV2MbncAfOprcwTVzxxEc7Ux6mNAIF9N8vup8I YbsjZiXdONA4Qj9iXbgGVoxYisc5tb9HkHXoXnwQ8XkVR0CMs2dfd0SZn9LXYv53jLJ7xD QED+AhiHgcjvy1HorlFDekherqeGgdYUUt1PPrBRQb+Iq1xzSCYwAT0xawDvsDsKEAUQvb h04PL5Unzw+BBPxdbt+ZJVqF5yJs17qBD7jVhM/LuMmCLbsQO2z68ilvPtDUjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794777706; 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=9eBU4hubpKxK7zPNysHQ8oJBvgSpDbij6W0QKokfnJY=; b=s0F1Y9lJ5Q6g5dA3TP7zznu9QK/BzOICEX9xWoriE+03f+LUJnIsKc3jprOftDEMHVPWl4 sBpUdX780cSdb2qveP7y7a5J/aByQMOepj5eFRqYtwSlybZ/hwSmMZb1Vn6Yz+l84MlU9W UQo6E1z9qS7pJdBJ3jSvX2B9z0PvxVdyvaxqjz3ZIGRor9Zo7oinWOZBvLgSHLhL73npxf G6DQX0E4ZZub/ovTYlZCYey9kGBwaqlVy8Nse7cz9HAOi/oyupO6vsgBmAy9jSTQZw7LrT UGulXDUVQ+k7uP985+Uu+invN8mdzbTeTpI4Z7dXiD6paET2pyagcNmellTuzA== 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 4jSP7t2MY3zPLR for ; Sun, 15 Nov 2026 21:21:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24bbf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Nov 2026 21:21:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Abdelkader Boudih Subject: git: ddf06e985602 - main - asmc: restore SMC state across suspend/resume 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: ddf06e98560237c60dab2809d2b0a9764f9fb747 Auto-Submitted: auto-generated Date: Sun, 15 Nov 2026 21:21:46 +0000 Message-Id: <6afa226a.24bbf.8c67bf1@gitrepo.freebsd.org> The branch main has been updated by seuros: URL: https://cgit.FreeBSD.org/src/commit/?id=ddf06e98560237c60dab2809d2b0a9764f9fb747 commit ddf06e98560237c60dab2809d2b0a9764f9fb747 Author: Abdelkader Boudih AuthorDate: 2026-11-15 21:12:37 +0000 Commit: Abdelkader Boudih CommitDate: 2026-11-15 21:12:37 +0000 asmc: restore SMC state across suspend/resume Reinit the SMS interrupt mask, motion thresholds, and shock window on resume. Guard the backlight rewrite on sc_has_light. Add device_suspend to release manual fan control before sleep and restore it on resume. MFC after: 3 days Reviewed by: ngie Differential Revision: https://reviews.freebsd.org/D61478 --- sys/dev/asmc/asmc.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++-- sys/dev/asmc/asmcvar.h | 1 + 2 files changed, 94 insertions(+), 3 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 9419d7859247..e6b21c848e31 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -72,6 +72,7 @@ static int asmc_probe(device_t dev); static int asmc_attach(device_t dev); static int asmc_detach(device_t dev); +static int asmc_suspend(device_t dev); static int asmc_resume(device_t dev); static void asmc_shutdown(void *arg, int howto); @@ -90,6 +91,8 @@ static int asmc_backlight_get_info(device_t dev, */ static int asmc_init(device_t dev); static int asmc_fan_count(device_t dev); +static int asmc_fan_manual_get(device_t dev, uint16_t *maskp); +static int asmc_fan_manual_set(device_t dev, uint16_t mask); static void asmc_sms_calibrate(device_t dev); static int asmc_sms_intrfast(void *arg); static void asmc_sms_printintr(device_t dev, uint8_t); @@ -110,6 +113,7 @@ static device_method_t asmc_methods[] = { DEVMETHOD(device_probe, asmc_probe), DEVMETHOD(device_attach, asmc_attach), DEVMETHOD(device_detach, asmc_detach), + DEVMETHOD(device_suspend, asmc_suspend), DEVMETHOD(device_resume, asmc_resume), /* Backlight interface */ @@ -386,15 +390,39 @@ asmc_detach(device_t dev) return (0); } +static int +asmc_suspend(device_t dev) +{ + struct asmc_softc *sc = device_get_softc(dev); + + sc->sc_fanmanual_saved = 0; + if (asmc_fan_manual_get(dev, &sc->sc_fanmanual_saved) != 0) + return (0); + if (sc->sc_fanmanual_saved != 0) + asmc_fan_manual_set(dev, 0); + + return (0); +} + static int asmc_resume(device_t dev) { struct asmc_softc *sc = device_get_softc(dev); uint8_t buf[2]; - buf[0] = sc->sc_light_control; - buf[1] = 0x00; - asmc_key_write(dev, ASMC_KEY_LIGHTVALUE, buf, sizeof(buf)); + if (sc->sc_has_light) { + buf[0] = sc->sc_light_control; + buf[1] = 0x00; + asmc_key_write(dev, ASMC_KEY_LIGHTVALUE, buf, sizeof(buf)); + } + + if (sc->sc_fanmanual_saved != 0) { + asmc_fan_manual_set(dev, sc->sc_fanmanual_saved); + sc->sc_fanmanual_saved = 0; + } + + if (sc->sc_has_sms) + asmc_sms_init(dev); return (0); } @@ -961,6 +989,68 @@ asmc_fan_count(device_t dev) return (buf[0]); } +/* T2 Macs keep one key per fan; everything else packs it into FS!. */ +static int +asmc_fan_manual_get(device_t dev, uint16_t *maskp) +{ + struct asmc_softc *sc = device_get_softc(dev); + char fmkey[ASMC_KEYLEN + 1]; + uint8_t buf[2]; + uint16_t mask = 0; + int error; + + if (sc->sc_is_t2) { + for (int i = 0; i < sc->sc_nfan; i++) { + snprintf(fmkey, sizeof(fmkey), + ASMC_KEY_FANMANUAL_T2, i); + if (asmc_key_getinfo(dev, fmkey, NULL, NULL) != 0) + continue; + error = asmc_key_read(dev, fmkey, buf, 1); + if (error != 0) + return (error); + if (buf[0] != 0) + mask |= 1 << i; + } + *maskp = mask; + return (0); + } + + error = asmc_key_read(dev, ASMC_KEY_FANMANUAL, buf, sizeof(buf)); + if (error != 0) + return (error); + *maskp = (buf[0] << 8) | buf[1]; + + return (0); +} + +static int +asmc_fan_manual_set(device_t dev, uint16_t mask) +{ + struct asmc_softc *sc = device_get_softc(dev); + char fmkey[ASMC_KEYLEN + 1]; + uint8_t buf[2]; + int error; + + if (sc->sc_is_t2) { + for (int i = 0; i < sc->sc_nfan; i++) { + snprintf(fmkey, sizeof(fmkey), + ASMC_KEY_FANMANUAL_T2, i); + if (asmc_key_getinfo(dev, fmkey, NULL, NULL) != 0) + continue; + buf[0] = (mask & (1 << i)) != 0; + error = asmc_key_write(dev, fmkey, buf, 1); + if (error != 0) + return (error); + } + return (0); + } + + buf[0] = mask >> 8; + buf[1] = mask & 0xff; + + return (asmc_key_write(dev, ASMC_KEY_FANMANUAL, buf, sizeof(buf))); +} + /* diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index 7d9495536552..da950f0e8d8e 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -72,6 +72,7 @@ struct asmc_softc { struct cdev *sc_kbd_bkl; uint32_t sc_kbd_bkl_level; unsigned int sc_light_control; + uint16_t sc_fanmanual_saved; /* Raw key access; only used when built with ASMC_DEBUG */ struct sysctl_oid *sc_raw_tree; char sc_rawkey[ASMC_KEYLEN + 1];