From a422a9142171c1f1d793319bd53f525ef5a44fe7 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 4 Jul 2022 17:45:32 +0200 Subject: [PATCH] 4.19-stable patches added patches: net-dsa-bcm_sf2-force-pause-link-settings.patch --- ...sa-bcm_sf2-force-pause-link-settings.patch | 37 +++++++++++++++++++ queue-4.19/series | 1 + 2 files changed, 38 insertions(+) create mode 100644 queue-4.19/net-dsa-bcm_sf2-force-pause-link-settings.patch diff --git a/queue-4.19/net-dsa-bcm_sf2-force-pause-link-settings.patch b/queue-4.19/net-dsa-bcm_sf2-force-pause-link-settings.patch new file mode 100644 index 00000000000..6ae40293920 --- /dev/null +++ b/queue-4.19/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 +Date: Wed, 22 Jun 2022 20:02:04 -0700 +Subject: net: dsa: bcm_sf2: force pause link settings + +From: Doug Berger + +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 +Signed-off-by: Florian Fainelli +Link: https://lore.kernel.org/r/20220623030204.1966851-1-f.fainelli@gmail.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -599,6 +599,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-4.19/series b/queue-4.19/series index e7c698c1343..131d0854c89 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -21,3 +21,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 -- 2.47.3