From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 22 Nov 2021 07:40:40 +0000 (+0100)
Subject: 5.15-stable patches
X-Git-Tag: v5.15.5~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7756165520e73f5930c582c47c30ea01acf2dcbc;p=thirdparty%2Fkernel%2Fstable-queue.git

5.15-stable patches

added patches:
	dmaengine-remove-debugfs-ifdef.patch
---

diff --git a/queue-5.15/dmaengine-remove-debugfs-ifdef.patch b/queue-5.15/dmaengine-remove-debugfs-ifdef.patch
new file mode 100644
index 00000000000..f3054725309
--- /dev/null
+++ b/queue-5.15/dmaengine-remove-debugfs-ifdef.patch
@@ -0,0 +1,90 @@
+From b3b180e735409ca0c76642014304b59482e0e653 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Mon, 20 Sep 2021 14:20:07 +0200
+Subject: dmaengine: remove debugfs #ifdef
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+commit b3b180e735409ca0c76642014304b59482e0e653 upstream.
+
+The ptdma driver has added debugfs support, but this fails to build
+when debugfs is disabled:
+
+drivers/dma/ptdma/ptdma-debugfs.c: In function 'ptdma_debugfs_setup':
+drivers/dma/ptdma/ptdma-debugfs.c:93:54: error: 'struct dma_device' has no member named 'dbg_dev_root'
+   93 |         debugfs_create_file("info", 0400, pt->dma_dev.dbg_dev_root, pt,
+      |                                                      ^
+drivers/dma/ptdma/ptdma-debugfs.c:96:55: error: 'struct dma_device' has no member named 'dbg_dev_root'
+   96 |         debugfs_create_file("stats", 0400, pt->dma_dev.dbg_dev_root, pt,
+      |                                                       ^
+drivers/dma/ptdma/ptdma-debugfs.c:102:52: error: 'struct dma_device' has no member named 'dbg_dev_root'
+  102 |                 debugfs_create_dir("q", pt->dma_dev.dbg_dev_root);
+      |                                                    ^
+
+Remove the #ifdef in the header, as this only saves a few bytes,
+but would require ugly #ifdefs in each driver using it.
+Simplify the other user while we're at it.
+
+Fixes: e2fb2e2a33fa ("dmaengine: ptdma: Add debugfs entries for PTDMA")
+Fixes: 26cf132de6f7 ("dmaengine: Create debug directories for DMA devices")
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Link: https://lore.kernel.org/r/20210920122017.205975-1-arnd@kernel.org
+Signed-off-by: Vinod Koul <vkoul@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/dma/xilinx/xilinx_dpdma.c |   15 +--------------
+ include/linux/dmaengine.h         |    2 --
+ 2 files changed, 1 insertion(+), 16 deletions(-)
+
+--- a/drivers/dma/xilinx/xilinx_dpdma.c
++++ b/drivers/dma/xilinx/xilinx_dpdma.c
+@@ -271,9 +271,6 @@ struct xilinx_dpdma_device {
+ /* -----------------------------------------------------------------------------
+  * DebugFS
+  */
+-
+-#ifdef CONFIG_DEBUG_FS
+-
+ #define XILINX_DPDMA_DEBUGFS_READ_MAX_SIZE	32
+ #define XILINX_DPDMA_DEBUGFS_UINT16_MAX_STR	"65535"
+ 
+@@ -299,7 +296,7 @@ struct xilinx_dpdma_debugfs_request {
+ 
+ static void xilinx_dpdma_debugfs_desc_done_irq(struct xilinx_dpdma_chan *chan)
+ {
+-	if (chan->id == dpdma_debugfs.chan_id)
++	if (IS_ENABLED(CONFIG_DEBUG_FS) && chan->id == dpdma_debugfs.chan_id)
+ 		dpdma_debugfs.xilinx_dpdma_irq_done_count++;
+ }
+ 
+@@ -462,16 +459,6 @@ static void xilinx_dpdma_debugfs_init(st
+ 		dev_err(xdev->dev, "Failed to create debugfs testcase file\n");
+ }
+ 
+-#else
+-static void xilinx_dpdma_debugfs_init(struct xilinx_dpdma_device *xdev)
+-{
+-}
+-
+-static void xilinx_dpdma_debugfs_desc_done_irq(struct xilinx_dpdma_chan *chan)
+-{
+-}
+-#endif /* CONFIG_DEBUG_FS */
+-
+ /* -----------------------------------------------------------------------------
+  * I/O Accessors
+  */
+--- a/include/linux/dmaengine.h
++++ b/include/linux/dmaengine.h
+@@ -944,10 +944,8 @@ struct dma_device {
+ 	void (*device_issue_pending)(struct dma_chan *chan);
+ 	void (*device_release)(struct dma_device *dev);
+ 	/* debugfs support */
+-#ifdef CONFIG_DEBUG_FS
+ 	void (*dbg_summary_show)(struct seq_file *s, struct dma_device *dev);
+ 	struct dentry *dbg_dev_root;
+-#endif
+ };
+ 
+ static inline int dmaengine_slave_config(struct dma_chan *chan,
diff --git a/queue-5.15/series b/queue-5.15/series
index 8ae1ce3d726..7f0acdd326d 100644
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -186,3 +186,4 @@ perf-x86-intel-uncore-fix-iio-event-constraints-for-.patch
 perf-x86-intel-uncore-fix-iio-event-constraints-for-.patch-26758
 s390-kexec-fix-return-code-handling.patch
 blk-cgroup-fix-missing-put-device-in-error-path-from.patch
+dmaengine-remove-debugfs-ifdef.patch