From nobody Wed Mar 25 22:12:42 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 4fh1PC3rYPz6WrRn for ; Wed, 25 Mar 2026 22:12:47 +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 4fh1P62Zllz46pr for ; Wed, 25 Mar 2026 22:12:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774476762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RW/bcMpyPPs/ighrw1G+Oar25iHFoyC7ph7DdIYbGFo=; b=bW215nx3PrQfyLdSPXHO+7KtVjND91fgp55B0XSp6Il3tx2OGJlyYEYFWmTKYbj5ssUoIJ sG91PzRxkKpbY5fB3LyqAFBPCbejp1QY9Ldht93FMuyziZeuB8ABhfH7eL6qbHX77Kybch tyJwPNxYA0/RYVnNqZa/z9o3/m3FDxYXcX/kp97hvInZo2HzDwbus9VEYLC1eTzKpWgYqm 7h5T5XbRdEqrj10HaaK1ptRUeklwOtz/UgiiGtaSCUAlLrP+sYLq6S7BAvHrfG0ieTS1bv iLvc8aJLg0mub605Tcp7NPQnPulWrVjTf3oj4MXpOmO7gcjetpZo4sjo/zo3wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774476762; a=rsa-sha256; cv=none; b=dwaz0vPg8TNYE4zIeFWE+6WmrEn2zPsVI08gExWKqTEhFQi3nK8nP2vkHG+1m3HcUngZBu pnFtD+mqwgDRF14OruTpEc/aSJPq7Cgv/hRg4TDnME5+0LGm8JPUn7LD30xRaEi2Xmynro eHAPZ7+mJGbFer40BZ/UUHNQaoq+MvnlczO6tJvXGmbiQtJmXQMwUdiV4g2Z3QVA6YZTSy xs2x/vb5/hBarJ/gchC8j7xzGCGVgxB/6WAFTpbCxUIi23rvyN7msW2Vhnz5BnZTStYEV2 vZvmh5+zBYuMNGo6t2c/42uaZ0D0YRYKm32Vd/BKxFpb1Q73RPxcMC1WwKi+YQ== 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=1774476762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RW/bcMpyPPs/ighrw1G+Oar25iHFoyC7ph7DdIYbGFo=; b=MqZ4yX7rWPKRYV9WJ3liA12jR1guw22i50tq5OSVTiSuxstv17LpupliXu4zTiDbZn1JGP ilLHNIBBQvqSNBRK/J48WBA0ZUQ4CBR7jMu61efCe1+u9/sqN/rtCSzgFwbj5pcgR3GfW3 DbofJ3pbuC9z8LPAsJHOe3UuC+apQDqnydjyOqMy/ktN1O1fTm9o0BG4p+1SFO+Hlef+s4 c33hHf9as3tE6rJsFz2GABvM2kATJP3KrZiZdO5iTxk1CvUkhCqzd1bqbVJaacsv98HvH8 RJIhTUvRZ3qP0g0bKawdz5Gm81qwLp14Yz3oDJ53KCIx7blhKK7T1Nbj+3wSsw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fh1P621Dwz8Gf for ; Wed, 25 Mar 2026 22:12:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36634 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Mar 2026 22:12:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Enji Cooper From: Warner Losh Subject: git: 12e1ab887d58 - stable/14 - Add ASMC_DEBUG make option 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 12e1ab887d58d18069554e0b5311d43d4ca50df0 Auto-Submitted: auto-generated Date: Wed, 25 Mar 2026 22:12:42 +0000 Message-Id: <69c45dda.36634.71716e05@gitrepo.freebsd.org> The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=12e1ab887d58d18069554e0b5311d43d4ca50df0 commit 12e1ab887d58d18069554e0b5311d43d4ca50df0 Author: Enji Cooper AuthorDate: 2026-01-04 08:27:57 +0000 Commit: Warner Losh CommitDate: 2026-03-25 20:36:34 +0000 Add ASMC_DEBUG make option This allows folks to enable debug statements in asmc(4) using kernel configs via the `options ASMC_DEBUG` directive. While here, remove a duplicate `device vt_efifb` directive in `NOTES` as it's already handled in the `GENERIC` config MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54511 (cherry picked from commit f224591746bdaf14ad5f63de4738a3146cc2f55f) --- sys/amd64/conf/NOTES | 4 ++++ sys/conf/options.amd64 | 3 +++ 2 files changed, 7 insertions(+) diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index 55f631675bbe..187d5676d55e 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -111,6 +111,10 @@ options EFIRT device asmc options ASMC_DEBUG # Enable asmc(4)-specific debug logic. +# Apple System Management Controller (SMC) +device asmc +options ASMC_DEBUG # Enable asmc(4)-specific debug logic. + # # Intel QuickAssist driver with OpenCrypto support # diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64 index c7c1f4da2a4a..a3a735731438 100644 --- a/sys/conf/options.amd64 +++ b/sys/conf/options.amd64 @@ -66,5 +66,8 @@ NO_LEGACY_PCIB opt_cpu.h # Compatibility with Linux MP table bugs. MPTABLE_LINUX_BUG_COMPAT +# x86 specific uart options +UART_NS8250_EARLY_PORT opt_uart.h + # Enable asmc(4)-specific debug logic. ASMC_DEBUG opt_asmc.h