From: Greg Kroah-Hartman Date: Thu, 29 Oct 2020 08:00:43 +0000 (+0100) Subject: drop broken net-fec-fix-phy-init-after-phy_reset_after_clk_enabl.patch patch everywhere X-Git-Tag: v4.4.241~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=907e702ac852e400488e42b687acf3a02b38047c;p=thirdparty%2Fkernel%2Fstable-queue.git drop broken net-fec-fix-phy-init-after-phy_reset_after_clk_enabl.patch patch everywhere --- diff --git a/queue-4.19/net-fec-fix-phy-init-after-phy_reset_after_clk_enabl.patch b/queue-4.19/net-fec-fix-phy-init-after-phy_reset_after_clk_enabl.patch deleted file mode 100644 index 06074e777d0..00000000000 --- a/queue-4.19/net-fec-fix-phy-init-after-phy_reset_after_clk_enabl.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 1876af92a7ebd62d2db0068a6203615ec1864ab6 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 6 Oct 2020 15:52:53 +0200 -Subject: net: fec: Fix PHY init after phy_reset_after_clk_enable() - -From: Marek Vasut - -[ Upstream commit 0da1ccbbefb662915228bc17e1c7d4ad28b3ddab ] - -The phy_reset_after_clk_enable() does a PHY reset, which means the PHY -loses its register settings. The fec_enet_mii_probe() starts the PHY -and does the necessary calls to configure the PHY via PHY framework, -and loads the correct register settings into the PHY. Therefore, -fec_enet_mii_probe() should be called only after the PHY has been -reset, not before as it is now. - -Fixes: 1b0a83ac04e3 ("net: fec: add phy_reset_after_clk_enable() support") -Reviewed-by: Andrew Lunn -Tested-by: Richard Leitner -Signed-off-by: Marek Vasut -Cc: Christoph Niedermaier -Cc: David S. Miller -Cc: NXP Linux Team -Cc: Shawn Guo -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/freescale/fec_main.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c -index 7d1a669416f20..6bd5738273e7a 100644 ---- a/drivers/net/ethernet/freescale/fec_main.c -+++ b/drivers/net/ethernet/freescale/fec_main.c -@@ -2961,6 +2961,11 @@ fec_enet_open(struct net_device *ndev) - if (ret) - goto err_enet_mii_probe; - -+ /* Probe and connect to PHY when open the interface */ -+ ret = fec_enet_mii_probe(ndev); -+ if (ret) -+ goto err_enet_mii_probe; -+ - if (fep->quirks & FEC_QUIRK_ERR006687) - imx6q_cpuidle_fec_irqs_used(); - --- -2.25.1 - diff --git a/queue-4.19/series b/queue-4.19/series index d1ebaee3978..bfbfa209c1a 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -121,7 +121,6 @@ scsi-target-tcmu-fix-warning-page-may-be-used-uninit.patch scsi-be2iscsi-fix-a-theoretical-leak-in-beiscsi_crea.patch platform-x86-mlx-platform-remove-psu-eeprom-configur.patch mwifiex-fix-double-free.patch -net-fec-fix-phy-init-after-phy_reset_after_clk_enabl.patch ipvs-clear-skb-tstamp-in-forwarding-path.patch net-korina-fix-kfree-of-rx-tx-descriptor-array.patch netfilter-nf_log-missing-vlan-offload-tag-and-proto.patch diff --git a/queue-5.4/net-fec-fix-phy-init-after-phy_reset_after_clk_enabl.patch b/queue-5.4/net-fec-fix-phy-init-after-phy_reset_after_clk_enabl.patch deleted file mode 100644 index d7d42eef58b..00000000000 --- a/queue-5.4/net-fec-fix-phy-init-after-phy_reset_after_clk_enabl.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 39a069b84e5ec13f34b35579ad4230777773f82b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 6 Oct 2020 15:52:53 +0200 -Subject: net: fec: Fix PHY init after phy_reset_after_clk_enable() - -From: Marek Vasut - -[ Upstream commit 0da1ccbbefb662915228bc17e1c7d4ad28b3ddab ] - -The phy_reset_after_clk_enable() does a PHY reset, which means the PHY -loses its register settings. The fec_enet_mii_probe() starts the PHY -and does the necessary calls to configure the PHY via PHY framework, -and loads the correct register settings into the PHY. Therefore, -fec_enet_mii_probe() should be called only after the PHY has been -reset, not before as it is now. - -Fixes: 1b0a83ac04e3 ("net: fec: add phy_reset_after_clk_enable() support") -Reviewed-by: Andrew Lunn -Tested-by: Richard Leitner -Signed-off-by: Marek Vasut -Cc: Christoph Niedermaier -Cc: David S. Miller -Cc: NXP Linux Team -Cc: Shawn Guo -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/freescale/fec_main.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c -index fd7fc6f20c9da..7831fc07c9a6f 100644 ---- a/drivers/net/ethernet/freescale/fec_main.c -+++ b/drivers/net/ethernet/freescale/fec_main.c -@@ -3014,6 +3014,11 @@ fec_enet_open(struct net_device *ndev) - if (ret) - goto err_enet_mii_probe; - -+ /* Probe and connect to PHY when open the interface */ -+ ret = fec_enet_mii_probe(ndev); -+ if (ret) -+ goto err_enet_mii_probe; -+ - if (fep->quirks & FEC_QUIRK_ERR006687) - imx6q_cpuidle_fec_irqs_used(); - --- -2.25.1 - diff --git a/queue-5.4/series b/queue-5.4/series index 4cfc94cc4c7..e2cb0e1b6c1 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -185,7 +185,6 @@ scsi-be2iscsi-fix-a-theoretical-leak-in-beiscsi_crea.patch ipmi_si-fix-wrong-return-value-in-try_smi_init.patch platform-x86-mlx-platform-remove-psu-eeprom-configur.patch mwifiex-fix-double-free.patch -net-fec-fix-phy-init-after-phy_reset_after_clk_enabl.patch ipvs-clear-skb-tstamp-in-forwarding-path.patch net-korina-fix-kfree-of-rx-tx-descriptor-array.patch netfilter-nf_log-missing-vlan-offload-tag-and-proto.patch diff --git a/queue-5.8/net-fec-fix-phy-init-after-phy_reset_after_clk_enabl.patch b/queue-5.8/net-fec-fix-phy-init-after-phy_reset_after_clk_enabl.patch deleted file mode 100644 index e66fd897e1c..00000000000 --- a/queue-5.8/net-fec-fix-phy-init-after-phy_reset_after_clk_enabl.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 7640b60d7b6fcee9e5701ceee7c19c7aae064210 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 6 Oct 2020 15:52:53 +0200 -Subject: net: fec: Fix PHY init after phy_reset_after_clk_enable() - -From: Marek Vasut - -[ Upstream commit 0da1ccbbefb662915228bc17e1c7d4ad28b3ddab ] - -The phy_reset_after_clk_enable() does a PHY reset, which means the PHY -loses its register settings. The fec_enet_mii_probe() starts the PHY -and does the necessary calls to configure the PHY via PHY framework, -and loads the correct register settings into the PHY. Therefore, -fec_enet_mii_probe() should be called only after the PHY has been -reset, not before as it is now. - -Fixes: 1b0a83ac04e3 ("net: fec: add phy_reset_after_clk_enable() support") -Reviewed-by: Andrew Lunn -Tested-by: Richard Leitner -Signed-off-by: Marek Vasut -Cc: Christoph Niedermaier -Cc: David S. Miller -Cc: NXP Linux Team -Cc: Shawn Guo -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/freescale/fec_main.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c -index e1cd795556294..388d1a5e2f918 100644 ---- a/drivers/net/ethernet/freescale/fec_main.c -+++ b/drivers/net/ethernet/freescale/fec_main.c -@@ -3017,6 +3017,11 @@ fec_enet_open(struct net_device *ndev) - if (ret) - goto err_enet_mii_probe; - -+ /* Probe and connect to PHY when open the interface */ -+ ret = fec_enet_mii_probe(ndev); -+ if (ret) -+ goto err_enet_mii_probe; -+ - if (fep->quirks & FEC_QUIRK_ERR006687) - imx6q_cpuidle_fec_irqs_used(); - --- -2.25.1 - diff --git a/queue-5.8/series b/queue-5.8/series index 9d7010916e6..54ca30e4c4b 100644 --- a/queue-5.8/series +++ b/queue-5.8/series @@ -308,7 +308,6 @@ ipmi_si-fix-wrong-return-value-in-try_smi_init.patch tracing-fix-parse_synth_field-error-handling.patch platform-x86-mlx-platform-remove-psu-eeprom-configur.patch mwifiex-fix-double-free.patch -net-fec-fix-phy-init-after-phy_reset_after_clk_enabl.patch drm-panfrost-increase-readl_relaxed_poll_timeout-val.patch ipvs-clear-skb-tstamp-in-forwarding-path.patch bpf-sockmap-remove-skb_orphan-and-let-normal-skb_kfr.patch diff --git a/queue-5.9/net-fec-fix-phy-init-after-phy_reset_after_clk_enabl.patch b/queue-5.9/net-fec-fix-phy-init-after-phy_reset_after_clk_enabl.patch deleted file mode 100644 index bb2dc89d9a7..00000000000 --- a/queue-5.9/net-fec-fix-phy-init-after-phy_reset_after_clk_enabl.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 928f20b921761543f61c2eacc93ad3cf28cd33cc Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 6 Oct 2020 15:52:53 +0200 -Subject: net: fec: Fix PHY init after phy_reset_after_clk_enable() - -From: Marek Vasut - -[ Upstream commit 0da1ccbbefb662915228bc17e1c7d4ad28b3ddab ] - -The phy_reset_after_clk_enable() does a PHY reset, which means the PHY -loses its register settings. The fec_enet_mii_probe() starts the PHY -and does the necessary calls to configure the PHY via PHY framework, -and loads the correct register settings into the PHY. Therefore, -fec_enet_mii_probe() should be called only after the PHY has been -reset, not before as it is now. - -Fixes: 1b0a83ac04e3 ("net: fec: add phy_reset_after_clk_enable() support") -Reviewed-by: Andrew Lunn -Tested-by: Richard Leitner -Signed-off-by: Marek Vasut -Cc: Christoph Niedermaier -Cc: David S. Miller -Cc: NXP Linux Team -Cc: Shawn Guo -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/freescale/fec_main.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c -index 31f60b542feb4..933f4a6822547 100644 ---- a/drivers/net/ethernet/freescale/fec_main.c -+++ b/drivers/net/ethernet/freescale/fec_main.c -@@ -3016,6 +3016,11 @@ fec_enet_open(struct net_device *ndev) - if (ret) - goto err_enet_mii_probe; - -+ /* Probe and connect to PHY when open the interface */ -+ ret = fec_enet_mii_probe(ndev); -+ if (ret) -+ goto err_enet_mii_probe; -+ - if (fep->quirks & FEC_QUIRK_ERR006687) - imx6q_cpuidle_fec_irqs_used(); - --- -2.25.1 - diff --git a/queue-5.9/series b/queue-5.9/series index 375fd13ad41..886782e3713 100644 --- a/queue-5.9/series +++ b/queue-5.9/series @@ -380,7 +380,6 @@ staging-wfx-fix-ba-sessions-for-older-firmwares.patch platform-x86-mlx-platform-remove-psu-eeprom-configur.patch dm-fix-request-based-dm-to-not-bounce-through-indire.patch mwifiex-fix-double-free.patch -net-fec-fix-phy-init-after-phy_reset_after_clk_enabl.patch drm-panfrost-increase-readl_relaxed_poll_timeout-val.patch drm-amdgpu-fix-invalid-number-of-character-in-amdgpu.patch ipvs-clear-skb-tstamp-in-forwarding-path.patch