5.4-stable patches

added patches:
	net-phy-micrel-set-soft_reset-callback-to-genphy_soft_reset-for-ksz8081.patch

diff --git a/queue-5.4/net-phy-micrel-set-soft_reset-callback-to-genphy_soft_reset-for-ksz8081.patch b/queue-5.4/net-phy-micrel-set-soft_reset-callback-to-genphy_soft_reset-for-ksz8081.patch
new file mode 100644 (file)
index 0000000..b26140e
--- /dev/null
+++ b/queue-5.4/net-phy-micrel-set-soft_reset-callback-to-genphy_soft_reset-for-ksz8081.patch
@@ -0,0 +1,43 @@
+From 764d31cacfe48440745c4bbb55a62ac9471c9f19 Mon Sep 17 00:00:00 2001
+From: Christian Melki <christian.melki@t2data.com>
+Date: Wed, 24 Feb 2021 21:55:36 +0100
+Subject: net: phy: micrel: set soft_reset callback to genphy_soft_reset for KSZ8081
+
+From: Christian Melki <christian.melki@t2data.com>
+
+commit 764d31cacfe48440745c4bbb55a62ac9471c9f19 upstream.
+
+Following a similar reinstate for the KSZ9031.
+
+Older kernels would use the genphy_soft_reset if the PHY did not implement
+a .soft_reset.
+
+Bluntly removing that default may expose a lot of situations where various
+PHYs/board implementations won't recover on various changes.
+Like with this implementation during a 4.9.x to 5.4.x LTS transition.
+I think it's a good thing to remove unwanted soft resets but wonder if it
+did open a can of worms?
+
+Atleast this fixes one iMX6 FEC/RMII/8081 combo.
+
+Fixes: 6e2d85ec0559 ("net: phy: Stop with excessive soft reset")
+Signed-off-by: Christian Melki <christian.melki@t2data.com>
+Reviewed-by: Andrew Lunn <andrew@lunn.ch>
+Link: https://lore.kernel.org/r/20210224205536.9349-1-christian.melki@t2data.com
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Wadim Egorov <w.egorov@phytec.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/phy/micrel.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/net/phy/micrel.c
++++ b/drivers/net/phy/micrel.c
+@@ -1096,6 +1096,7 @@ static struct phy_driver ksphy_driver[]
+       .probe          = kszphy_probe,
+       .config_init    = ksz8081_config_init,
+       .ack_interrupt  = kszphy_ack_interrupt,
++      .soft_reset     = genphy_soft_reset,
+       .config_intr    = kszphy_config_intr,
+       .get_sset_count = kszphy_get_sset_count,
+       .get_strings    = kszphy_get_strings,

diff --git a/queue-5.4/series b/queue-5.4/series
index 086ffbe305f639ffb6e642fa2e57e56566a95d8d..0b08314c1ee4bceecf9d9271ecc6448fb102fdf1 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -18,3 +18,4 @@ ipv6-check-attribute-length-for-rta_gateway-when-deleting-multipath-route.patch
 lwtunnel-validate-rta_encap_type-attribute-length.patch
 batman-adv-mcast-don-t-send-link-local-multicast-to-mcast-routers.patch
 sch_qfq-prevent-shift-out-of-bounds-in-qfq_init_qdisc.patch
+net-phy-micrel-set-soft_reset-callback-to-genphy_soft_reset-for-ksz8081.patch