From nobody Sun Jun 14 23:15:26 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 4gdpy712V6z6hf26 for ; Sun, 14 Jun 2026 23:15:27 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gdpy65Kmdz3kZW for ; Sun, 14 Jun 2026 23:15:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781478926; 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=EWRl+SAyrsVE1cwOgQqf9Hz5r6IexjQg6mpiAOncbUc=; b=xNGCss8bkkmTqIg6B/JmVuBkozMtFBWhcqG1zZs5HtxSfa6gyNxOFUKyfrtIARdOh2uhvv 18GsLqQE+j6zorNZ5FdNSSLUW2W0tTEKLq+bAQA/u66/9coM8ncOsmmafEiiL8sFpvoDUE xM0r5uskax1ZwHS/M+NI1RnpO3BnlQs5+1MaoK05G+QAciaP1HKvg2IRA8r/4G5gOLNMd7 shT0eHeLx40mi8oM3lg7xT4MPuOd5ATkupysgijr3EBya1vN0/yo89QcANkjKJHEhOAkNs xViX28KrgeWb6e2dxl523sYYM/+G/VN3TKAdwNOftvrQ3gOoMRLV+8WZ3FlqZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781478926; a=rsa-sha256; cv=none; b=LYF46M2yobZw0m4RYn33fCnRuqyh6A5ou/L7NYbW/cXUBKPCJCI8CYxw5DzrHLvQH6g7Jq N4lRwmHgQzTfBZqpBayg6Wb3lRS8uBrygGyLNArJtcdEzG6ci943ys/GtW6uuz4nG8ajw5 yP6FeYHmNF/YOiL2kSlGMIB1xj0psRwqQNQSXB+PoTljG9fTx2GqXaBMzjXUYJ636ZOHQj Q+SLLogiqCEvJUj1yPSzWCjw4H/qeuDfAlI2OFlr4ocu6LwxWs9Z6DwKA4VOi7dJ8xgk4/ LCuOcrDkvFlpOjb6wYNHxni7rqjID088/gHGuRWEn/XbUYq1QEACNILAa8+ZxQ== 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=1781478926; 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=EWRl+SAyrsVE1cwOgQqf9Hz5r6IexjQg6mpiAOncbUc=; b=GDIiwFFBTy0waawiIsBL4N3yNvy6cgbWqHiKGUwJuKW2O9J1IS8yMb6UC7w45Xxw1hYUGt 7Pwla4xMrZcvmeTh3QdTrNn3t1UtWDEvXxYBa8xJabsHtU9E0JFWgnWT1Y1EnEFE73Ug0Z p8nqZdCr6WTo9W/02UJ2nOP51layzraxSD3eIzynNDmhfveV0hp3BHBeA9dmRdyUALe92Q O6DYeW2tyZpIiugMslPfL3nAPTjfsBt8IORnlCMF4HAcbRK1C72HGTgbcKA/6UtQkcGeE7 EMlZCX+Fj/SdfZ2aDA0vaFnko211YcIh/9Pgd2xEljVPWH4qFBdX4wF7Ul9yeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gdpy64p1dzTcw for ; Sun, 14 Jun 2026 23:15:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47412 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 14 Jun 2026 23:15:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 134e90e01da1 - main - mt76: mt7921: depend on lindebugfs and turn debugfs support on 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: 134e90e01da181a6048f0ca3368e466818def1b3 Auto-Submitted: auto-generated Date: Sun, 14 Jun 2026 23:15:26 +0000 Message-Id: <6a2f360e.47412.869f05b@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=134e90e01da181a6048f0ca3368e466818def1b3 commit 134e90e01da181a6048f0ca3368e466818def1b3 Author: Bjoern A. Zeeb AuthorDate: 2026-06-10 11:24:04 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-06-14 22:55:53 +0000 mt76: mt7921: depend on lindebugfs and turn debugfs support on Add the missing MODULE_DEPEND() calls for lindebugfs. It is unfortunate that they are shared code between various bus implementations. Ideally we would leave the MODULE_DEPEND() calls in the debugfs.c file instead of adding extra #ifdef guards to the bus attachment files. Turn debugfs support on for mt76(core) and the mt7921 module for now. Sponsonred by: The FreeBSD Foundation MFC after: 3 days --- sys/contrib/dev/mediatek/mt76/debugfs.c | 3 +++ sys/contrib/dev/mediatek/mt76/mt7921/pci.c | 3 +++ sys/contrib/dev/mediatek/mt76/mt7921/usb.c | 3 +++ sys/modules/mt76/Makefile.inc | 2 +- sys/modules/mt76/mt7921/Makefile | 2 +- 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/sys/contrib/dev/mediatek/mt76/debugfs.c b/sys/contrib/dev/mediatek/mt76/debugfs.c index a5ac6ca86735..344ccdc98293 100644 --- a/sys/contrib/dev/mediatek/mt76/debugfs.c +++ b/sys/contrib/dev/mediatek/mt76/debugfs.c @@ -124,3 +124,6 @@ mt76_register_debugfs_fops(struct mt76_phy *phy, return dir; } EXPORT_SYMBOL_GPL(mt76_register_debugfs_fops); +#if defined(__FreeBSD__) +MODULE_DEPEND(mt76_core, lindebugfs, 1, 1, 1); +#endif diff --git a/sys/contrib/dev/mediatek/mt76/mt7921/pci.c b/sys/contrib/dev/mediatek/mt76/mt7921/pci.c index b70335aba6bf..901a10986e58 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7921/pci.c +++ b/sys/contrib/dev/mediatek/mt76/mt7921/pci.c @@ -609,4 +609,7 @@ MODULE_VERSION(mt7921_pci, 1); MODULE_DEPEND(mt7921_pci, mt76_core, 1, 1, 1); MODULE_DEPEND(mt7921_pci, linuxkpi, 1, 1, 1); MODULE_DEPEND(mt7921_pci, linuxkpi_wlan, 1, 1, 1); +#if defined(CONFIG_MT7921_DEBUGFS) +MODULE_DEPEND(mt7921_pci, lindebugfs, 1, 1, 1); +#endif #endif diff --git a/sys/contrib/dev/mediatek/mt76/mt7921/usb.c b/sys/contrib/dev/mediatek/mt76/mt7921/usb.c index 64881ef7cbf4..a02dd21ef557 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7921/usb.c +++ b/sys/contrib/dev/mediatek/mt76/mt7921/usb.c @@ -352,4 +352,7 @@ MODULE_DEPEND(mt7921_usb, mt76_core, 1, 1, 1); MODULE_DEPEND(mt7921_usb, linuxkpi, 1, 1, 1); MODULE_DEPEND(mt7921_usb, linuxkpi_wlan, 1, 1, 1); MODULE_DEPEND(mt7921_usb, linuxkpi_usb, 1, 1, 1); +#if defined(CONFIG_MT7921_DEBUGFS) +MODULE_DEPEND(mt7921_usb, lindebugfs, 1, 1, 1); +#endif #endif diff --git a/sys/modules/mt76/Makefile.inc b/sys/modules/mt76/Makefile.inc index 5aa19fe183af..72fcacab15cd 100644 --- a/sys/modules/mt76/Makefile.inc +++ b/sys/modules/mt76/Makefile.inc @@ -14,7 +14,7 @@ MT76_USB= 0 # General options for common code so drivers can check. MT76_ACPI?= 0 MT76_CONFIG_PM?= 0 -MT76_DEBUGFS?= 0 +MT76_DEBUGFS?= 1 MT76_SOC_WED?= 0 # Other diff --git a/sys/modules/mt76/mt7921/Makefile b/sys/modules/mt76/mt7921/Makefile index b6dbe88204a3..2cf55ac506c6 100644 --- a/sys/modules/mt76/mt7921/Makefile +++ b/sys/modules/mt76/mt7921/Makefile @@ -8,7 +8,7 @@ MT7921_PCI= 1 MT7921_SDIO= 0 MT7921_USB= 0 -MT7921_DEBUGFS= 0 +MT7921_DEBUGFS= 1 # Common stuff. SRCS+= init.c main.c mac.c mcu.c