From nobody Mon Feb 10 14:52:59 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 4Ys6y45bh8z5mH96; Mon, 10 Feb 2025 14:53:00 +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 4Ys6y36QcXz4LnV; Mon, 10 Feb 2025 14:52:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199179; 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=ukJ3zX4srHlPxs+Eh2qI9LcG7agWOvKnD6EYeR+LRU8=; b=Pjz6cAuhPrYKl46zfLaDAcFuGdeO14rNFdABnfcXWDAiCIdcsITqsVBHU8oqJNxenWZoIR Ry8DxeGROt0jd+u/dCA4cwA5e6t8rPyftIu58CfRuNQP9j8W/7oldg+Q7BzMsQNyqplAY4 +VeG2/xzUDANu+h1K2G3QTG8l/2zq1WhY5zSlDgYxD5/CLTh0H2V5PJLSjxi7oAxvFfxIw QsoI7Du8PSLpGSNOhS4Yg9Nuoov9WTvMgVmEw/5kU372KYWfEaF2yG/UELw7MQyEqmp5sQ gEoQCKCZZ3Zn8c/oHMXOQYGiUgZytQqChZyA2UBvwEtS1WHARtaswIC+syCPqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199179; 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=ukJ3zX4srHlPxs+Eh2qI9LcG7agWOvKnD6EYeR+LRU8=; b=gWOBxI4TvBHu4tBfkQVr2fHRJUU6TcTjOCv37WrGGFj/CTA6i8Ip7+H2WUH2LvXI09OXoG X/TrwIPmxJAabfQaQi9ZcrSvjs2sfG2TS6W3KaqffALX2dJ2XyQ8ecwEOCwQEuS8L6usxd KD7G2ZomCG0lAjKLDDio2S1nh0R6gB+wVYRsT/uDtmJnjzKJJVKf3pJX/EsFzDcyLTSs9M /s9+gXuLJI0GbsLus+V5+cwSCnDDmXbi5/gLutyXtvCTFCLdqLhY2d0K64F8Vhcygi+HuO NpVlHVtfQvVjCKYPhT1ZE9rVsDNMH2sKyKbwOlhrSRQszN6QOQaQH0LvtpLWJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199179; a=rsa-sha256; cv=none; b=kvFwK4wtT/6YiN/2NULCKbZQowW9jgPkj52NcQm9gMYPcZqOAjx1JZKfZFRWEmc2g0S28b /oYbdPVu45n3l90lkazdcKQ9T2NKj9hAbxUz5rsfctmlbZKM3eSH95zeKXQjZTUXBh+lqV sp079+T3tjIn3DC2pe/aEXdi0IkYwra6A+B/NXcaiSI8vDcUD0eZWdpYneB1w0yPe67Ssw 4qyjks8b5cmqHsFdZVVu2fyvLLZzIA1rldIkynRSBKU3zxDRpKYavDdCDvP/D55Yhdh2h+ Tv6OaordU7Bu8gHHm3dMS8Hd69+q9t/ih7/p/kbwqBAtI7DvNfAOxHD9C+8Byw== 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 4Ys6y35pfnzXK0; Mon, 10 Feb 2025 14:52:59 +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 51AEqx7I028555; Mon, 10 Feb 2025 14:52:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqxGu028552; Mon, 10 Feb 2025 14:52:59 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:59 GMT Message-Id: <202502101452.51AEqxGu028552@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: 0735e8ddc328 - stable/14 - rtw88/rtw89: avoid duplicate top-level directory with debugfs 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: 0735e8ddc3284765a7e35a2d2f83a6ce1faff2c7 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0735e8ddc3284765a7e35a2d2f83a6ce1faff2c7 commit 0735e8ddc3284765a7e35a2d2f83a6ce1faff2c7 Author: Bjoern A. Zeeb AuthorDate: 2025-01-25 23:55:53 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:11 +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 X-Note: ath1[01]k and mt76 likely will need a similar change (cherry picked from commit b4886c4ece3e692c294aa853da7aec849f8d00a2) --- 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);