lkml.org 
[lkml]   [2022]   [Mar]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 19/25] dmaengine: dw-edma: Use DMA-engine device DebugFS subdirectory
    On Thu, Mar 24, 2022 at 04:48:30AM +0300, Serge Semin wrote:
    > Since all DW eDMA read and write channels are now installed in a framework
    > of a single DMA-engine device, we can freely move all the DW eDMA-specific
    > DebugFS nodes into a ready-to-use DMA-engine DebugFS subdirectory. It's
    > created during the DMA-device registration and can be found in the
    > dma_device.dbg_dev_root field.
    >
    > Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru>

    Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

    Thanks,
    Mani

    > ---
    > drivers/dma/dw-edma/dw-edma-core.c | 3 ---
    > drivers/dma/dw-edma/dw-edma-core.h | 3 ---
    > drivers/dma/dw-edma/dw-edma-v0-core.c | 5 -----
    > drivers/dma/dw-edma/dw-edma-v0-core.h | 1 -
    > drivers/dma/dw-edma/dw-edma-v0-debugfs.c | 18 ++++--------------
    > drivers/dma/dw-edma/dw-edma-v0-debugfs.h | 5 -----
    > 6 files changed, 4 insertions(+), 31 deletions(-)
    >
    > diff --git a/drivers/dma/dw-edma/dw-edma-core.c b/drivers/dma/dw-edma/dw-edma-core.c
    > index a391e44da039..bc530f0a2468 100644
    > --- a/drivers/dma/dw-edma/dw-edma-core.c
    > +++ b/drivers/dma/dw-edma/dw-edma-core.c
    > @@ -1045,9 +1045,6 @@ int dw_edma_remove(struct dw_edma_chip *chip)
    > list_del(&chan->vc.chan.device_node);
    > }
    >
    > - /* Turn debugfs off */
    > - dw_edma_v0_core_debugfs_off(chip);
    > -
    > return 0;
    > }
    > EXPORT_SYMBOL_GPL(dw_edma_remove);
    > diff --git a/drivers/dma/dw-edma/dw-edma-core.h b/drivers/dma/dw-edma/dw-edma-core.h
    > index ec9f84a857d1..980adb079182 100644
    > --- a/drivers/dma/dw-edma/dw-edma-core.h
    > +++ b/drivers/dma/dw-edma/dw-edma-core.h
    > @@ -110,9 +110,6 @@ struct dw_edma {
    > raw_spinlock_t lock; /* Only for legacy */
    >
    > struct dw_edma_chip *chip;
    > -#ifdef CONFIG_DEBUG_FS
    > - struct dentry *debugfs;
    > -#endif /* CONFIG_DEBUG_FS */
    > };
    >
    > struct dw_edma_sg {
    > diff --git a/drivers/dma/dw-edma/dw-edma-v0-core.c b/drivers/dma/dw-edma/dw-edma-v0-core.c
    > index 013d9a9cb991..6b303d5a6b2a 100644
    > --- a/drivers/dma/dw-edma/dw-edma-v0-core.c
    > +++ b/drivers/dma/dw-edma/dw-edma-v0-core.c
    > @@ -511,8 +511,3 @@ void dw_edma_v0_core_debugfs_on(struct dw_edma_chip *chip)
    > {
    > dw_edma_v0_debugfs_on(chip);
    > }
    > -
    > -void dw_edma_v0_core_debugfs_off(struct dw_edma_chip *chip)
    > -{
    > - dw_edma_v0_debugfs_off(chip);
    > -}
    > diff --git a/drivers/dma/dw-edma/dw-edma-v0-core.h b/drivers/dma/dw-edma/dw-edma-v0-core.h
    > index 2afa626b8300..43e01844375a 100644
    > --- a/drivers/dma/dw-edma/dw-edma-v0-core.h
    > +++ b/drivers/dma/dw-edma/dw-edma-v0-core.h
    > @@ -23,6 +23,5 @@ void dw_edma_v0_core_start(struct dw_edma_chunk *chunk, bool first);
    > int dw_edma_v0_core_device_config(struct dw_edma_chan *chan);
    > /* eDMA debug fs callbacks */
    > void dw_edma_v0_core_debugfs_on(struct dw_edma_chip *chip);
    > -void dw_edma_v0_core_debugfs_off(struct dw_edma_chip *chip);
    >
    > #endif /* _DW_EDMA_V0_CORE_H */
    > diff --git a/drivers/dma/dw-edma/dw-edma-v0-debugfs.c b/drivers/dma/dw-edma/dw-edma-v0-debugfs.c
    > index 353269a3680b..319a3c790dc4 100644
    > --- a/drivers/dma/dw-edma/dw-edma-v0-debugfs.c
    > +++ b/drivers/dma/dw-edma/dw-edma-v0-debugfs.c
    > @@ -268,7 +268,7 @@ static void dw_edma_debugfs_regs(struct dw_edma *dw)
    > struct dentry *regs_dir;
    > int nr_entries;
    >
    > - regs_dir = debugfs_create_dir(REGISTERS_STR, dw->debugfs);
    > + regs_dir = debugfs_create_dir(REGISTERS_STR, dw->dma.dbg_dev_root);
    >
    > nr_entries = ARRAY_SIZE(debugfs_regs);
    > dw_edma_debugfs_create_x32(dw, debugfs_regs, nr_entries, regs_dir);
    > @@ -284,19 +284,9 @@ void dw_edma_v0_debugfs_on(struct dw_edma_chip *chip)
    > if (!debugfs_initialized())
    > return;
    >
    > - dw->debugfs = debugfs_create_dir(dw->name, NULL);
    > -
    > - debugfs_create_u32("mf", 0444, dw->debugfs, &dw->chip->mf);
    > - debugfs_create_u16("wr_ch_cnt", 0444, dw->debugfs, &dw->wr_ch_cnt);
    > - debugfs_create_u16("rd_ch_cnt", 0444, dw->debugfs, &dw->rd_ch_cnt);
    > + 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_edma_debugfs_regs(dw);
    > }
    > -
    > -void dw_edma_v0_debugfs_off(struct dw_edma_chip *chip)
    > -{
    > - struct dw_edma *dw = chip->dw;
    > -
    > - debugfs_remove_recursive(dw->debugfs);
    > - dw->debugfs = NULL;
    > -}
    > diff --git a/drivers/dma/dw-edma/dw-edma-v0-debugfs.h b/drivers/dma/dw-edma/dw-edma-v0-debugfs.h
    > index d0ff25a9ea5c..eb11802c2b76 100644
    > --- a/drivers/dma/dw-edma/dw-edma-v0-debugfs.h
    > +++ b/drivers/dma/dw-edma/dw-edma-v0-debugfs.h
    > @@ -13,15 +13,10 @@
    >
    > #ifdef CONFIG_DEBUG_FS
    > void dw_edma_v0_debugfs_on(struct dw_edma_chip *chip);
    > -void dw_edma_v0_debugfs_off(struct dw_edma_chip *chip);
    > #else
    > static inline void dw_edma_v0_debugfs_on(struct dw_edma_chip *chip)
    > {
    > }
    > -
    > -static inline void dw_edma_v0_debugfs_off(struct dw_edma_chip *chip)
    > -{
    > -}
    > #endif /* CONFIG_DEBUG_FS */
    >
    > #endif /* _DW_EDMA_V0_DEBUG_FS_H */
    > --
    > 2.35.1
    >

    \
     
     \ /
      Last update: 2022-03-25 08:42    [W:4.275 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site