From nobody Mon Jul 13 14:59: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 4gzQZN1NZ4z6lM9h for ; Mon, 13 Jul 2026 14:59:24 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gzQZM6Qzwz3q9k for ; Mon, 13 Jul 2026 14:59:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783954763; 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=mTEcqym0jvczHJu7cWYJox+acNfc0W9Nmpny+vmcDjc=; b=q44YENQmdLDKmWIFKgEpuPfqDw6uKPWkWsD5r3UlSElnRhwDqIwhjDzkTbskIDAmLp8xp0 ES7oQePV1glqEtkOzcAHR9h/PubrLHsPmTgSZ+XRPKhEg13NGaysy6fXZ4+tOuRaqA/4+q Fz3tf3vtJiS1Lswr7w/Nai0Oabmg/zBwdMOr7y4E7XHHn8NOP/t08WnkLQYwsN7xw0Z/M9 t2YqAhE29BQkXE+LGC/0tx6AzqIhamqPmgTW6GDKX1XytlGawKf+6IZzIFICW0/SqXT7y4 KUeeuqUnmQu5U6IJrpeYTnpxY8dcvYh6ND7zq5B/O+rGC3z3vDfsk+oMKzzKww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783954763; a=rsa-sha256; cv=none; b=l0JIWOXw3WhTA6cJwHqdob8MkOiXkZtv6rZUZjgbvjfJFrZuP/lqW6F0XbrnpwMH/GhYxq VONE67UiQqfGO1RetYyhNu1yUf8S392aYMBVJdJZUQnczi4Z2xhvNW+hFoKcNsQZ3QBoIR WLTEDd9s7pbTj6prK7HB0urJLcOJNDFPHDifkTtCins5ySSS4nBEKKMvRoLPXBEFNJq16j 8pfPySyDzYQhsw2qTAlz50LjWu9k12xpP15ewxTatUQ2ptf5XidFg00E8zIKe9wCUg+2Iz 9uA1/8M2Isg3CxHweDuQIsUjN3CsdI1TLG1MFYcH9Y+m5LCOBkCwCsixeEhR7Q== 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=1783954763; 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=mTEcqym0jvczHJu7cWYJox+acNfc0W9Nmpny+vmcDjc=; b=hOIE3g04fAuAvg6gdszPYEedX5y8B7AVPftTvjl9Qr+Ze1x+OOvRWfkxlrXgtRvz777+wk 4T4FX9F8m3/Ijl06dCMvMeGJxzD9TKF7l4bUEmxTeemMQ99CmGUu/pyXYFtn7rppLXQFHM ASgsXAs2i+hKQEzvc5175B+rkfbyb2duShrdPPmIzpXMSR22IOe5jgmvICA+f99iQr3DrJ eXHdKKDk1nSG4cUM8vF16mfWan8dXd5YQ3lzSTPoyfOHJVm3i229kxyr+7CVDZQn1mfbkP OCor4/PaiuiDzs9U0votmxKQpT2JzqoYsIbooMYdtjBFeuO9nZbFtQWgtXm7Ug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gzQZM5WrTz13Qg for ; Mon, 13 Jul 2026 14:59:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cef7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Jul 2026 14:59:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: ec17c2454bf0 - main - mt76: further adjust debugfs compile time options 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 List-Id: 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec17c2454bf03f954e460bfe3c95e35f638ba71e Auto-Submitted: auto-generated Date: Mon, 13 Jul 2026 14:59:23 +0000 Message-Id: <6a54fd4b.3cef7.6687aff3@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ec17c2454bf03f954e460bfe3c95e35f638ba71e commit ec17c2454bf03f954e460bfe3c95e35f638ba71e Author: Bjoern A. Zeeb AuthorDate: 2026-07-11 13:40:29 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-07-13 14:58:24 +0000 mt76: further adjust debugfs compile time options The debugfs options between the various modules (core and chipsets) are not 100% de-coupled. This means we may run into unresolveable symbols at load time of the modules if we enable certain options generally or for core but not for the chipset. For now: always build the core module with debugfs support. Migrate the CONFIG_MAC80211_DEBUGFS flag into the Makefile of each chipset so we can individually turn it on. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/modules/mt76/Makefile.inc | 5 ----- sys/modules/mt76/core/Makefile | 3 +++ sys/modules/mt76/mt7615/Makefile | 1 + sys/modules/mt76/mt7915/Makefile | 1 + sys/modules/mt76/mt7921/Makefile | 1 + sys/modules/mt76/mt7925/Makefile | 1 + sys/modules/mt76/mt7996/Makefile | 1 + 7 files changed, 8 insertions(+), 5 deletions(-) diff --git a/sys/modules/mt76/Makefile.inc b/sys/modules/mt76/Makefile.inc index 72fcacab15cd..27151f99087a 100644 --- a/sys/modules/mt76/Makefile.inc +++ b/sys/modules/mt76/Makefile.inc @@ -14,7 +14,6 @@ MT76_USB= 0 # General options for common code so drivers can check. MT76_ACPI?= 0 MT76_CONFIG_PM?= 0 -MT76_DEBUGFS?= 1 MT76_SOC_WED?= 0 # Other @@ -28,10 +27,6 @@ CFLAGS+= -DCONFIG_ARCH_DMA_ADDR_T_64BIT CFLAGS+= -DCONFIG_PM .endif -.if defined(MT76_DEBUGFS) && ${MT76_DEBUGFS} > 0 -CFLAGS+= -DCONFIG_MAC80211_DEBUGFS -.endif - .if defined(MT76_SOC_WED) && ${MT76_SOC_WED} > 0 CFLAGS+= -DCONFIG_NET_MEDIATEK_SOC_WED .endif diff --git a/sys/modules/mt76/core/Makefile b/sys/modules/mt76/core/Makefile index e4e65d8e3c24..59d34df86f70 100644 --- a/sys/modules/mt76/core/Makefile +++ b/sys/modules/mt76/core/Makefile @@ -6,6 +6,8 @@ KMOD= ${MT76_DRIVER_NAME} .PATH: ${COMMONDIR} +MT76_DEBUGFS?= 1 + # Basic stuff. SRCS+= mac80211.c mmio.c util.c dma.c eeprom.c tx.c agg-rx.c mcu.c SRCS+= channel.c scan.c wed.c @@ -47,6 +49,7 @@ SRCS+= mt792x_debugfs.c .if defined(MT76_DEBUGFS) && ${MT76_DEBUGFS} > 0 SRCS+= debugfs.c +CFLAGS+= -DCONFIG_MAC80211_DEBUGFS .endif #SRCS+= trace.c diff --git a/sys/modules/mt76/mt7615/Makefile b/sys/modules/mt76/mt7615/Makefile index 6eb650a8439a..345e7301d3a9 100644 --- a/sys/modules/mt76/mt7615/Makefile +++ b/sys/modules/mt76/mt7615/Makefile @@ -23,6 +23,7 @@ SRCS+= dma.c mmio.c pci.c pci_init.c pci_mac.c .if defined(MT7615_DEBUGFS) && ${MT7615_DEBUGFS} > 0 SRCS+= debugfs.c CFLAGS+= -DCONFIG_MT7915_DEBUGFS +CFLAGS+= -DCONFIG_MAC80211_DEBUGFS .endif .if defined(MT7615_DEV_COREDUMP) && ${MT7615_DEV_COREDUMP} > 0 diff --git a/sys/modules/mt76/mt7915/Makefile b/sys/modules/mt76/mt7915/Makefile index 580fde3b7aa7..0fa7d9903344 100644 --- a/sys/modules/mt76/mt7915/Makefile +++ b/sys/modules/mt76/mt7915/Makefile @@ -27,6 +27,7 @@ CFLAGS+= -DCONFIG_MT798X_WMAC .if defined(MT7915_DEBUGFS) && ${MT7915_DEBUGFS} > 0 SRCS+= debugfs.c CFLAGS+= -DCONFIG_MT7915_DEBUGFS +CFLAGS+= -DCONFIG_MAC80211_DEBUGFS .endif .if defined(MT7915_DEV_COREDUMP) && ${MT7915_DEV_COREDUMP} > 0 diff --git a/sys/modules/mt76/mt7921/Makefile b/sys/modules/mt76/mt7921/Makefile index 2cf55ac506c6..d1def787144c 100644 --- a/sys/modules/mt76/mt7921/Makefile +++ b/sys/modules/mt76/mt7921/Makefile @@ -34,6 +34,7 @@ SRCS+= usb.c .if defined(MT7921_DEBUGFS) && ${MT7921_DEBUGFS} > 0 SRCS+= debugfs.c CFLAGS+= -DCONFIG_MT7921_DEBUGFS +CFLAGS+= -DCONFIG_MAC80211_DEBUGFS .endif .include diff --git a/sys/modules/mt76/mt7925/Makefile b/sys/modules/mt76/mt7925/Makefile index c8477eadd7f5..047dc9157bf8 100644 --- a/sys/modules/mt76/mt7925/Makefile +++ b/sys/modules/mt76/mt7925/Makefile @@ -27,6 +27,7 @@ SRCS+= usb.c .if defined(MT7925_DEBUGFS) && ${MT7925_DEBUGFS} > 0 SRCS+= debugfs.c CFLAGS+= -DCONFIG_MT7925_DEBUGFS +CFLAGS+= -DCONFIG_MAC80211_DEBUGFS .endif .include diff --git a/sys/modules/mt76/mt7996/Makefile b/sys/modules/mt76/mt7996/Makefile index 97de923c84ab..e66a9610d1dd 100644 --- a/sys/modules/mt76/mt7996/Makefile +++ b/sys/modules/mt76/mt7996/Makefile @@ -21,6 +21,7 @@ SRCS+= pci.c dma.c .if defined(MT7996_DEBUGFS) && ${MT7996_DEBUGFS} > 0 SRCS+= debugfs.c CFLAGS+= -DCONFIG_MT7996_DEBUGFS +CFLAGS+= -DCONFIG_MAC80211_DEBUGFS .endif .if defined(MT7996_DEV_COREDUMP) && ${MT7996_DEV_COREDUMP} > 0