aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-10-25 21:02:13 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-10-25 21:02:13 +0000
commitc185d48b7cfdc88e7cc40ba46b8bfff65bd0af7c (patch)
treeb3b46c68576f6392d0a301a05182e9396bcbe9b1
parent3d77352390cb3d8081d6cfbde14444a39aa77a0a (diff)
downloadupstream-c185d48b7cfdc88e7cc40ba46b8bfff65bd0af7c.tar.gz
upstream-c185d48b7cfdc88e7cc40ba46b8bfff65bd0af7c.tar.bz2
upstream-c185d48b7cfdc88e7cc40ba46b8bfff65bd0af7c.zip
brcm47xx: b44: add dummy phy device if we do not find any
On some devices with e.g. a BCM2535F switch the second MAC is used, but we can not find a phy under all addresses between 0 and 31, 0xffffffff is returned as phy id. If we can not find a phy at the expected address create a dummy one. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 38538
-rw-r--r--target/linux/brcm47xx/patches-3.10/208-b44-add-dummy-phy-device-if-we-do-not-find-any.patch64
1 files changed, 64 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/208-b44-add-dummy-phy-device-if-we-do-not-find-any.patch b/target/linux/brcm47xx/patches-3.10/208-b44-add-dummy-phy-device-if-we-do-not-find-any.patch
new file mode 100644
index 0000000000..fd51a3f61b
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.10/208-b44-add-dummy-phy-device-if-we-do-not-find-any.patch
@@ -0,0 +1,64 @@
+From 1a900b17b34ddca0336c739a2836bcb7f8aad5a8 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Fri, 25 Oct 2013 00:03:33 +0200
+Subject: [PATCH 9/9] b44: add dummy phy device if we do not find any
+
+---
+ drivers/net/ethernet/broadcom/b44.c | 25 +++++++++++++++++++++----
+ 1 file changed, 21 insertions(+), 4 deletions(-)
+
+--- a/drivers/net/ethernet/broadcom/b44.c
++++ b/drivers/net/ethernet/broadcom/b44.c
+@@ -2222,6 +2222,8 @@ static int b44_register_phy_one(struct b
+ struct ssb_device *sdev = bp->sdev;
+ struct phy_device *phydev;
+ int err;
++ bool dummy_phy = false;
++ struct phy_c45_device_ids c45_ids = {0};
+
+ mii_bus = mdiobus_alloc();
+ if (!mii_bus) {
+@@ -2256,9 +2258,21 @@ static int b44_register_phy_one(struct b
+
+ phydev = bp->mii_bus->phy_map[bp->phy_addr];
+ if (!phydev) {
+- dev_err(sdev->dev, "could not find PHY at %i\n", bp->phy_addr);
+- err = -ENODEV;
+- goto err_out_mdiobus_unregister;
++ dummy_phy = true;
++ dev_info(sdev->dev, "could not find PHY at %i, create dummy one\n",
++ bp->phy_addr);
++
++ phydev = phy_device_create(bp->mii_bus, bp->phy_addr, 0x0, false, &c45_ids);
++ if (IS_ERR(phydev)) {
++ err = PTR_ERR(phydev);
++ dev_err(sdev->dev, "Can not create dummy PHY\n");
++ goto err_out_mdiobus_unregister;
++ }
++ err = phy_device_register(phydev);
++ if (err) {
++ dev_err(sdev->dev, "failed to register MII bus\n");
++ goto err_out_phy_free;
++ }
+ }
+
+ err = phy_connect_direct(bp->dev, phydev, &b44_adjust_link,
+@@ -2266,7 +2280,7 @@ static int b44_register_phy_one(struct b
+ if (err < 0) {
+ dev_err(sdev->dev, "could not attach PHY at %i\n",
+ bp->phy_addr);
+- goto err_out_mdiobus_unregister;
++ goto err_out_phy_free;
+ }
+
+ /* mask with MAC supported features */
+@@ -2288,6 +2302,9 @@ static int b44_register_phy_one(struct b
+
+ return 0;
+
++err_out_phy_free:
++ if (phydev && dummy_phy)
++ phy_device_free(phydev);
+ err_out_mdiobus_unregister:
+ mdiobus_unregister(mii_bus);
+