Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E75DC64EC4 for ; Fri, 3 Mar 2023 18:27:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231665AbjCCS1s (ORCPT ); Fri, 3 Mar 2023 13:27:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231649AbjCCS1p (ORCPT ); Fri, 3 Mar 2023 13:27:45 -0500 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F38E930B1C; Fri, 3 Mar 2023 10:27:40 -0800 (PST) Received: by mail-lf1-x130.google.com with SMTP id s20so4719064lfb.11; Fri, 03 Mar 2023 10:27:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1677868059; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=mCx3juaUUrnRqZmgzU2kBUTMBbG/5SfMFxbwysSB4z0=; b=P1fhX3cSqI+msIwxDwKvRqUfjXPQS5x0NYNZ7cOFfxp2eZfydQs8/DzJ462H+LID3/ 197gGtEx7zx+RfBNXx/SSV9u4Wj2nLX1lSCcemh0JG3Hv3R03DxMEi7U9wf0amrvYHea ObMO39MGR5mZgq6RAqidCxeTP6rQIr0MZHG6tKcYR4ZFtXI/jZaCPCVNjwuz1CX1eavk HpQPZS4rkF8QNPIWujQMYML+zoJGPHZvJ18pImykUZOyAVT2uhKyHq87gAHRqt5rusN6 67zJea9wZ881wf+7ncRA4I4QpawuIaPmWuKBYCUaDCrpkQvvlSP3ImtYwnzJso0D+uK/ 91Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677868059; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=mCx3juaUUrnRqZmgzU2kBUTMBbG/5SfMFxbwysSB4z0=; b=BLls6fRby/3cufvuUZbpXA07sXR9hQBCtS1RH08jYsAx/t+oYvfj4tJEr6yfIaoxqz yJb3uJ+c22rfPgSWT7kGtFPl1Z/PNDYe5Nchqk30EYfbUKcbbGbxkT8RM+oIG8Y4X0BH GZ9APZj4qyme3wqsh885igoQZBTrPlHaJzgeYsFv1Oo/Kl0/9tI78Skgswf9dX/J5Abk DSc0TQVL03wJxKzbbdsfIP7S1ygLQyKyj1UOQkCv70H5IKJjDnAtMgxY224i9zcEH2jX +T+2xBkaX/SAAmBEOziIZMZtw+i1V9M5Qz1eAwUauMmI9iCPYnGIaG4/CAKXP1iJzB5d BY1A== X-Gm-Message-State: AO0yUKXY64GeXK0XOqlvRuiB5GAZEkycBGzBpQdUfK9yNSc6Dbh1LSpU gpYh46deBk5zYNbZ9SCWTjk= X-Google-Smtp-Source: AK7set/jKFFALgws7uT7CRHPd7uE9JRfH1/WIHw+qzXHVXEZSyyT0atyEzs+EBiqaJSJht68akgCgQ== X-Received: by 2002:ac2:4905:0:b0:4e7:dd1e:e521 with SMTP id n5-20020ac24905000000b004e7dd1ee521mr201367lfi.9.1677868059039; Fri, 03 Mar 2023 10:27:39 -0800 (PST) Received: from mobilestation ([95.79.133.202]) by smtp.gmail.com with ESMTPSA id f16-20020a19ae10000000b00497a61453a9sm480992lfc.243.2023.03.03.10.27.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 10:27:38 -0800 (PST) Date: Fri, 3 Mar 2023 21:27:36 +0300 From: Serge Semin To: Cai Huoqing Cc: Gustavo Pimentel , Vinod Koul , Jingoo Han , Lorenzo Pieralisi , Krzysztof =?utf-8?Q?Wilczy=C5=84ski?= , Rob Herring , Bjorn Helgaas , linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, linux-pci@vger.kernel.org Subject: Re: [PATCH v5 4/4] dmaengine: dw-edma: Add HDMA DebugFS support Message-ID: <20230303182736.4south7cafnfujob@mobilestation> References: <20230303124642.5519-1-cai.huoqing@linux.dev> <20230303124642.5519-5-cai.huoqing@linux.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230303124642.5519-5-cai.huoqing@linux.dev> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Mar 03, 2023 at 08:46:34PM +0800, Cai Huoqing wrote: > From: Cai huoqing > > Add HDMA DebugFS support to show register information > > Signed-off-by: Cai huoqing > --- > v4->v5: > 1.Remove the check of *regs_dent *ch_dent. > > v4 link: > https://lore.kernel.org/lkml/20230221034656.14476-5-cai.huoqing@linux.dev/ > > drivers/dma/dw-edma/Makefile | 3 +- > drivers/dma/dw-edma/dw-hdma-v0-core.c | 2 + > drivers/dma/dw-edma/dw-hdma-v0-debugfs.c | 175 +++++++++++++++++++++++ > drivers/dma/dw-edma/dw-hdma-v0-debugfs.h | 22 +++ > 4 files changed, 201 insertions(+), 1 deletion(-) > create mode 100644 drivers/dma/dw-edma/dw-hdma-v0-debugfs.c > create mode 100644 drivers/dma/dw-edma/dw-hdma-v0-debugfs.h > > diff --git a/drivers/dma/dw-edma/Makefile b/drivers/dma/dw-edma/Makefile > index b1c91ef2c63d..83ab58f87760 100644 > --- a/drivers/dma/dw-edma/Makefile > +++ b/drivers/dma/dw-edma/Makefile > @@ -1,7 +1,8 @@ > # SPDX-License-Identifier: GPL-2.0 > > obj-$(CONFIG_DW_EDMA) += dw-edma.o > -dw-edma-$(CONFIG_DEBUG_FS) := dw-edma-v0-debugfs.o > +dw-edma-$(CONFIG_DEBUG_FS) := dw-edma-v0-debugfs.o \ > + dw-hdma-v0-debugfs.o > dw-edma-objs := dw-edma-core.o \ > dw-edma-v0-core.o \ > dw-hdma-v0-core.o $(dw-edma-y) > diff --git a/drivers/dma/dw-edma/dw-hdma-v0-core.c b/drivers/dma/dw-edma/dw-hdma-v0-core.c > index e14a3907241d..d7abdf154594 100644 > --- a/drivers/dma/dw-edma/dw-hdma-v0-core.c > +++ b/drivers/dma/dw-edma/dw-hdma-v0-core.c > @@ -10,6 +10,7 @@ > #include "dw-edma-core.h" > #include "dw-hdma-v0-core.h" > #include "dw-hdma-v0-regs.h" > +#include "dw-hdma-v0-debugfs.h" > > enum dw_hdma_control { > DW_HDMA_V0_CB = BIT(0), > @@ -284,6 +285,7 @@ static void dw_hdma_v0_core_ch_config(struct dw_edma_chan *chan) > /* HDMA debugfs callbacks */ > static void dw_hdma_v0_core_debugfs_on(struct dw_edma *dw) > { > + dw_hdma_v0_debugfs_on(dw); > } > > static const struct dw_edma_core_ops dw_hdma_v0_core = { > diff --git a/drivers/dma/dw-edma/dw-hdma-v0-debugfs.c b/drivers/dma/dw-edma/dw-hdma-v0-debugfs.c > new file mode 100644 > index 000000000000..9516a6c3af73 > --- /dev/null > +++ b/drivers/dma/dw-edma/dw-hdma-v0-debugfs.c > @@ -0,0 +1,175 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (c) 2023 Cai Huoqing > + * Synopsys DesignWare HDMA v0 debugfs > + * > + * Author: Cai Huoqing > + */ > + > +#include > +#include > + > +#include "dw-hdma-v0-debugfs.h" > +#include "dw-hdma-v0-regs.h" > +#include "dw-edma-core.h" > + > +#define REGS_ADDR(dw, name) \ > + ({ \ > + struct dw_hdma_v0_regs __iomem *__regs = (dw)->chip->reg_base; \ > + \ > + (void __iomem *)&__regs->name; \ > + }) > + > +#define REGS_CH_ADDR(dw, name, _dir, _ch) \ > + ({ \ > + struct dw_hdma_v0_ch_regs __iomem *__ch_regs; \ > + \ > + if (_dir == EDMA_DIR_READ) \ > + __ch_regs = REGS_ADDR(dw, ch[_ch].rd); \ > + else \ > + __ch_regs = REGS_ADDR(dw, ch[_ch].wr); \ > + \ > + (void __iomem *)&__ch_regs->name; \ > + }) > + > +#define CTX_REGISTER(dw, name, dir, ch) \ > + { dw, #name, REGS_CH_ADDR(dw, name, dir, ch), dir, ch } > + > +#define REGISTER(dw, name) \ > + { dw, #name, REGS_ADDR(dw, name) } > + > +#define WRITE_STR "write" > +#define READ_STR "read" > +#define CHANNEL_STR "channel" > +#define REGISTERS_STR "registers" > + > +struct dw_hdma_debugfs_entry { > + struct dw_edma *dw; > + const char *name; > + void __iomem *reg; > + enum dw_edma_dir dir; > + u16 ch; > +}; > + > +static int dw_hdma_debugfs_u32_get(void *data, u64 *val) > +{ > + void __iomem *reg = (void __force __iomem *)data; ^ !!! ------------------+ Brr, did you test it out? v > + > + *val = readl(reg); I am sure you'll get a mess returned because the debugfs_create_file_unsafe() method is called with the pointer to the dw_hdma_debugfs_entry instance passed. -Serge(y) > + > + return 0; > +} > +DEFINE_DEBUGFS_ATTRIBUTE(fops_x32, dw_hdma_debugfs_u32_get, NULL, "0x%08llx\n"); > + > +static void dw_hdma_debugfs_create_x32(struct dw_edma *dw, > + const struct dw_hdma_debugfs_entry ini[], > + int nr_entries, struct dentry *dent) > +{ > + struct dw_hdma_debugfs_entry *entries; > + int i; > + > + entries = devm_kcalloc(dw->chip->dev, nr_entries, sizeof(*entries), > + GFP_KERNEL); > + if (!entries) > + return; > + > + for (i = 0; i < nr_entries; i++) { > + entries[i] = ini[i]; > + > + debugfs_create_file_unsafe(entries[i].name, 0444, dent, > + &entries[i], &fops_x32); > + } > +} > + > +static void dw_hdma_debugfs_regs_ch(struct dw_edma *dw, enum dw_edma_dir dir, > + u16 ch, struct dentry *dent) > +{ > + const struct dw_hdma_debugfs_entry debugfs_regs[] = { > + CTX_REGISTER(dw, ch_en, dir, ch), > + CTX_REGISTER(dw, doorbell, dir, ch), > + CTX_REGISTER(dw, prefetch, dir, ch), > + CTX_REGISTER(dw, handshake, dir, ch), > + CTX_REGISTER(dw, llp.lsb, dir, ch), > + CTX_REGISTER(dw, llp.msb, dir, ch), > + CTX_REGISTER(dw, cycle_sync, dir, ch), > + CTX_REGISTER(dw, transfer_size, dir, ch), > + CTX_REGISTER(dw, sar.lsb, dir, ch), > + CTX_REGISTER(dw, sar.msb, dir, ch), > + CTX_REGISTER(dw, dar.lsb, dir, ch), > + CTX_REGISTER(dw, dar.msb, dir, ch), > + CTX_REGISTER(dw, watermark_en, dir, ch), > + CTX_REGISTER(dw, control1, dir, ch), > + CTX_REGISTER(dw, func_num, dir, ch), > + CTX_REGISTER(dw, qos, dir, ch), > + CTX_REGISTER(dw, ch_stat, dir, ch), > + CTX_REGISTER(dw, int_stat, dir, ch), > + CTX_REGISTER(dw, int_setup, dir, ch), > + CTX_REGISTER(dw, int_clear, dir, ch), > + CTX_REGISTER(dw, msi_stop.lsb, dir, ch), > + CTX_REGISTER(dw, msi_stop.msb, dir, ch), > + CTX_REGISTER(dw, msi_watermark.lsb, dir, ch), > + CTX_REGISTER(dw, msi_watermark.msb, dir, ch), > + CTX_REGISTER(dw, msi_abort.lsb, dir, ch), > + CTX_REGISTER(dw, msi_abort.msb, dir, ch), > + CTX_REGISTER(dw, msi_msgdata, dir, ch), > + }; > + int nr_entries = ARRAY_SIZE(debugfs_regs); > + > + dw_hdma_debugfs_create_x32(dw, debugfs_regs, nr_entries, dent); > +} > + > +static void dw_hdma_debugfs_regs_wr(struct dw_edma *dw, struct dentry *dent) > +{ > + struct dentry *regs_dent, *ch_dent; > + char name[16]; > + int i; > + > + regs_dent = debugfs_create_dir(WRITE_STR, dent); > + > + for (i = 0; i < dw->wr_ch_cnt; i++) { > + snprintf(name, sizeof(name), "%s:%d", CHANNEL_STR, i); > + > + ch_dent = debugfs_create_dir(name, regs_dent); > + > + dw_hdma_debugfs_regs_ch(dw, EDMA_DIR_WRITE, i, ch_dent); > + } > +} > + > +static void dw_hdma_debugfs_regs_rd(struct dw_edma *dw, struct dentry *dent) > +{ > + struct dentry *regs_dent, *ch_dent; > + char name[16]; > + int i; > + > + regs_dent = debugfs_create_dir(READ_STR, dent); > + > + for (i = 0; i < dw->rd_ch_cnt; i++) { > + snprintf(name, sizeof(name), "%s:%d", CHANNEL_STR, i); > + > + ch_dent = debugfs_create_dir(name, regs_dent); > + > + dw_hdma_debugfs_regs_ch(dw, EDMA_DIR_READ, i, ch_dent); > + } > +} > + > +static void dw_hdma_debugfs_regs(struct dw_edma *dw) > +{ > + struct dentry *regs_dent; > + > + regs_dent = debugfs_create_dir(REGISTERS_STR, dw->dma.dbg_dev_root); > + > + dw_hdma_debugfs_regs_wr(dw, regs_dent); > + dw_hdma_debugfs_regs_rd(dw, regs_dent); > +} > + > +void dw_hdma_v0_debugfs_on(struct dw_edma *dw) > +{ > + if (!debugfs_initialized()) > + return; > + > + debugfs_create_u32("mf", 0444, dw->dma.dbg_dev_root, &dw->chip->mf); > + debugfs_create_u16("wr_ch_cnt", 0444, dw->dma.dbg_dev_root, &dw->wr_ch_cnt); > + debugfs_create_u16("rd_ch_cnt", 0444, dw->dma.dbg_dev_root, &dw->rd_ch_cnt); > + > + dw_hdma_debugfs_regs(dw); > +} > diff --git a/drivers/dma/dw-edma/dw-hdma-v0-debugfs.h b/drivers/dma/dw-edma/dw-hdma-v0-debugfs.h > new file mode 100644 > index 000000000000..e6842c83777d > --- /dev/null > +++ b/drivers/dma/dw-edma/dw-hdma-v0-debugfs.h > @@ -0,0 +1,22 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* > + * Copyright (c) 2023 Cai Huoqing > + * Synopsys DesignWare HDMA v0 debugfs > + * > + * Author: Cai Huoqing > + */ > + > +#ifndef _DW_HDMA_V0_DEBUG_FS_H > +#define _DW_HDMA_V0_DEBUG_FS_H > + > +#include > + > +#ifdef CONFIG_DEBUG_FS > +void dw_hdma_v0_debugfs_on(struct dw_edma *dw); > +#else > +static inline void dw_hdma_v0_debugfs_on(struct dw_edma *dw) > +{ > +} > +#endif /* CONFIG_DEBUG_FS */ > + > +#endif /* _DW_HDMA_V0_DEBUG_FS_H */ > -- > 2.34.1 >