5.13-stable patches

added patches:
	bonding-fix-build-issue.patch
	mptcp-fix-masking-a-bool-warning.patch
	spi-spi-cadence-quadspi-revert-fix-division-by-zero-warning.patch

diff --git a/queue-5.13/bonding-fix-build-issue.patch b/queue-5.13/bonding-fix-build-issue.patch
new file mode 100644 (file)
index 0000000..b695fd2
--- /dev/null
+++ b/queue-5.13/bonding-fix-build-issue.patch
@@ -0,0 +1,38 @@
+From 5b69874f74cc5707edd95fcdaa757c507ac8af0f Mon Sep 17 00:00:00 2001
+From: Mahesh Bandewar <maheshb@google.com>
+Date: Fri, 16 Jul 2021 16:09:41 -0700
+Subject: bonding: fix build issue
+
+From: Mahesh Bandewar <maheshb@google.com>
+
+commit 5b69874f74cc5707edd95fcdaa757c507ac8af0f upstream.
+
+The commit 9a5605505d9c (" bonding: Add struct bond_ipesc to manage SA") is causing
+following build error when XFRM is not selected in kernel config.
+
+lld: error: undefined symbol: xfrm_dev_state_flush
+>>> referenced by bond_main.c:3453 (drivers/net/bonding/bond_main.c:3453)
+>>>               net/bonding/bond_main.o:(bond_netdev_event) in archive drivers/built-in.a
+
+Fixes: 9a5605505d9c (" bonding: Add struct bond_ipesc to manage SA")
+Signed-off-by: Mahesh Bandewar <maheshb@google.com>
+CC: Taehee Yoo <ap420073@gmail.com>
+CC: Jay Vosburgh <jay.vosburgh@canonical.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/bonding/bond_main.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/net/bonding/bond_main.c
++++ b/drivers/net/bonding/bond_main.c
+@@ -3442,7 +3442,9 @@ static int bond_master_netdev_event(unsi
+               return bond_event_changename(event_bond);
+       case NETDEV_UNREGISTER:
+               bond_remove_proc_entry(event_bond);
++#ifdef CONFIG_XFRM_OFFLOAD
+               xfrm_dev_state_flush(dev_net(bond_dev), bond_dev, true);
++#endif /* CONFIG_XFRM_OFFLOAD */
+               break;
+       case NETDEV_REGISTER:
+               bond_create_proc_entry(event_bond);

diff --git a/queue-5.13/mptcp-fix-masking-a-bool-warning.patch b/queue-5.13/mptcp-fix-masking-a-bool-warning.patch
new file mode 100644 (file)
index 0000000..8aac32c
--- /dev/null
+++ b/queue-5.13/mptcp-fix-masking-a-bool-warning.patch
@@ -0,0 +1,39 @@
+From c4512c63b1193c73b3f09c598a6d0a7f88da1dd8 Mon Sep 17 00:00:00 2001
+From: Matthieu Baerts <matthieu.baerts@tessares.net>
+Date: Fri, 25 Jun 2021 14:25:22 -0700
+Subject: mptcp: fix 'masking a bool' warning
+
+From: Matthieu Baerts <matthieu.baerts@tessares.net>
+
+commit c4512c63b1193c73b3f09c598a6d0a7f88da1dd8 upstream.
+
+Dan Carpenter reported an issue introduced in
+commit fde56eea01f9 ("mptcp: refine mptcp_cleanup_rbuf") where a new
+boolean (ack_pending) is masked with 0x9.
+
+This is not the intention to ignore values by using a boolean. This
+variable should not have a 'bool' type: we should keep the 'u8' to allow
+this comparison.
+
+Fixes: fde56eea01f9 ("mptcp: refine mptcp_cleanup_rbuf")
+Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
+Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
+Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
+Acked-by: Paolo Abeni <pabeni@redhat.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/mptcp/protocol.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/mptcp/protocol.c
++++ b/net/mptcp/protocol.c
+@@ -446,7 +446,7 @@ static void mptcp_subflow_cleanup_rbuf(s
+ static bool mptcp_subflow_could_cleanup(const struct sock *ssk, bool rx_empty)
+ {
+       const struct inet_connection_sock *icsk = inet_csk(ssk);
+-      bool ack_pending = READ_ONCE(icsk->icsk_ack.pending);
++      u8 ack_pending = READ_ONCE(icsk->icsk_ack.pending);
+       const struct tcp_sock *tp = tcp_sk(ssk);
+ 
+       return (ack_pending & ICSK_ACK_SCHED) &&

diff --git a/queue-5.13/series b/queue-5.13/series
index ea931661de53a1459d2ed288697e2d1fb34f242f..960b31038505d7e191850895c703c7e61b576be4 100644 (file)
--- a/queue-5.13/series
+++ b/queue-5.13/series
@@ -211,3 +211,6 @@ drm-return-enotty-for-non-drm-ioctls.patch
 drm-amdgpu-update-gc-golden-setting-for-dimgrey_cavefish.patch
 drm-amdgpu-update-the-golden-setting-for-vangogh.patch
 drm-amdgpu-update-golden-setting-for-sienna_cichlid.patch
+spi-spi-cadence-quadspi-revert-fix-division-by-zero-warning.patch
+bonding-fix-build-issue.patch
+mptcp-fix-masking-a-bool-warning.patch

diff --git a/queue-5.13/spi-spi-cadence-quadspi-revert-fix-division-by-zero-warning.patch b/queue-5.13/spi-spi-cadence-quadspi-revert-fix-division-by-zero-warning.patch
new file mode 100644 (file)
index 0000000..d695bf9
--- /dev/null
+++ b/queue-5.13/spi-spi-cadence-quadspi-revert-fix-division-by-zero-warning.patch
@@ -0,0 +1,41 @@
+From 0ccfd1ba84a4503b509250941af149e9ebd605ca Mon Sep 17 00:00:00 2001
+From: Yoshitaka Ikeda <ikeda@nskint.co.jp>
+Date: Fri, 16 Jul 2021 14:33:12 +0000
+Subject: spi: spi-cadence-quadspi: Revert "Fix division by zero warning"
+
+From: Yoshitaka Ikeda <ikeda@nskint.co.jp>
+
+commit 0ccfd1ba84a4503b509250941af149e9ebd605ca upstream.
+
+Revert to change to a better code.
+
+This reverts commit 55cef88bbf12f3bfbe5c2379a8868a034707e755.
+
+Signed-off-by: Yoshitaka Ikeda <ikeda@nskint.co.jp>
+Link: https://lore.kernel.org/r/bd30bdb4-07c4-f713-5648-01c898d51f1b@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 |   10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+--- a/drivers/spi/spi-cadence-quadspi.c
++++ b/drivers/spi/spi-cadence-quadspi.c
+@@ -307,13 +307,11 @@ static unsigned int cqspi_calc_rdreg(str
+ 
+ static unsigned int cqspi_calc_dummy(const struct spi_mem_op *op, bool dtr)
+ {
+-      unsigned int dummy_clk = 0;
++      unsigned int dummy_clk;
+ 
+-      if (op->dummy.buswidth && op->dummy.nbytes) {
+-              dummy_clk = op->dummy.nbytes * (8 / op->dummy.buswidth);
+-              if (dtr)
+-                      dummy_clk /= 2;
+-      }
++      dummy_clk = op->dummy.nbytes * (8 / op->dummy.buswidth);
++      if (dtr)
++              dummy_clk /= 2;
+ 
+       return dummy_clk;
+ }