From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 4 Jul 2022 15:45:38 +0000 (+0200)
Subject: 5.4-stable patches
X-Git-Tag: v4.9.322~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0946c23ffbf6fa64732d2df6c07456288b39b9d8;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	net-dsa-bcm_sf2-force-pause-link-settings.patch
---

diff --git a/queue-5.4/net-dsa-bcm_sf2-force-pause-link-settings.patch b/queue-5.4/net-dsa-bcm_sf2-force-pause-link-settings.patch
new file mode 100644
index 00000000000..b2cb89ca9fc
--- /dev/null
+++ b/queue-5.4/net-dsa-bcm_sf2-force-pause-link-settings.patch
@@ -0,0 +1,37 @@
+From 7c97bc0128b2eecc703106112679a69d446d1a12 Mon Sep 17 00:00:00 2001
+From: Doug Berger <opendmb@gmail.com>
+Date: Wed, 22 Jun 2022 20:02:04 -0700
+Subject: net: dsa: bcm_sf2: force pause link settings
+
+From: Doug Berger <opendmb@gmail.com>
+
+commit 7c97bc0128b2eecc703106112679a69d446d1a12 upstream.
+
+The pause settings reported by the PHY should also be applied to the GMII port
+status override otherwise the switch will not generate pause frames towards the
+link partner despite the advertisement saying otherwise.
+
+Fixes: 246d7f773c13 ("net: dsa: add Broadcom SF2 switch driver")
+Signed-off-by: Doug Berger <opendmb@gmail.com>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+Link: https://lore.kernel.org/r/20220623030204.1966851-1-f.fainelli@gmail.com
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/dsa/bcm_sf2.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/drivers/net/dsa/bcm_sf2.c
++++ b/drivers/net/dsa/bcm_sf2.c
+@@ -602,6 +602,11 @@ force_link:
+ 		reg |= LINK_STS;
+ 	if (state->duplex == DUPLEX_FULL)
+ 		reg |= DUPLX_MODE;
++	if (state->pause & MLO_PAUSE_TXRX_MASK) {
++		if (state->pause & MLO_PAUSE_TX)
++			reg |= TXFLOW_CNTL;
++		reg |= RXFLOW_CNTL;
++	}
+ 
+ 	core_writel(priv, reg, offset);
+ }
diff --git a/queue-5.4/series b/queue-5.4/series
index 0ad184a0663..b521eb63422 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -28,3 +28,4 @@ nfc-nxp-nci-don-t-issue-a-zero-length-i2c_master_read.patch
 net-tun-avoid-disabling-napi-twice.patch
 xen-gntdev-avoid-blocking-in-unmap_grant_pages.patch
 hwmon-ibmaem-don-t-call-platform_device_del-if-platf.patch
+net-dsa-bcm_sf2-force-pause-link-settings.patch