aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Bauer <mail@david-bauer.net>2019-09-22 19:15:56 +0200
committerDavid Bauer <mail@david-bauer.net>2019-09-25 22:50:24 +0200
commita48ed75d6ca590746d24b14ade0778aa2eae70c7 (patch)
treed7b59d83f26d0f8ce17f6a42861e6fa5b409939d
parent92953ae99f240a0b45ab66defde5f7b8eeb94e35 (diff)
downloadupstream-a48ed75d6ca590746d24b14ade0778aa2eae70c7.tar.gz
upstream-a48ed75d6ca590746d24b14ade0778aa2eae70c7.tar.bz2
upstream-a48ed75d6ca590746d24b14ade0778aa2eae70c7.zip
ipq40xx: abort ar40xx probe on missing PHYs
The ar40xx driver currently panics in case no QCA807x PHY has been successfully probed. This happens when the external PHY is still in reset when probing the ar40xx switch driver. Note that this patch does not fix the root cause, ar40xx_probe now simply fails instead of causing a kernel panic due to a nullpointer dereference. Signed-off-by: David Bauer <mail@david-bauer.net> (cherry picked from commit e2c084cabc2b2a2fffc36aee3e48874f9862c74a)
-rw-r--r--target/linux/ipq40xx/patches-4.14/706-ar40xx-abort-probe-on-missig-phy.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/target/linux/ipq40xx/patches-4.14/706-ar40xx-abort-probe-on-missig-phy.patch b/target/linux/ipq40xx/patches-4.14/706-ar40xx-abort-probe-on-missig-phy.patch
new file mode 100644
index 0000000000..19474bff0d
--- /dev/null
+++ b/target/linux/ipq40xx/patches-4.14/706-ar40xx-abort-probe-on-missig-phy.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/ar40xx.c
++++ b/drivers/net/phy/ar40xx.c
+@@ -2021,6 +2021,12 @@ static int ar40xx_probe(struct platform_
+ /* register switch */
+ swdev = &priv->dev;
+
++ if (priv->mii_bus == NULL) {
++ dev_err(&pdev->dev, "Probe failed - Missing PHYs!\n");
++ ret = -ENODEV;
++ goto err_missing_phy;
++ }
++
+ swdev->alias = dev_name(&priv->mii_bus->dev);
+
+ swdev->cpu_port = AR40XX_PORT_CPU;
+@@ -2052,6 +2058,7 @@ err_unregister_switch:
+ unregister_switch(&priv->dev);
+ err_unregister_phy:
+ phy_driver_unregister(&ar40xx_phy_driver);
++err_missing_phy:
+ platform_set_drvdata(pdev, NULL);
+ return ret;
+ }