From nobody Sun Feb 22 03:59:17 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 4fJVbn4GG0z6SskN for ; Sun, 22 Feb 2026 03:59:17 +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 4fJVbn2NvRz3TNG for ; Sun, 22 Feb 2026 03:59:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771732757; 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=mlSRqedr23mNhdE5qXl39W67D5gbcxQkHa6pLiancEk=; b=Q+ps5wBqAyczST7ZH9C4SmP58YhcyGILWrcfU7uRs/DekDgxhz/Uxba0gYAalLJXY71BNk a83gQBSnAxnjCxb3hKQ5qe/1WH5xKrimG/VwEUkTb3mKbcN/sTRLpsF/1c+QTevwEL4UYq MFVFm0IkP4qKhwws079ToZK/1XEe3QutkJ8zeYldz6j2OT+rldADJdDCgcS51upJNv4UO2 mQIR6YFZl5uynVuBiiQL01u4YdHwdcG2UXRLkOgi0chSVQ3xqDXqm52aDtYPrLZqmTozN2 0vVnNgMT3XJbe+PX8fc9uCwAR2yBRnD2npTLH0SJ1lnziJoQkiJmzFEkdP7UAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771732757; a=rsa-sha256; cv=none; b=XZk2EXRRkAbeP7DpESRVFuGgGN7Ep8LjFmd6tpTwMLcY0rTRNPTlNwBdws6E+k1dHs/UCl dFnfps+wWWXZ/GVORqamDngIMtdAlisua0NR3Vybhn9lf7l5PKLb8CqYGryn/vO57l8B5m J4tl352EyciFa2Q8rKQTUTp/fCmkL9sZjpiylmHhUG08gLsJRm4gIwx1Stmz5b6XCrj55k NxzLqPoafRL3RvI9B4nV/DW45OFr5NaMD8KEL1jfPkKe0/yMlz2epcMzk1ZDFXMejMoBv0 Kbe+AhbE/meEWk1Y+GroX/dFIXKBB512ddKB+XG9DzQ1UWpg3RcN1M3UAlRFjw== 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=1771732757; 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=mlSRqedr23mNhdE5qXl39W67D5gbcxQkHa6pLiancEk=; b=oOBbdugNXggKu2tR1hXJAujyTPd5/M2OLgZcxD3XMHGWbPd62ClRSU7LZLL582eBj8khoQ tHu8z6X0rEXDw1bAirueTT4mdGEegRjQpSsvSS8SCgitZVsUi55tecMHRS2OKVFmxazn4T ENwv50k6aB6sR+7ZGvz1u+RWzNp7zPpzVhk+oeaUjNHjubytoyxc+/ihp5j9lgN+KT3THG vlQbK41tqpBohH1ndWtSYblvcZ0DxgNUcjIrKx/WAbiySe6WXrUn33ob0LMrjzRwfsCBsk ZNQAtD3dmwgyre2FOWbPL9LhcdF/ECZyHFBMZ3bz4eu9gs3U3TtQNZrYMJ5NxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJVbn0Jq6zCJv for ; Sun, 22 Feb 2026 03:59:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22ca2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:59:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 3eddfdd42321 - stable/15 - 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3eddfdd42321bec39635747122acad9625602df3 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:59:17 +0000 Message-Id: <699a7f15.22ca2.4835624a@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=3eddfdd42321bec39635747122acad9625602df3 commit 3eddfdd42321bec39635747122acad9625602df3 Author: Enji Cooper AuthorDate: 2026-01-04 08:27:57 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 03:57:56 +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 | 7 ++++--- sys/conf/options.amd64 | 3 +++ sys/dev/asmc/asmc.c | 20 +++++++++++--------- sys/modules/asmc/Makefile | 2 +- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index e0a9e1b77d93..50637d4adeb7 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -43,9 +43,6 @@ cpu HAMMER # aka K8, aka Opteron & Athlon64 # Optional devices: # -# vt(4) drivers. -device vt_efifb # EFI framebuffer - # 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support. This will create # the /dev/3dfx0 device to work with glide implementations. This should get # linked to /dev/3dfx and /dev/voodoo. Note that this is not the same as @@ -116,6 +113,10 @@ device efidev # EFI RTC device efirtc +# 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 df18abfa8e1e..a3a735731438 100644 --- a/sys/conf/options.amd64 +++ b/sys/conf/options.amd64 @@ -68,3 +68,6 @@ 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 diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 5a1074abde83..da040b1e434a 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -34,6 +34,8 @@ * Inspired by the Linux applesmc driver. */ +#include "opt_asmc.h" + #include #include #include @@ -83,7 +85,7 @@ 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); static void asmc_sms_task(void *arg, int pending); -#ifdef DEBUG +#ifdef ASMC_DEBUG void asmc_dumpall(device_t); static int asmc_key_dump(device_t, int); #endif @@ -515,7 +517,7 @@ static driver_t asmc_driver = { */ #define _COMPONENT ACPI_OEM ACPI_MODULE_NAME("ASMC") -#ifdef DEBUG +#ifdef ASMC_DEBUG #define ASMC_DPRINTF(str) device_printf(dev, str) #else #define ASMC_DPRINTF(str) @@ -828,7 +830,7 @@ asmc_resume(device_t dev) return (0); } -#ifdef DEBUG +#ifdef ASMC_DEBUG void asmc_dumpall(device_t dev) { int i; @@ -930,7 +932,7 @@ nosms: device_printf(dev, "number of keys: %d\n", ntohl(*(uint32_t*)buf)); } -#ifdef DEBUG +#ifdef ASMC_DEBUG asmc_dumpall(dev); #endif @@ -965,19 +967,19 @@ asmc_wait_ack(device_t dev, uint8_t val, int amount) static int asmc_wait(device_t dev, uint8_t val) { -#ifdef DEBUG +#ifdef ASMC_DEBUG struct asmc_softc *sc; #endif if (asmc_wait_ack(dev, val, 1000) == 0) return (0); -#ifdef DEBUG +#ifdef ASMC_DEBUG sc = device_get_softc(dev); #endif val = val & ASMC_STATUS_MASK; -#ifdef DEBUG +#ifdef ASMC_DEBUG device_printf(dev, "%s failed: 0x%x, 0x%x\n", __func__, val, ASMC_CMDPORT_READ(sc)); #endif @@ -1000,7 +1002,7 @@ asmc_command(device_t dev, uint8_t command) { } } -#ifdef DEBUG +#ifdef ASMC_DEBUG device_printf(dev, "%s failed: 0x%x, 0x%x\n", __func__, command, ASMC_CMDPORT_READ(sc)); #endif @@ -1046,7 +1048,7 @@ out: return (error); } -#ifdef DEBUG +#ifdef ASMC_DEBUG static int asmc_key_dump(device_t dev, int number) { diff --git a/sys/modules/asmc/Makefile b/sys/modules/asmc/Makefile index f1b4a981ad24..4ba45a4625d8 100644 --- a/sys/modules/asmc/Makefile +++ b/sys/modules/asmc/Makefile @@ -1,6 +1,6 @@ .PATH: ${SRCTOP}/sys/dev/asmc KMOD= asmc -SRCS= asmc.c opt_acpi.h acpi_if.h bus_if.h device_if.h +SRCS= asmc.c opt_acpi.h opt_asmc.h acpi_if.h bus_if.h device_if.h .include