5.13-stable patches

added patches:
	spi-spi-cadence-quadspi-fix-division-by-zero-warning-try2.patch

diff --git a/queue-5.13/series b/queue-5.13/series
index 38fbd80a09e9374e8f8ca302d44a83d1dc467043..f29ff3edee3ba87c0492c6eedafed0a41bb152db 100644 (file)
--- a/queue-5.13/series
+++ b/queue-5.13/series
@@ -219,3 +219,4 @@ documentation-fix-intiramfs-script-name.patch
 arm64-entry-fix-kcov-suppression.patch
 perf-inject-close-inject.output-on-exit.patch
 drm-i915-gvt-clear-d3_entered-on-elsp-cmd-submission.patch
+spi-spi-cadence-quadspi-fix-division-by-zero-warning-try2.patch

diff --git a/queue-5.13/spi-spi-cadence-quadspi-fix-division-by-zero-warning-try2.patch b/queue-5.13/spi-spi-cadence-quadspi-fix-division-by-zero-warning-try2.patch
new file mode 100644 (file)
index 0000000..774e993
--- /dev/null
+++ b/queue-5.13/spi-spi-cadence-quadspi-fix-division-by-zero-warning-try2.patch
@@ -0,0 +1,41 @@
+From 0e85ee897858b1c7a5de53f496d016899d9639c5 Mon Sep 17 00:00:00 2001
+From: Yoshitaka Ikeda <ikeda@nskint.co.jp>
+Date: Fri, 16 Jul 2021 14:35:13 +0000
+Subject: spi: spi-cadence-quadspi: Fix division by zero warning
+
+From: Yoshitaka Ikeda <ikeda@nskint.co.jp>
+
+commit 0e85ee897858b1c7a5de53f496d016899d9639c5 upstream.
+
+Fix below division by zero warning:
+- The reason for dividing by zero is because the dummy bus width is zero,
+  but if the dummy n bytes is zero, it indicates that there is no data transfer,
+  so we can just return zero without doing any calculations.
+
+[    0.795337] Division by zero in kernel.
+   :
+[    0.834051] [<807fd40c>] (__div0) from [<804e1acc>] (Ldiv0+0x8/0x10)
+[    0.839097] [<805f0710>] (cqspi_exec_mem_op) from [<805edb4c>] (spi_mem_exec_op+0x3b0/0x3f8)
+
+Fixes: 7512eaf54190 ("spi: cadence-quadspi: Fix dummy cycle calculation when buswidth > 1")
+Signed-off-by: Yoshitaka Ikeda <ikeda@nskint.co.jp>
+Reviewed-by: Pratyush Yadav <p.yadav@ti.com>
+Link: https://lore.kernel.org/r/92eea403-9b21-2488-9cc1-664bee760c5e@nskint.co.jp
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/spi/spi-cadence-quadspi.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/spi/spi-cadence-quadspi.c
++++ b/drivers/spi/spi-cadence-quadspi.c
+@@ -309,6 +309,9 @@ static unsigned int cqspi_calc_dummy(con
+ {
+       unsigned int dummy_clk;
+ 
++      if (!op->dummy.nbytes)
++              return 0;
++
+       dummy_clk = op->dummy.nbytes * (8 / op->dummy.buswidth);
+       if (dtr)
+               dummy_clk /= 2;