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 (file)
index 407871f..0000000
--- 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 <sashal@kernel.org>
-Date: Thu, 4 May 2023 16:07:27 -0700
-Subject: net: bcmgenet: Remove phy_stop() from bcmgenet_netif_stop()
-
-From: Florian Fainelli <f.fainelli@gmail.com>
-
-[ 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 <f.fainelli@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 1744757dfd8985b23e133dac699ad2e5ffbfe83f..620157a1cb88276ef271ae2a69b2f742284a53a9 100644 (file)
--- 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 (file)
index 00a4d98..0000000
--- 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 <sashal@kernel.org>
-Date: Thu, 4 May 2023 16:07:27 -0700
-Subject: net: bcmgenet: Remove phy_stop() from bcmgenet_netif_stop()
-
-From: Florian Fainelli <f.fainelli@gmail.com>
-
-[ 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 <f.fainelli@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 598858a8a7cab918ddb047d5b6ca00054ea53895..2290ca69e8a181a121cd0191f2ab8889946585f4 100644 (file)
--- 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 (file)
index 6619d30..0000000
--- 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 <sashal@kernel.org>
-Date: Thu, 4 May 2023 16:07:27 -0700
-Subject: net: bcmgenet: Remove phy_stop() from bcmgenet_netif_stop()
-
-From: Florian Fainelli <f.fainelli@gmail.com>
-
-[ 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 <f.fainelli@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 c898c9d584d00525db6ff5d5fe796082d9f17dd7..e7c13e568a2f0f21a0e58a8090632a9dfb9f8fcd 100644 (file)
--- 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 (file)
index b1909b7..0000000
--- 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 <sashal@kernel.org>
-Date: Thu, 4 May 2023 16:07:27 -0700
-Subject: net: bcmgenet: Remove phy_stop() from bcmgenet_netif_stop()
-
-From: Florian Fainelli <f.fainelli@gmail.com>
-
-[ 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 <f.fainelli@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 333949c6c6b564c77c842f0c4bc136787f100cd9..9f83fb0346bde41eeed858e9b31bf497e8f9091d 100644 (file)
--- 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 (file)
index c272c45..0000000
--- 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 <sashal@kernel.org>
-Date: Thu, 4 May 2023 16:07:27 -0700
-Subject: net: bcmgenet: Remove phy_stop() from bcmgenet_netif_stop()
-
-From: Florian Fainelli <f.fainelli@gmail.com>
-
-[ 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 <f.fainelli@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 98cb87613c81f61d32c66ed3b402ceea3d4ba6b6..e997632a38ef4738da7ab4a5c5645f5684402d19 100644 (file)
--- 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 (file)
index a2df2ba..0000000
--- 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 <sashal@kernel.org>
-Date: Thu, 4 May 2023 16:07:27 -0700
-Subject: net: bcmgenet: Remove phy_stop() from bcmgenet_netif_stop()
-
-From: Florian Fainelli <f.fainelli@gmail.com>
-
-[ 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 <f.fainelli@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 d1ea2a8355a587c7b477c972098dec128898284e..59ba3fc408b38369b6005a069307ee592c1d3a7e 100644 (file)
--- 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 (file)
index 62a4f47..0000000
--- 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 <sashal@kernel.org>
-Date: Thu, 4 May 2023 16:07:27 -0700
-Subject: net: bcmgenet: Remove phy_stop() from bcmgenet_netif_stop()
-
-From: Florian Fainelli <f.fainelli@gmail.com>
-
-[ 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 <f.fainelli@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 308f1c8624679af8a2b23d8d651d7012502a502b..145c09079f1e209522efc74c7e5c898cd9b3c72c 100644 (file)
--- 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