From: Greg Kroah-Hartman Date: Sun, 28 May 2023 16:56:46 +0000 (+0100) Subject: 5.10-stable patches X-Git-Tag: review~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf608864d592d1496dd52f8ee334f1ac956c3498;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: 3c589_cs-fix-an-error-handling-path-in-tc589_probe.patch arm64-dts-imx8mn-var-som-fix-phy-detection-bug-by-adding-deassert-delay.patch net-phy-mscc-add-vsc8502-to-module_device_table.patch --- diff --git a/queue-5.10/3c589_cs-fix-an-error-handling-path-in-tc589_probe.patch b/queue-5.10/3c589_cs-fix-an-error-handling-path-in-tc589_probe.patch new file mode 100644 index 00000000000..4affa87b300 --- /dev/null +++ b/queue-5.10/3c589_cs-fix-an-error-handling-path-in-tc589_probe.patch @@ -0,0 +1,49 @@ +From 640bf95b2c7c2981fb471acdafbd3e0458f8390d Mon Sep 17 00:00:00 2001 +From: Christophe JAILLET +Date: Sat, 20 May 2023 11:48:55 +0200 +Subject: 3c589_cs: Fix an error handling path in tc589_probe() + +From: Christophe JAILLET + +commit 640bf95b2c7c2981fb471acdafbd3e0458f8390d upstream. + +Should tc589_config() fail, some resources need to be released as already +done in the remove function. + +Fixes: 15b99ac17295 ("[PATCH] pcmcia: add return value to _config() functions") +Signed-off-by: Christophe JAILLET +Reviewed-by: Simon Horman +Link: https://lore.kernel.org/r/d8593ae867b24c79063646e36f9b18b0790107cb.1684575975.git.christophe.jaillet@wanadoo.fr +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/3com/3c589_cs.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +--- a/drivers/net/ethernet/3com/3c589_cs.c ++++ b/drivers/net/ethernet/3com/3c589_cs.c +@@ -195,6 +195,7 @@ static int tc589_probe(struct pcmcia_dev + { + struct el3_private *lp; + struct net_device *dev; ++ int ret; + + dev_dbg(&link->dev, "3c589_attach()\n"); + +@@ -218,7 +219,15 @@ static int tc589_probe(struct pcmcia_dev + + dev->ethtool_ops = &netdev_ethtool_ops; + +- return tc589_config(link); ++ ret = tc589_config(link); ++ if (ret) ++ goto err_free_netdev; ++ ++ return 0; ++ ++err_free_netdev: ++ free_netdev(dev); ++ return ret; + } + + static void tc589_detach(struct pcmcia_device *link) diff --git a/queue-5.10/arm64-dts-imx8mn-var-som-fix-phy-detection-bug-by-adding-deassert-delay.patch b/queue-5.10/arm64-dts-imx8mn-var-som-fix-phy-detection-bug-by-adding-deassert-delay.patch new file mode 100644 index 00000000000..c6c605c4a13 --- /dev/null +++ b/queue-5.10/arm64-dts-imx8mn-var-som-fix-phy-detection-bug-by-adding-deassert-delay.patch @@ -0,0 +1,58 @@ +From f161cea5a20f3aeeb637a88ad1705fc2720b4d58 Mon Sep 17 00:00:00 2001 +From: Hugo Villeneuve +Date: Mon, 1 May 2023 13:05:32 -0400 +Subject: arm64: dts: imx8mn-var-som: fix PHY detection bug by adding deassert delay + +From: Hugo Villeneuve + +commit f161cea5a20f3aeeb637a88ad1705fc2720b4d58 upstream. + +While testing the ethernet interface on a Variscite symphony carrier +board using an imx8mn SOM with an onboard ADIN1300 PHY (EC hardware +configuration), the ethernet PHY is not detected. + +The ADIN1300 datasheet indicate that the "Management interface +active (t4)" state is reached at most 5ms after the reset signal is +deasserted. + +The device tree in Variscite custom git repository uses the following +property: + + phy-reset-post-delay = <20>; + +Add a new MDIO property 'reset-deassert-us' of 20ms to have the same +delay inside the ethphy node. Adding this property fixes the problem +with the PHY detection. + +Note that this SOM can also have an Atheros AR8033 PHY. In this case, +a 1ms deassert delay is sufficient. Add a comment to that effect. + +Fixes: ade0176dd8a0 ("arm64: dts: imx8mn-var-som: Add Variscite VAR-SOM-MX8MN System on Module") +Signed-off-by: Hugo Villeneuve +Signed-off-by: Shawn Guo +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/boot/dts/freescale/imx8mn-var-som.dtsi | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +--- a/arch/arm64/boot/dts/freescale/imx8mn-var-som.dtsi ++++ b/arch/arm64/boot/dts/freescale/imx8mn-var-som.dtsi +@@ -98,11 +98,17 @@ + #address-cells = <1>; + #size-cells = <0>; + +- ethphy: ethernet-phy@4 { ++ ethphy: ethernet-phy@4 { /* AR8033 or ADIN1300 */ + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <4>; + reset-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + reset-assert-us = <10000>; ++ /* ++ * Deassert delay: ++ * ADIN1300 requires 5ms. ++ * AR8033 requires 1ms. ++ */ ++ reset-deassert-us = <20000>; + }; + }; + }; diff --git a/queue-5.10/net-phy-mscc-add-vsc8502-to-module_device_table.patch b/queue-5.10/net-phy-mscc-add-vsc8502-to-module_device_table.patch new file mode 100644 index 00000000000..e56817d47a3 --- /dev/null +++ b/queue-5.10/net-phy-mscc-add-vsc8502-to-module_device_table.patch @@ -0,0 +1,31 @@ +From 57fb54ab9f6945e204740b696bd4cee61ee04e5e Mon Sep 17 00:00:00 2001 +From: David Epping +Date: Tue, 23 May 2023 17:31:05 +0200 +Subject: net: phy: mscc: add VSC8502 to MODULE_DEVICE_TABLE + +From: David Epping + +commit 57fb54ab9f6945e204740b696bd4cee61ee04e5e upstream. + +The mscc driver implements support for VSC8502, so its ID should be in +the MODULE_DEVICE_TABLE for automatic loading. + +Signed-off-by: David Epping +Fixes: d3169863310d ("net: phy: mscc: add support for VSC8502") +Reviewed-by: Vladimir Oltean +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/phy/mscc/mscc_main.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/net/phy/mscc/mscc_main.c ++++ b/drivers/net/phy/mscc/mscc_main.c +@@ -2563,6 +2563,7 @@ static struct phy_driver vsc85xx_driver[ + module_phy_driver(vsc85xx_driver); + + static struct mdio_device_id __maybe_unused vsc85xx_tbl[] = { ++ { PHY_ID_VSC8502, 0xfffffff0, }, + { PHY_ID_VSC8504, 0xfffffff0, }, + { PHY_ID_VSC8514, 0xfffffff0, }, + { PHY_ID_VSC8530, 0xfffffff0, }, diff --git a/queue-5.10/series b/queue-5.10/series index fa96cf5d7f8..32c0f41f6b6 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -206,3 +206,6 @@ net-mlx5e-do-as-little-as-possible-in-napi-poll-when-budget-is-0.patch net-mlx5-dr-fix-crc32-calculation-to-work-on-big-endian-be-cpus.patch net-mlx5-fix-error-message-when-failing-to-allocate-device-memory.patch net-mlx5-devcom-fix-error-flow-in-mlx5_devcom_register_device.patch +arm64-dts-imx8mn-var-som-fix-phy-detection-bug-by-adding-deassert-delay.patch +3c589_cs-fix-an-error-handling-path-in-tc589_probe.patch +net-phy-mscc-add-vsc8502-to-module_device_table.patch