From: Linus Walleij <linusw@kernel.org>
To: Vinod Koul <vkoul@kernel.org>, Frank Li <Frank.Li@kernel.org>
Cc: dmaengine@vger.kernel.org, Linus Walleij <linusw@kernel.org>
Subject: [PATCH v2] dmaengine: Use unique debugfs names
Date: Mon, 02 Nov 2026 10:23:39 +0100 [thread overview]
Message-ID: <20261102-dmaengine-fixes-v2-1-d0473b3a0ed5@kernel.org> (raw)
DMA40 registers multiple dma_device instances for the same platform
device. The DMAengine debugfs code uses dev_name(dma_dev->dev) as the
directory name, so the second and third registrations try to create the
same directory and print duplicate-name warnings.
Keep the existing device-name directory for the first registration, but
use a dev_id-suffixed fallback when that name already exists.
Signed-off-by: Linus Walleij <linusw@kernel.org>
---
Fix duplicate direntry.
---
Changes in v2:
- Rebased on v7.4-rc1
- Link to v1: https://lore.kernel.org/r/20260918-dmaengine-fixes-v1-1-7e10da1633c1@kernel.org
---
drivers/dma/dmaengine.c | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
index 34be53487a21..7eb8d53b4863 100644
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
@@ -33,6 +33,7 @@
#include <linux/acpi.h>
#include <linux/acpi_dma.h>
+#include <linux/dcache.h>
#include <linux/device.h>
#include <linux/dma-mapping.h>
#include <linux/dmaengine.h>
@@ -70,8 +71,24 @@ static struct dentry *rootdir;
static void dmaengine_debug_register(struct dma_device *dma_dev)
{
- dma_dev->dbg_dev_root = debugfs_create_dir(dev_name(dma_dev->dev),
- rootdir);
+ const char *name = dev_name(dma_dev->dev);
+ struct dentry *dentry;
+ char *uniq;
+
+ dentry = debugfs_lookup(name, rootdir);
+ if (dentry) {
+ dput(dentry);
+
+ uniq = kasprintf(GFP_KERNEL, "%s.%d", name, dma_dev->dev_id);
+ if (!uniq)
+ return;
+
+ dma_dev->dbg_dev_root = debugfs_create_dir(uniq, rootdir);
+ kfree(uniq);
+ } else {
+ dma_dev->dbg_dev_root = debugfs_create_dir(name, rootdir);
+ }
+
if (IS_ERR(dma_dev->dbg_dev_root))
dma_dev->dbg_dev_root = NULL;
}
---
base-commit: 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4
change-id: 20260918-dmaengine-fixes-5c893ce71049
Best regards,
--
Linus Walleij <linusw@kernel.org>
reply other threads:[~2026-11-02 9:23 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261102-dmaengine-fixes-v2-1-d0473b3a0ed5@kernel.org \
--to=linusw@kernel.org \
--cc=Frank.Li@kernel.org \
--cc=dmaengine@vger.kernel.org \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox