4.14-stable patches

added patches:
	ibmveth-use-dcbf-rather-than-dcbfl.patch

diff --git a/queue-4.14/ibmveth-use-dcbf-rather-than-dcbfl.patch b/queue-4.14/ibmveth-use-dcbf-rather-than-dcbfl.patch
new file mode 100644 (file)
index 0000000..bcdec8e
--- /dev/null
+++ b/queue-4.14/ibmveth-use-dcbf-rather-than-dcbfl.patch
@@ -0,0 +1,34 @@
+From bfedba3b2c7793ce127680bc8f70711e05ec7a17 Mon Sep 17 00:00:00 2001
+From: Michael Ellerman <mpe@ellerman.id.au>
+Date: Wed, 23 Aug 2023 14:51:39 +1000
+Subject: ibmveth: Use dcbf rather than dcbfl
+
+From: Michael Ellerman <mpe@ellerman.id.au>
+
+commit bfedba3b2c7793ce127680bc8f70711e05ec7a17 upstream.
+
+When building for power4, newer binutils don't recognise the "dcbfl"
+extended mnemonic.
+
+dcbfl RA, RB is equivalent to dcbf RA, RB, 1.
+
+Switch to "dcbf" to avoid the build error.
+
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/ethernet/ibm/ibmveth.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/ethernet/ibm/ibmveth.c
++++ b/drivers/net/ethernet/ibm/ibmveth.c
+@@ -209,7 +209,7 @@ static inline void ibmveth_flush_buffer(
+       unsigned long offset;
+ 
+       for (offset = 0; offset < length; offset += SMP_CACHE_BYTES)
+-              asm("dcbfl %0,%1" :: "b" (addr), "r" (offset));
++              asm("dcbf %0,%1,1" :: "b" (addr), "r" (offset));
+ }
+ 
+ /* replenish the buffers for a pool.  note that we don't need to

diff --git a/queue-4.14/series b/queue-4.14/series
index c61bb91eeb910060b15d0ec071f61becdb8337ac..f05a8fc213908c14bc1e5bed2b3ac7f1e1936093 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -43,3 +43,4 @@ sock-annotate-data-races-around-prot-memory_pressure.patch
 igb-avoid-starting-unnecessary-workqueues.patch
 ipvs-improve-robustness-to-the-ipvs-sysctl.patch
 ipvs-fix-racy-memcpy-in-proc_do_sync_threshold.patch
+ibmveth-use-dcbf-rather-than-dcbfl.patch