From nobody Sun Nov 15 21:21:50 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 4jSP7y5fSJz71BBq for ; Sun, 15 Nov 2026 21:21:50 +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 4jSP7y435tz4Cl6 for ; Sun, 15 Nov 2026 21:21:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794777710; 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=ROLZ9mlV2FqBLhu3MiwRLgk2F1Y03p16w/D5cAldWWE=; b=WRmDjP1fGmTiKOq+Ag3fRALKjvnMRH2W6v7fuwst+YPx2q4Ol8zcNg8xd41iTJ88eUSZg4 YeFP9GJfjcgMxTTirw8PFIA7xpHdc4ID2fJ6semeC481wYIUUyApfKn6blMvlo2HJ8zcPA wut2d3YsfKlfZgWFSr4uuuCNbcZ+RNmpzRZMzLJ535x7M/Rcwye8P9jVL99k0r/bgknXq1 zT6N6O4UEwmTCZU8jlN0TYMqBcviLQLGHEGbe47BGd7+29YlEKIeOvxNmlSsuaS5SgiKbK S8/nXq0VihtbD1dG66MBm1T5x6SkNZxrHrUhEFxBs4AsgHPqkKaVp+zRj6SsgA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794777710; b=nJPMU82wPTfyK00PNb/bCRK2eVvIaLtA4e+3eWnH1uY0bDe/uC3/rWIJVhX+FnPPJ1skRy 6O1SVzAsu3l9O5IrWWy02Z/UxB21Lkd51BBff5HInzyrrdlk4kwQr0XKlSi5HcyZhFBIPl 0vTB8O1NYqgr9Mge2AD8qsTqj9POtU4SlFPU7DaEZU92Pcop1uyXPus8gKmyKmcs8T67eM PqcxouLIo7X/rUorp/aeN7wigVjeym4Jd3Da8/HyIhejxjq312rRO6xsYljY3kTyj5x89U lb/wpexCaEg/Zz5Jvlfuj865CB9kFD28kQMQTPMoFmXXyisuH24VNrWNX72XqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794777710; 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=ROLZ9mlV2FqBLhu3MiwRLgk2F1Y03p16w/D5cAldWWE=; b=GxwTkKQhHPt3XrdDcYnf7hsJgKJ99hMjtAD08ZRxVhHKAvDbgvOnzC1ZcmGPw3cxnOlF4X QWV5vHwHjAClWTT3dJQ1m3ibYr5qtho5jWMM+6Wpcr62P+7MGlfGO+PvHSMbqa9q2v41Vr Aeb4nUyldxEnoHLIu5FB8spQkMgL/UHwbsZckewE9yCTDkjWqk9fb/lus17cJonhS4ltOG 3QoyrGgpf7CffyINEC+N/rF9m6aininrEOATuPSxz0D7Js9v4euRFfNc96QZXrH/iSgh4P X84xiLhub9fj9im/Y8m6vMDNj2j5qg20pSf5Xx+kwlB0AVdBINYq5un7c69Oxw== 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 4jSP7y3k1yzP8h for ; Sun, 15 Nov 2026 21:21:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24bc7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Nov 2026 21:21:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Abdelkader Boudih Subject: git: 902b401a51c8 - main - asmc: do not drop shutdown notification when the system node fails 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: 902b401a51c8165a3af23466acabe912c9a48b34 Auto-Submitted: auto-generated Date: Sun, 15 Nov 2026 21:21:50 +0000 Message-Id: <6afa226e.24bc7.75dd3cf8@gitrepo.freebsd.org> The branch main has been updated by seuros: URL: https://cgit.FreeBSD.org/src/commit/?id=902b401a51c8165a3af23466acabe912c9a48b34 commit 902b401a51c8165a3af23466acabe912c9a48b34 Author: Abdelkader Boudih AuthorDate: 2026-11-15 21:12:44 +0000 Commit: Abdelkader Boudih CommitDate: 2026-11-15 21:12:44 +0000 asmc: do not drop shutdown notification when the system node fails asmc_attach() registered the MBSS shutdown-cause handler (EVENTHANDLER_REGISTER(shutdown_pre_sync, asmc_shutdown, ...)) after attempting to add the dev.asmc.N.system sysctl subtree. If that subtree registration failed, the error path took goto nosms, jumping clean over the shutdown-handler registration. On T2 Macs this silently drops the only thing standing between a clean shutdown and bridgeOS's watchdog power-cycling the machine. MFC after: 3 days Reviewed by: ngie Differential Revision: https://reviews.freebsd.org/D61482 --- sys/dev/asmc/asmc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index b4310d77ab5e..f7635b4d7550 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -275,14 +275,13 @@ asmc_attach(device_t dev) "Battery charge limit (0-100)"); } - /* System state / board identity subtree. */ - if (asmc_sysctl_add_system(dev, sysctlctx) != 0) - goto nosms; - if (asmc_key_getinfo(dev, ASMC_KEY_MBSS, NULL, NULL) == 0) sc->sc_shutdown_tag = EVENTHANDLER_REGISTER(shutdown_pre_sync, asmc_shutdown, dev, SHUTDOWN_PRI_FIRST); + /* System state / board identity subtree. */ + (void)asmc_sysctl_add_system(dev, sysctlctx); + if (!sc->sc_has_sms) goto nosms;