From 4136c827edf78e8f425ffd563ed093292cc3a7ec Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 5 Jul 2022 18:14:59 +0200 Subject: [PATCH] drop net-dsa-bcm_sf2-force-pause-link-settings.patch from 4.9 and 4.14 --- ...sa-bcm_sf2-force-pause-link-settings.patch | 37 ------------------- queue-4.14/series | 1 - ...sa-bcm_sf2-force-pause-link-settings.patch | 37 ------------------- queue-4.9/series | 1 - 4 files changed, 76 deletions(-) delete mode 100644 queue-4.14/net-dsa-bcm_sf2-force-pause-link-settings.patch delete mode 100644 queue-4.9/net-dsa-bcm_sf2-force-pause-link-settings.patch diff --git a/queue-4.14/net-dsa-bcm_sf2-force-pause-link-settings.patch b/queue-4.14/net-dsa-bcm_sf2-force-pause-link-settings.patch deleted file mode 100644 index eba10d59dd4..00000000000 --- a/queue-4.14/net-dsa-bcm_sf2-force-pause-link-settings.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 -@@ -701,6 +701,11 @@ force_link: - reg |= LINK_STS; - if (phydev->duplex == DUPLEX_FULL) - reg |= DUPLX_MODE; -+ if (phydev->pause) { -+ if (phydev->asym_pause) -+ reg |= TXFLOW_CNTL; -+ reg |= RXFLOW_CNTL; -+ } - - core_writel(priv, reg, offset); - diff --git a/queue-4.14/series b/queue-4.14/series index 600dbc990d5..c6870241fad 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -16,7 +16,6 @@ nfc-nfcmrvl-fix-irq_of_parse_and_map-return-value.patch nfc-nxp-nci-don-t-issue-a-zero-length-i2c_master_read.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 sit-use-min.patch ipv6-sit-fix-ipip6_tunnel_get_prl-return-value.patch net-rename-and-export-copy_skb_header.patch diff --git a/queue-4.9/net-dsa-bcm_sf2-force-pause-link-settings.patch b/queue-4.9/net-dsa-bcm_sf2-force-pause-link-settings.patch deleted file mode 100644 index ceac1aa12ef..00000000000 --- a/queue-4.9/net-dsa-bcm_sf2-force-pause-link-settings.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 -@@ -671,6 +671,11 @@ force_link: - reg |= LINK_STS; - if (phydev->duplex == DUPLEX_FULL) - reg |= DUPLX_MODE; -+ if (phydev->pause) { -+ if (phydev->asym_pause) -+ reg |= TXFLOW_CNTL; -+ reg |= RXFLOW_CNTL; -+ } - - core_writel(priv, reg, CORE_STS_OVERRIDE_GMIIP_PORT(port)); - diff --git a/queue-4.9/series b/queue-4.9/series index 6e285725186..953f59c9f1f 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -13,7 +13,6 @@ nfc-nfcmrvl-fix-irq_of_parse_and_map-return-value.patch nfc-nxp-nci-don-t-issue-a-zero-length-i2c_master_read.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 sit-use-min.patch ipv6-sit-fix-ipip6_tunnel_get_prl-return-value.patch net-rename-and-export-copy_skb_header.patch -- 2.47.3