From nobody Mon Feb 10 14:52:55 2025 X-Original-To: dev-commits-src-branches@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 4Ys6y034Twz5mH7b; Mon, 10 Feb 2025 14:52:56 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6xz3RFKz4Lkq; Mon, 10 Feb 2025 14:52:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199175; 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=8rlWIaD7+Z5vOycX/VH8sphzr4F2q4XYX8ExB94onf0=; b=jb+IpzNqvjMVOsNoLNBTMXWhaNFLpLnfnVzYcF10n0PNVt7B4UQtDqVXe6bkjnubTOKzB/ MRo8CxYocdkkNnxeawz2edaJn0sQIo7cSONdLH1xH15KsEe4PiuTwu6ExbsQLEIC7+fEst FMG+NEG2XrDKVAK0E1UGKJ6IhjE52huQfrwGP+7CjNV+ABruC3KfYXQKbvxiGHxR7v4rJe F10SLD0+ydoN0qBrM0J1QWKcq0aSzWfbyChRWKpF77waEmxpprn30bFCpXgWVHFjKu4Cuc CPIrig47I+U7DBi4v+CiGXIPU5cAnHQV4gSvGUKOP4htcyyQvMcGGLMyaMJCsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199175; 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=8rlWIaD7+Z5vOycX/VH8sphzr4F2q4XYX8ExB94onf0=; b=jC0U3mhp86HHRW88MLiVjQm5QPxkBHCbReAM2Q2KTOpSs08dxsL9uSdOOQNqU1/LncBq8s wtJRFmoPHRhXyDA7WGKukVtSqHTZ8Mk3PwC8rN/O9/ZdRZyfaCyNwpRRClJgG6haYbj/ic 9B009LB5EOt+JexAxPbKPrXxzLrOsN2DmXl1ifj69K2+SBADL2vstdwpMOMl3VqAKqi2B1 eN6d24tzGN3TERMzxuCFva5Jgn/1IFg0P4O+MYL9tj2O4iPVOjT0y5U8rVy41cvdvwR1AL 56g7Ppa3yztUnFCy7HUMFXPbFvaWQPzj9Xnc34WxnBeZC8mfrVtq8pbUaKPCnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199175; a=rsa-sha256; cv=none; b=BOI5khUK2/nNHS7ddvcW/0UIpDs9G/ZgcGQ/prloCLsqkDcp82umG51mjIeiVGA5gGusz5 grTXYMr2MrK+skRazX4ezSKh4Svv//Y/QxzHDYhJAeYDN7jsUzakVTKyABsvoMThIrC2/a pP1NRWAurlMrtixdU+fmG1PmYId9NSsWXVEGef0iUOJVMxg1K5oQVIszLY2Qi+VwVvw5yW B2AdQrZiep5BIA3yCvrOmfufFVmSGq1NcftDrtGGrlhuiTSAEPOSrIzm9Oaq7n0NECvNwz 6tnkzfa8YBy1PVqE9BmEMpQo/FpuTaoKonD+TadGx4sI2qQZX63FWE+vSGaFow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6xz2Zm2zXZB; Mon, 10 Feb 2025 14:52:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEqtTp028394; Mon, 10 Feb 2025 14:52:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqtIE028391; Mon, 10 Feb 2025 14:52:55 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:55 GMT Message-Id: <202502101452.51AEqtIE028391@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: bd42a2567348 - stable/14 - LinuxKPI: 802.11: turn on debugfs for iwlwifi and rtw88 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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/14 X-Git-Reftype: branch X-Git-Commit: bd42a2567348e88c2fafa6adeadac01b86b1a95c Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=bd42a2567348e88c2fafa6adeadac01b86b1a95c commit bd42a2567348e88c2fafa6adeadac01b86b1a95c Author: Bjoern A. Zeeb AuthorDate: 2024-12-28 09:52:45 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:11 +0000 LinuxKPI: 802.11: turn on debugfs for iwlwifi and rtw88 Make iwlwifi compile with debugfs after the last updates and turn it on for both iwlwifi and rtw88 in order to be able to get at least some useful information on driver/firwmare state. Sponsored by: The FreeBSD Foundation (cherry picked from commit 07f6575585bf69ae48dffe87c4578057ae4782d8) --- sys/compat/linuxkpi/common/include/net/mac80211.h | 4 ++++ sys/contrib/dev/iwlwifi/mvm/debugfs-vif.c | 2 ++ sys/modules/iwlwifi/Makefile | 2 +- sys/modules/rtw88/Makefile | 5 ++++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 67c291fc2b89..8872be569e44 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -737,6 +737,7 @@ struct ieee80211_sta_agg { }; struct ieee80211_link_sta { + struct ieee80211_sta *sta; uint8_t addr[ETH_ALEN]; uint8_t link_id; uint32_t supp_rates[NUM_NL80211_BANDS]; @@ -1121,6 +1122,9 @@ struct ieee80211_ops { /* #ifdef CONFIG_MAC80211_DEBUGFS */ /* Do not change depending on compile-time option. */ void (*sta_add_debugfs)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *, struct dentry *); + void (*vif_add_debugfs)(struct ieee80211_hw *, struct ieee80211_vif *); + void (*link_sta_add_debugfs)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_link_sta *, struct dentry *); + void (*link_add_debugfs)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_bss_conf *, struct dentry *); /* #endif */ }; diff --git a/sys/contrib/dev/iwlwifi/mvm/debugfs-vif.c b/sys/contrib/dev/iwlwifi/mvm/debugfs-vif.c index aa5058955323..0b3bc62f39a7 100644 --- a/sys/contrib/dev/iwlwifi/mvm/debugfs-vif.c +++ b/sys/contrib/dev/iwlwifi/mvm/debugfs-vif.c @@ -888,10 +888,12 @@ void iwl_mvm_vif_add_debugfs(struct ieee80211_hw *hw, struct ieee80211_vif *vif) void iwl_mvm_vif_dbgfs_add_link(struct iwl_mvm *mvm, struct ieee80211_vif *vif) { struct dentry *dbgfs_dir = vif->debugfs_dir; +#if defined(__linux__) struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif); char buf[3 * 3 + 11 + (NL80211_WIPHY_NAME_MAXLEN + 1) + (7 + IFNAMSIZ + 1) + 6 + 1]; char name[7 + IFNAMSIZ + 1]; +#endif /* this will happen in monitor mode */ if (!dbgfs_dir) diff --git a/sys/modules/iwlwifi/Makefile b/sys/modules/iwlwifi/Makefile index e69cac51dae2..3508f29979a8 100644 --- a/sys/modules/iwlwifi/Makefile +++ b/sys/modules/iwlwifi/Makefile @@ -4,7 +4,7 @@ DEVIWLWIFIDIR= ${SRCTOP}/sys/contrib/dev/iwlwifi .PATH: ${DEVIWLWIFIDIR} WITH_CONFIG_PM= 0 -WITH_DEBUGFS= 0 +WITH_DEBUGFS= 1 KMOD= if_iwlwifi diff --git a/sys/modules/rtw88/Makefile b/sys/modules/rtw88/Makefile index d9613b38eadf..bc4c3eb848ea 100644 --- a/sys/modules/rtw88/Makefile +++ b/sys/modules/rtw88/Makefile @@ -4,6 +4,7 @@ DEVRTW88DIR= ${SRCTOP}/sys/contrib/dev/rtw88 .PATH: ${DEVRTW88DIR} WITH_CONFIG_PM= 0 +WITH_DEBUGFS= 1 KMOD= if_rtw88 @@ -40,6 +41,8 @@ CFLAGS+= -DLINUXKPI_VERSION=60800 CFLAGS+= -I${DEVRTW88DIR} CFLAGS+= ${LINUXKPI_INCLUDES} CFLAGS+= -DCONFIG_RTW88_DEBUG -#CFLAGS+= -DCONFIG_RTW88_DEBUGFS +.if defined(WITH_DEBUGFS) && ${WITH_DEBUGFS} > 0 +CFLAGS+= -DCONFIG_RTW88_DEBUGFS +.endif .include