From c41c33dd59e69dcb1338f54dbab03974979747a2 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 29 May 2022 19:28:09 +0800 Subject: [PATCH] kernel: refresh sfp patch Signed-off-by: Tianling Shen --- ...ve-fwnode-parsing-into-sfp-bus-layer.patch | 7 +++- ....17-net-sfp-ignore-disabled-SFP-node.patch | 38 ------------------- 2 files changed, 6 insertions(+), 39 deletions(-) delete mode 100644 target/linux/generic/backport-4.19/745-v5.17-net-sfp-ignore-disabled-SFP-node.patch diff --git a/target/linux/generic/backport-4.19/716-v5.4-net-sfp-move-fwnode-parsing-into-sfp-bus-layer.patch b/target/linux/generic/backport-4.19/716-v5.4-net-sfp-move-fwnode-parsing-into-sfp-bus-layer.patch index 4825227ee4..ec18ac9858 100644 --- a/target/linux/generic/backport-4.19/716-v5.4-net-sfp-move-fwnode-parsing-into-sfp-bus-layer.patch +++ b/target/linux/generic/backport-4.19/716-v5.4-net-sfp-move-fwnode-parsing-into-sfp-bus-layer.patch @@ -64,7 +64,7 @@ Signed-off-by: Russell King #include #include -@@ -519,45 +520,63 @@ static void sfp_upstream_clear(struct sf +@@ -519,45 +520,68 @@ static void sfp_upstream_clear(struct sf } /** @@ -122,6 +122,11 @@ Signed-off-by: Russell King + else if (ret < 0) + return ERR_PTR(ret); + ++ if (!fwnode_device_is_available(ref.fwnode)) { ++ fwnode_handle_put(ref.fwnode); ++ return NULL; ++ } ++ + bus = sfp_bus_get(ref.fwnode); + fwnode_handle_put(ref.fwnode); + if (!bus) diff --git a/target/linux/generic/backport-4.19/745-v5.17-net-sfp-ignore-disabled-SFP-node.patch b/target/linux/generic/backport-4.19/745-v5.17-net-sfp-ignore-disabled-SFP-node.patch deleted file mode 100644 index 0a7af3fa93..0000000000 --- a/target/linux/generic/backport-4.19/745-v5.17-net-sfp-ignore-disabled-SFP-node.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 2148927e6ed43a1667baf7c2ae3e0e05a44b51a0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marek=20Beh=C3=BAn?= -Date: Wed, 19 Jan 2022 17:44:55 +0100 -Subject: net: sfp: ignore disabled SFP node -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit ce0aa27ff3f6 ("sfp: add sfp-bus to bridge between network devices -and sfp cages") added code which finds SFP bus DT node even if the node -is disabled with status = "disabled". Because of this, when phylink is -created, it ends with non-null .sfp_bus member, even though the SFP -module is not probed (because the node is disabled). - -We need to ignore disabled SFP bus node. - -Fixes: ce0aa27ff3f6 ("sfp: add sfp-bus to bridge between network devices and sfp cages") -Signed-off-by: Marek Behún -Cc: stable@vger.kernel.org # 2203cbf2c8b5 ("net: sfp: move fwnode parsing into sfp-bus layer") -Signed-off-by: David S. Miller ---- - drivers/net/phy/sfp-bus.c | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/drivers/net/phy/sfp-bus.c -+++ b/drivers/net/phy/sfp-bus.c -@@ -557,6 +557,11 @@ struct sfp_bus *sfp_bus_find_fwnode(stru - else if (ret < 0) - return ERR_PTR(ret); - -+ if (!fwnode_device_is_available(ref.fwnode)) { -+ fwnode_handle_put(ref.fwnode); -+ return NULL; -+ } -+ - bus = sfp_bus_get(ref.fwnode); - fwnode_handle_put(ref.fwnode); - if (!bus)