5.4-stable patches

added patches:
	dmaengine-sh-rcar-dmac-check-for-error-num-after-dma_set_max_seg_size.patch

diff --git a/queue-5.4/dmaengine-sh-rcar-dmac-check-for-error-num-after-dma_set_max_seg_size.patch b/queue-5.4/dmaengine-sh-rcar-dmac-check-for-error-num-after-dma_set_max_seg_size.patch
new file mode 100644 (file)
index 0000000..16f5a88
--- /dev/null
+++ b/queue-5.4/dmaengine-sh-rcar-dmac-check-for-error-num-after-dma_set_max_seg_size.patch
@@ -0,0 +1,38 @@
+From da2ad87fba0891576aadda9161b8505fde81a84d Mon Sep 17 00:00:00 2001
+From: Jiasheng Jiang <jiasheng@iscas.ac.cn>
+Date: Tue, 11 Jan 2022 09:12:39 +0800
+Subject: dmaengine: sh: rcar-dmac: Check for error num after dma_set_max_seg_size
+
+From: Jiasheng Jiang <jiasheng@iscas.ac.cn>
+
+commit da2ad87fba0891576aadda9161b8505fde81a84d upstream.
+
+As the possible failure of the dma_set_max_seg_size(), it should be
+better to check the return value of the dma_set_max_seg_size().
+
+Fixes: 97d49c59e219 ("dmaengine: rcar-dmac: set scatter/gather max segment size")
+Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
+Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
+Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
+Link: https://lore.kernel.org/r/20220111011239.452837-1-jiasheng@iscas.ac.cn
+Signed-off-by: Vinod Koul <vkoul@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Nobuhiro Iwamatsu (CIP) <nobuhiro1.iwamatsu@toshiba.co.jp>
+---
+ drivers/dma/sh/rcar-dmac.c |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/drivers/dma/sh/rcar-dmac.c
++++ b/drivers/dma/sh/rcar-dmac.c
+@@ -1824,7 +1824,10 @@ static int rcar_dmac_probe(struct platfo
+       dmac->dev = &pdev->dev;
+       platform_set_drvdata(pdev, dmac);
+       dmac->dev->dma_parms = &dmac->parms;
+-      dma_set_max_seg_size(dmac->dev, RCAR_DMATCR_MASK);
++      ret = dma_set_max_seg_size(dmac->dev, RCAR_DMATCR_MASK);
++      if (ret)
++              return ret;
++
+       ret = dma_set_mask_and_coherent(dmac->dev, DMA_BIT_MASK(40));
+       if (ret)
+               return ret;

diff --git a/queue-5.4/series b/queue-5.4/series
index c287ca613df7aef735a4e41c9222298716f58144..3df6debbbae88ce014e5d973e0a2b9ca5233b084 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -8,3 +8,4 @@ hid-core-fix-deadloop-in-hid_apply_multiplier.patch
 bpf-bpf_fib_lookup-should-not-return-neigh-in-nud_failed-state.patch
 net-remove-warn_on_once-sk-sk_forward_alloc-from-sk_stream_kill_queues.patch
 vc_screen-don-t-clobber-return-value-in-vcs_read.patch
+dmaengine-sh-rcar-dmac-check-for-error-num-after-dma_set_max_seg_size.patch