From nobody Fri Jan 31 23:53:45 2025 X-Original-To: dev-commits-src-main@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 4YlCQd574xz5m2q8; Fri, 31 Jan 2025 23:53:45 +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 4YlCQd3ljfz3yHJ; Fri, 31 Jan 2025 23:53:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738367625; 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=9iRxiwu0LPFINepueVMSflfxLZJcGSKKRtG1wTvefN8=; b=Fr5EVh+3C7nutAcsF4D2OmbCJOohKRM64duMhNZdYJRykv8bu7CA8pCBRB+Xc7fGUxCajl uFYRfdAlta84LyEAnKfguhm/dvP4eqBHtQGoHMOdV6ECSj7QR5BSWtGel1v7qfdVpZtZve POQSKAK4w3TE2bpI3nbGX7X9ZW+GP7IGzIKShkV9q9aFYtxsj0zJgntSgMplWDSHEzPfh9 m7EPiN2PKwJh4L7VzDDxE6AHj7d8+bycJW6maXGm8L9ZpsBdC0zJvGfLis3Tx6QSx7B2uc FM6WhLiOTonR7TK/Pa9/Ha35AIvzrIp7DHVxOZiCo/nOYcW/dUjYYXhAXWAlMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738367625; 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=9iRxiwu0LPFINepueVMSflfxLZJcGSKKRtG1wTvefN8=; b=brELKWH4MOSm5Xph8XIOuMova++h2VgTWPxuPuKStNhMoCJ/tyPFJmgj/UQ+CyBLETOCPC c83hujOMZycIrGHOWMTBIdY008VsgMTeQV//ZaRQJx8Hv9m/l5jK5o8YYxbUcwdS4mKYaC j+/8nQRbBCfdQcUYsgZSjTxqRzHsn7Ja/P2dvRnb6lGpxmQu3xgkXezulC4d8lpfTKj+Wf jGiSbsA4766G9lEXs/KGMPSJSa3U2TnVFp+VYGix0zy2CuFPtLEDa5yddJJzmPrOn8jVuz +6Oig4uwIQkppgXZ8IaO+NUs+9tUTZsNA4sXtPRM9HgOfZ+jueQ1WwTkhYGe+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738367625; a=rsa-sha256; cv=none; b=BpN8Xn0JjqcpY3j1FY1M8DhqB90jzqbYkyOAbmzYp1yxhsN+BWwepw7p2WFzcxRxt1g4vj 54cWBElhpc6b7Fux3BIMfmO7evybS+r0OYQb8DKhU8DX+dIvvsMYMkiEhkjhyC8rgx9WgJ dl70nX0xAhNFQH7Wd6c2/11dkSge9gSHzhiG2NGhz+otqM4GtVO3e60VMe7G3kcjHmhScG oXfumv8V0ScZD9RCJV71a2DRbNlR53uzl90N/nzC+FegbxTgs4mDN/4JWijO7/FpyzocxG sgxJZzBsj0UFb4YkAW0e8U7CuMf8QcRliChdjmIzGqJViSC3rM/2ACGALXkQBA== 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 4YlCQd3JgzzgbT; Fri, 31 Jan 2025 23:53:45 +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 50VNrjOd017091; Fri, 31 Jan 2025 23:53:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50VNrjbk017088; Fri, 31 Jan 2025 23:53:45 GMT (envelope-from git) Date: Fri, 31 Jan 2025 23:53:45 GMT Message-Id: <202501312353.50VNrjbk017088@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: b4886c4ece3e - main - rtw88/rtw89: avoid duplicate top-level directory with debugfs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b4886c4ece3e692c294aa853da7aec849f8d00a2 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b4886c4ece3e692c294aa853da7aec849f8d00a2 commit b4886c4ece3e692c294aa853da7aec849f8d00a2 Author: Bjoern A. Zeeb AuthorDate: 2025-01-25 23:55:53 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-01-31 23:53:31 +0000 rtw88/rtw89: avoid duplicate top-level directory with debugfs If people like me having multiple cards in the same system creating the debugfs dirctory leads to a panic upon attaching the 2nd card due to the duplicate name. Rather than using the hard coded driver name, use the device name (e.g., rtw880, rtw881, rtw882). This solves two issues: it avoids the duplicate name and we get individual debugging/statistic information for each card. Sponsored by: The FreeBSD Foundation MFC after: 3 days X-Note: ath1[01]k and mt76 likely will need a similar change --- sys/contrib/dev/rtw88/debug.c | 4 ++++ sys/contrib/dev/rtw89/debug.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/sys/contrib/dev/rtw88/debug.c b/sys/contrib/dev/rtw88/debug.c index e84f25b34c46..1373633d73ee 100644 --- a/sys/contrib/dev/rtw88/debug.c +++ b/sys/contrib/dev/rtw88/debug.c @@ -1223,7 +1223,11 @@ void rtw_debugfs_init(struct rtw_dev *rtwdev) { struct dentry *debugfs_topdir; +#if defined(__linux__) debugfs_topdir = debugfs_create_dir("rtw88", +#elif defined(__FreeBSD__) + debugfs_topdir = debugfs_create_dir(dev_name(rtwdev->dev), +#endif rtwdev->hw->wiphy->debugfsdir); rtw_debugfs_add_w(write_reg); rtw_debugfs_add_rw(read_reg); diff --git a/sys/contrib/dev/rtw89/debug.c b/sys/contrib/dev/rtw89/debug.c index 750ef1578e18..a87f4b49829d 100644 --- a/sys/contrib/dev/rtw89/debug.c +++ b/sys/contrib/dev/rtw89/debug.c @@ -3974,7 +3974,11 @@ void rtw89_debugfs_init(struct rtw89_dev *rtwdev) { struct dentry *debugfs_topdir; +#if defined(__linux__) debugfs_topdir = debugfs_create_dir("rtw89", +#elif defined(__FreeBSD__) + debugfs_topdir = debugfs_create_dir(dev_name(rtwdev->dev), +#endif rtwdev->hw->wiphy->debugfsdir); rtw89_debugfs_add_rw(read_reg);