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 19CBEC6FD1D for ; Mon, 20 Mar 2023 11:53:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231292AbjCTLxd (ORCPT ); Mon, 20 Mar 2023 07:53:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230366AbjCTLxa (ORCPT ); Mon, 20 Mar 2023 07:53:30 -0400 Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 708ED4200; Mon, 20 Mar 2023 04:53:28 -0700 (PDT) Received: by mail-lj1-x22a.google.com with SMTP id g18so11796117ljl.3; Mon, 20 Mar 2023 04:53:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679313206; 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=e3Pp6Dcz7Dt03+gzasJQhysPumyJA4j0o4t64kJGLAo=; b=hjwd28c8vF8378Ohzlmb7Nf9VgicTsVmw7o8tnylaXxR6dzde6rz/9gJA3Qar19x7S XKLpa/Ma6HV5YtZATqVlaAPVOCJ1ZYz60lScgsb3sYqBzQuE8fM/Qn2Ebc8qVm0QPtcx SrFYLlWDksWJoKZSlFFbTInSJQp6wSxP0k9QSs17VrOQYgmlTfZmjDD8yRKM1OK5qzWp kWzqrtf+htNuywIquc43b2e9C87QxjKvL+09MJKSr3hJ57rhNUtbOasrkpfOdMrfJCcn H7JVqX3CDoCvKZrDK7Mfi3vVlNgriRt6qPvvqtaO3h98s92PYymIywfUw9VNOBoi0NeW YgoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679313206; 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=e3Pp6Dcz7Dt03+gzasJQhysPumyJA4j0o4t64kJGLAo=; b=brv28buX/9VcWD2o+q2xk69G1+N8rWbUjOX2X0f1/d4W2e/UKjUpvJdWnPpOb9Pnla oDWLwcAwt/iZvGJ5yxOghBHS39NorkXmJnugtVD5tH36lQ3j8L+fPI3nsQMaBfzH5Kll 9HHzMY57uJVCNqF2IgRtRUAt7lW8HioVvRO7Yx2QLthsjZfvffMfQ4WmrxXpKPpoYAR8 WqUku3syosdxeT2mK2+ux4sqIYjk6CodUXXIaaoUY0paSNlzec5u/v14RuUGX/2Duq/s AKzHOrDfDM/z/bROFBWuPkMGn09ILyeTvmyibPFZrKfCqf8YeNhkLTLzieA5w7hycBnG uA9Q== X-Gm-Message-State: AO0yUKUkO1AFC6TsHgNLai6kKdAqF7zCIsC8rN3+kC0Dfo6Ct90xWynM tKgdrRs605p479S3lp087Hc= X-Google-Smtp-Source: AK7set8hoAvgGnnY2e8Gh5ShgITgNo1E+hiRMKYMlokdQftHtWpKBQc4xN7FzyfUufjAeFs3R00nhA== X-Received: by 2002:a2e:bea4:0:b0:298:9fb5:9f20 with SMTP id a36-20020a2ebea4000000b002989fb59f20mr8672823ljr.26.1679313206552; Mon, 20 Mar 2023 04:53:26 -0700 (PDT) Received: from mobilestation ([95.79.133.202]) by smtp.gmail.com with ESMTPSA id y22-20020a2e3216000000b0029e84187ce2sm162808ljy.139.2023.03.20.04.53.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 04:53:26 -0700 (PDT) Date: Mon, 20 Mar 2023 14:53:23 +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 v7 4/5] dmaengine: dw-edma: Add HDMA DebugFS support Message-ID: <20230320115323.rqirpbvvfmibqqry@mobilestation> References: <20230315012840.6986-1-cai.huoqing@linux.dev> <20230315012840.6986-5-cai.huoqing@linux.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230315012840.6986-5-cai.huoqing@linux.dev> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Mar 15, 2023 at 09:28:35AM +0800, Cai Huoqing wrote: > From: Cai huoqing > > Add HDMA DebugFS support to show register information > > Signed-off-by: Cai huoqing > --- > v6->v7: > 1.Move the change of register file from patch[4/5] to patch[3/5]. > v6 link: > https://lore.kernel.org/lkml/20230310032342.17395-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 | 176 +++++++++++++++++++++++ > drivers/dma/dw-edma/dw-hdma-v0-debugfs.h | 22 +++ > 4 files changed, 202 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 cf274231cda9..b540c9ad7dfb 100644 > --- a/drivers/dma/dw-edma/dw-hdma-v0-core.c > +++ b/drivers/dma/dw-edma/dw-hdma-v0-core.c > @@ -11,6 +11,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), > @@ -257,6 +258,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..f2082b1bf72a > --- /dev/null > +++ b/drivers/dma/dw-edma/dw-hdma-v0-debugfs.c > @@ -0,0 +1,176 @@ > +// 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; Fields above seems like unused. What about dropping them? * Note the CTX_REGISTER() initializer will need to be fixed too. BTW it doesn't seem like HDMA will ever need the fields above, does it? In case of DW eDMA they were necessary to perform the viewport-based access of the CSR. AFAICS HDMA has always unrolled CSRs mapping. Am I right? Other than that looks good. -Serge(y) > +}; > + > +static int dw_hdma_debugfs_u32_get(void *data, u64 *val) > +{ > + struct dw_hdma_debugfs_entry *entry = data; > + void __iomem *reg = entry->reg; > + > + *val = readl(reg); > + > + 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 >