From nobody Mon Jul 27 00:10:52 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 4h7fBj0Z85z6m9SF for ; Mon, 27 Jul 2026 00:10:53 +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 4h7fBh4TRjz43n2 for ; Mon, 27 Jul 2026 00:10:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785111052; 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=tPniUH87EJiI4irqWNHG/QGnAVGRFl1ngjyoGhgT6EY=; b=Dhsv1G9uS3IcFGQMRiLOPQ2aEnYOm4naCpLju/CpRX6CBNJNhfG73OTJYX8AetmLACsCsL vlorUyhg/bGnnQYBYJqff8+liVYLv/x1w9Kaee6cjXynY+FH9OisEvEgP01OxrUZNmiJTQ K9ZiWaJ3IIFR3qmTMatxZz84dUvht5oA9lqfXqTRNRDuKoLx01UPYVS/sup8dCmCbkIs12 acVmJSiHCCkk/39Xk51GNmr2uZ7Ey22Jq3Oc1L5PrevSQg2juVHdr0xYQqBFId2RVf0ruE MHk/epTNcMqgq7KQ5AuYDdqgc0tBSJaeqve2gJukAoqEEky88kopY8eWtRzP6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785111052; a=rsa-sha256; cv=none; b=ZOddPVqfYq/fcAIFza6JBXiQhJqEnztdEIi3EVi7iZNKFcF7ccCke0Zc+M5tF4Zimfl04B p0cKfUxHqkAKcDPvp22k4yECjlK3vKs3Keb83k6gEBunxskKT2IaAxwwkbsfDVDCaXlXdw Im8+gNeUgTxpSMbTvl6DEnZUOMx/gd4PdZsL1L+xj2rH7CZaxS59cQ+9HRE2YG6zZvT6QC 7XoCD7aiHJTEjM0jbd6mmHJpu6G5Nfvvmibi2zLVa9NLvStWlpgMTJeqwkSP4pJJ/4A+eL vai8Vnm8mD2Zxf5lDIC3BhQFPpR3hQKxZLef7aKiagC7DQ25iHvwJYUjMfh3eg== 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=1785111052; 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=tPniUH87EJiI4irqWNHG/QGnAVGRFl1ngjyoGhgT6EY=; b=O4MMxFbPRKTb+EH7apyhTIOis7xPq7mDvJtknkfilh50vJR7DJgFjLTt6HK3PiHJd1jGqH N+9WuwELSO8S4517ILdTvHRYIZ1ih8wIzniGkN3CALL5dk0sPUcgUxVzTW+ZRaV8OyNqXb +2QkhTyUt8syUGthACOZe/sw5DueNFY5WHjUobmEaoaM0/8GzqNoIIrIbMOjLZILUEgTao k3/G8OR3zsdr0LZuvtfGyeI5ukTVZYHjCnsgpQ1cNqr2s6gOakPHQyKouDi9P9vD3Mex4e by6cX2sNMEmeNqt0us9fM2AxKZQ6y8ZF3jSzxxODHBX7kCbe5Axho+ikNUagWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h7fBh3LgyzlMT for ; Mon, 27 Jul 2026 00:10:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26da6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Jul 2026 00:10:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: ea8db6b6d98c - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: ea8db6b6d98c5ebfb3c340ca78f96beceb2ac269 Auto-Submitted: auto-generated Date: Mon, 27 Jul 2026 00:10:52 +0000 Message-Id: <6a66a20c.26da6.320baf6d@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ea8db6b6d98c5ebfb3c340ca78f96beceb2ac269 commit ea8db6b6d98c5ebfb3c340ca78f96beceb2ac269 Author: Bjoern A. Zeeb AuthorDate: 2026-07-11 13:40:29 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-07-26 16:49:16 +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 (cherry picked from commit ec17c2454bf03f954e460bfe3c95e35f638ba71e) --- 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