From: Greg Kroah-Hartman Date: Tue, 16 May 2023 05:17:47 +0000 (+0200) Subject: drop net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch from everywhere X-Git-Tag: v4.14.315~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef62b3325cef84cb350f1c6b35ada687340c8e97;p=thirdparty%2Fkernel%2Fstable-queue.git drop net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch from everywhere --- diff --git a/queue-4.19/net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch b/queue-4.19/net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch deleted file mode 100644 index 407871f1908..00000000000 --- a/queue-4.19/net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b562a60c0c6c4904bffc513cad98e2ac48e0de1c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 4 May 2023 16:07:27 -0700 -Subject: net: bcmgenet: Remove phy_stop() from bcmgenet_netif_stop() - -From: Florian Fainelli - -[ Upstream commit 93e0401e0fc0c54b0ac05b687cd135c2ac38187c ] - -The call to phy_stop() races with the later call to phy_disconnect(), -resulting in concurrent phy_suspend() calls being run from different -CPUs. The final call to phy_disconnect() ensures that the PHY is -stopped and suspended, too. - -Fixes: c96e731c93ff ("net: bcmgenet: connect and disconnect from the PHY state machine") -Signed-off-by: Florian Fainelli -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/broadcom/genet/bcmgenet.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -index 84bcb3ce00f73..b3dedd56a9882 100644 ---- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c -+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -@@ -2995,7 +2995,6 @@ static void bcmgenet_netif_stop(struct net_device *dev) - /* Disable MAC transmit. TX DMA disabled must be done before this */ - umac_enable_set(priv, CMD_TX_EN, false); - -- phy_stop(dev->phydev); - bcmgenet_disable_rx_napi(priv); - bcmgenet_intr_disable(priv); - --- -2.39.2 - diff --git a/queue-4.19/series b/queue-4.19/series index 1744757dfd8..620157a1cb8 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -160,7 +160,6 @@ drm-amdgpu-add-a-missing-lock-for-amdgpu_sched.patch alsa-caiaq-input-add-error-handling-for-unsupported-.patch virtio_net-split-free_unused_bufs.patch virtio_net-suppress-cpu-stall-when-free_unused_bufs.patch -net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch perf-vendor-events-power9-remove-utf-8-characters-fr.patch perf-map-delete-two-variable-initialisations-before-.patch perf-symbols-fix-return-incorrect-build_id-size-in-e.patch diff --git a/queue-5.10/net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch b/queue-5.10/net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch deleted file mode 100644 index 00a4d980ace..00000000000 --- a/queue-5.10/net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d41aa36b6583ac7b5bf91957f335e91a7f3f6fa6 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 4 May 2023 16:07:27 -0700 -Subject: net: bcmgenet: Remove phy_stop() from bcmgenet_netif_stop() - -From: Florian Fainelli - -[ Upstream commit 93e0401e0fc0c54b0ac05b687cd135c2ac38187c ] - -The call to phy_stop() races with the later call to phy_disconnect(), -resulting in concurrent phy_suspend() calls being run from different -CPUs. The final call to phy_disconnect() ensures that the PHY is -stopped and suspended, too. - -Fixes: c96e731c93ff ("net: bcmgenet: connect and disconnect from the PHY state machine") -Signed-off-by: Florian Fainelli -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/broadcom/genet/bcmgenet.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -index 7667cbb5adfd6..20b161620fee9 100644 ---- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c -+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -@@ -3412,7 +3412,6 @@ static void bcmgenet_netif_stop(struct net_device *dev) - /* Disable MAC transmit. TX DMA disabled must be done before this */ - umac_enable_set(priv, CMD_TX_EN, false); - -- phy_stop(dev->phydev); - bcmgenet_disable_rx_napi(priv); - bcmgenet_intr_disable(priv); - --- -2.39.2 - diff --git a/queue-5.10/series b/queue-5.10/series index 598858a8a7c..2290ca69e8a 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -325,7 +325,6 @@ net-dsa-mt7530-fix-corrupt-frames-using-trgmii-on-40.patch virtio_net-split-free_unused_bufs.patch virtio_net-suppress-cpu-stall-when-free_unused_bufs.patch net-enetc-check-the-index-of-the-sfi-rather-than-the.patch -net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch perf-vendor-events-power9-remove-utf-8-characters-fr.patch perf-pmu-zfree-expects-a-pointer-to-a-pointer-to-zer.patch perf-map-delete-two-variable-initialisations-before-.patch diff --git a/queue-5.15/net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch b/queue-5.15/net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch deleted file mode 100644 index 6619d3049f4..00000000000 --- a/queue-5.15/net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 7740412cc3a41401c3759a4310192dfde61e224d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 4 May 2023 16:07:27 -0700 -Subject: net: bcmgenet: Remove phy_stop() from bcmgenet_netif_stop() - -From: Florian Fainelli - -[ Upstream commit 93e0401e0fc0c54b0ac05b687cd135c2ac38187c ] - -The call to phy_stop() races with the later call to phy_disconnect(), -resulting in concurrent phy_suspend() calls being run from different -CPUs. The final call to phy_disconnect() ensures that the PHY is -stopped and suspended, too. - -Fixes: c96e731c93ff ("net: bcmgenet: connect and disconnect from the PHY state machine") -Signed-off-by: Florian Fainelli -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/broadcom/genet/bcmgenet.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -index 92cd2916e8015..35bf840716d57 100644 ---- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c -+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -@@ -3416,7 +3416,6 @@ static void bcmgenet_netif_stop(struct net_device *dev) - /* Disable MAC transmit. TX DMA disabled must be done before this */ - umac_enable_set(priv, CMD_TX_EN, false); - -- phy_stop(dev->phydev); - bcmgenet_disable_rx_napi(priv); - bcmgenet_intr_disable(priv); - --- -2.39.2 - diff --git a/queue-5.15/series b/queue-5.15/series index c898c9d584d..e7c13e568a2 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -45,7 +45,6 @@ net-dsa-mt7530-fix-corrupt-frames-using-trgmii-on-40.patch virtio_net-split-free_unused_bufs.patch virtio_net-suppress-cpu-stall-when-free_unused_bufs.patch net-enetc-check-the-index-of-the-sfi-rather-than-the.patch -net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch perf-scripts-intel-pt-events.py-fix-ipc-output-for-p.patch perf-vendor-events-power9-remove-utf-8-characters-fr.patch perf-pmu-zfree-expects-a-pointer-to-a-pointer-to-zer.patch diff --git a/queue-5.4/net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch b/queue-5.4/net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch deleted file mode 100644 index b1909b704a3..00000000000 --- a/queue-5.4/net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e5826e4a0f7a2bf79a7a34f3b78e41d51133ccaf Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 4 May 2023 16:07:27 -0700 -Subject: net: bcmgenet: Remove phy_stop() from bcmgenet_netif_stop() - -From: Florian Fainelli - -[ Upstream commit 93e0401e0fc0c54b0ac05b687cd135c2ac38187c ] - -The call to phy_stop() races with the later call to phy_disconnect(), -resulting in concurrent phy_suspend() calls being run from different -CPUs. The final call to phy_disconnect() ensures that the PHY is -stopped and suspended, too. - -Fixes: c96e731c93ff ("net: bcmgenet: connect and disconnect from the PHY state machine") -Signed-off-by: Florian Fainelli -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/broadcom/genet/bcmgenet.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -index 1b725a021455b..468f79c270ac3 100644 ---- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c -+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -@@ -2988,7 +2988,6 @@ static void bcmgenet_netif_stop(struct net_device *dev) - /* Disable MAC transmit. TX DMA disabled must be done before this */ - umac_enable_set(priv, CMD_TX_EN, false); - -- phy_stop(dev->phydev); - bcmgenet_disable_rx_napi(priv); - bcmgenet_intr_disable(priv); - --- -2.39.2 - diff --git a/queue-5.4/series b/queue-5.4/series index 333949c6c6b..9f83fb0346b 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -232,7 +232,6 @@ alsa-caiaq-input-add-error-handling-for-unsupported-.patch net-dsa-mt7530-fix-corrupt-frames-using-trgmii-on-40.patch virtio_net-split-free_unused_bufs.patch virtio_net-suppress-cpu-stall-when-free_unused_bufs.patch -net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch perf-vendor-events-power9-remove-utf-8-characters-fr.patch perf-map-delete-two-variable-initialisations-before-.patch perf-symbols-fix-return-incorrect-build_id-size-in-e.patch diff --git a/queue-6.1/net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch b/queue-6.1/net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch deleted file mode 100644 index c272c451b58..00000000000 --- a/queue-6.1/net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 103c5f233bdeeabb1b3b3d03fbebd237d213eef2 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 4 May 2023 16:07:27 -0700 -Subject: net: bcmgenet: Remove phy_stop() from bcmgenet_netif_stop() - -From: Florian Fainelli - -[ Upstream commit 93e0401e0fc0c54b0ac05b687cd135c2ac38187c ] - -The call to phy_stop() races with the later call to phy_disconnect(), -resulting in concurrent phy_suspend() calls being run from different -CPUs. The final call to phy_disconnect() ensures that the PHY is -stopped and suspended, too. - -Fixes: c96e731c93ff ("net: bcmgenet: connect and disconnect from the PHY state machine") -Signed-off-by: Florian Fainelli -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/broadcom/genet/bcmgenet.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -index f679ed54b3ef2..9860fd66f3bca 100644 ---- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c -+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -@@ -3460,7 +3460,6 @@ static void bcmgenet_netif_stop(struct net_device *dev) - /* Disable MAC transmit. TX DMA disabled must be done before this */ - umac_enable_set(priv, CMD_TX_EN, false); - -- phy_stop(dev->phydev); - bcmgenet_disable_rx_napi(priv); - bcmgenet_intr_disable(priv); - --- -2.39.2 - diff --git a/queue-6.1/series b/queue-6.1/series index 98cb87613c8..e997632a38e 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -86,7 +86,6 @@ net-dsa-mt7530-fix-network-connectivity-with-multipl.patch ice-block-lan-in-case-of-vf-to-vf-offload.patch virtio_net-suppress-cpu-stall-when-free_unused_bufs.patch net-enetc-check-the-index-of-the-sfi-rather-than-the.patch -net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch perf-record-fix-read-lost-count-failed-msg-with-samp.patch perf-scripts-intel-pt-events.py-fix-ipc-output-for-p.patch perf-vendor-events-s390-remove-utf-8-characters-from.patch diff --git a/queue-6.2/net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch b/queue-6.2/net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch deleted file mode 100644 index a2df2ba0fbc..00000000000 --- a/queue-6.2/net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch +++ /dev/null @@ -1,37 +0,0 @@ -From c6cbebae2731beb9c56aab2a2b620bcdd6bead0f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 4 May 2023 16:07:27 -0700 -Subject: net: bcmgenet: Remove phy_stop() from bcmgenet_netif_stop() - -From: Florian Fainelli - -[ Upstream commit 93e0401e0fc0c54b0ac05b687cd135c2ac38187c ] - -The call to phy_stop() races with the later call to phy_disconnect(), -resulting in concurrent phy_suspend() calls being run from different -CPUs. The final call to phy_disconnect() ensures that the PHY is -stopped and suspended, too. - -Fixes: c96e731c93ff ("net: bcmgenet: connect and disconnect from the PHY state machine") -Signed-off-by: Florian Fainelli -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/broadcom/genet/bcmgenet.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -index d937daa8ee883..f28ffc31df220 100644 ---- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c -+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -@@ -3465,7 +3465,6 @@ static void bcmgenet_netif_stop(struct net_device *dev) - /* Disable MAC transmit. TX DMA disabled must be done before this */ - umac_enable_set(priv, CMD_TX_EN, false); - -- phy_stop(dev->phydev); - bcmgenet_disable_rx_napi(priv); - bcmgenet_intr_disable(priv); - --- -2.39.2 - diff --git a/queue-6.2/series b/queue-6.2/series index d1ea2a8355a..59ba3fc408b 100644 --- a/queue-6.2/series +++ b/queue-6.2/series @@ -89,7 +89,6 @@ ice-block-lan-in-case-of-vf-to-vf-offload.patch virtio_net-suppress-cpu-stall-when-free_unused_bufs.patch net-enetc-check-the-index-of-the-sfi-rather-than-the.patch net-fec-correct-the-counting-of-xdp-sent-frames.patch -net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch perf-record-fix-read-lost-count-failed-msg-with-samp.patch perf-build-support-python-perf.so-testing.patch perf-scripts-intel-pt-events.py-fix-ipc-output-for-p.patch diff --git a/queue-6.3/net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch b/queue-6.3/net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch deleted file mode 100644 index 62a4f47fa62..00000000000 --- a/queue-6.3/net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0d578de8876ba202f255a81fc951e6f6f1b698cf Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 4 May 2023 16:07:27 -0700 -Subject: net: bcmgenet: Remove phy_stop() from bcmgenet_netif_stop() - -From: Florian Fainelli - -[ Upstream commit 93e0401e0fc0c54b0ac05b687cd135c2ac38187c ] - -The call to phy_stop() races with the later call to phy_disconnect(), -resulting in concurrent phy_suspend() calls being run from different -CPUs. The final call to phy_disconnect() ensures that the PHY is -stopped and suspended, too. - -Fixes: c96e731c93ff ("net: bcmgenet: connect and disconnect from the PHY state machine") -Signed-off-by: Florian Fainelli -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/broadcom/genet/bcmgenet.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -index d937daa8ee883..f28ffc31df220 100644 ---- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c -+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -@@ -3465,7 +3465,6 @@ static void bcmgenet_netif_stop(struct net_device *dev) - /* Disable MAC transmit. TX DMA disabled must be done before this */ - umac_enable_set(priv, CMD_TX_EN, false); - -- phy_stop(dev->phydev); - bcmgenet_disable_rx_napi(priv); - bcmgenet_intr_disable(priv); - --- -2.39.2 - diff --git a/queue-6.3/series b/queue-6.3/series index 308f1c86246..145c09079f1 100644 --- a/queue-6.3/series +++ b/queue-6.3/series @@ -95,7 +95,6 @@ net-enetc-check-the-index-of-the-sfi-rather-than-the.patch net-fec-correct-the-counting-of-xdp-sent-frames.patch net-sched-flower-fix-filter-idr-initialization.patch net-sched-flower-fix-error-handler-on-replace.patch -net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch perf-record-fix-read-lost-count-failed-msg-with-samp.patch perf-lock-contention-fix-compiler-builtin-detection.patch perf-build-support-python-perf.so-testing.patch