Skip to content

Commit

Permalink
staging: octeon: repair "fixed-link" support
Browse files Browse the repository at this point in the history
The PHYs must be registered once in device probe function, not in device
open callback because it's only possible to register them once.

Fixes: a25e278 ("staging: octeon: support fixed-link phys")
Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20201016101858.11374-1-alexander.sverdlin@nokia.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Alexander Sverdlin authored and Greg Kroah-Hartman committed Oct 27, 2020
1 parent 3650b22 commit 179f5dc
Showing 2 changed files with 9 additions and 6 deletions.
6 changes: 0 additions & 6 deletions drivers/staging/octeon/ethernet-mdio.c
Original file line number Diff line number Diff line change
@@ -147,12 +147,6 @@ int cvm_oct_phy_setup_device(struct net_device *dev)

phy_node = of_parse_phandle(priv->of_node, "phy-handle", 0);
if (!phy_node && of_phy_is_fixed_link(priv->of_node)) {
int rc;

rc = of_phy_register_fixed_link(priv->of_node);
if (rc)
return rc;

phy_node = of_node_get(priv->of_node);
}
if (!phy_node)
9 changes: 9 additions & 0 deletions drivers/staging/octeon/ethernet.c
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@
#include <linux/phy.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
#include <linux/of_mdio.h>
#include <linux/of_net.h>
#include <linux/if_ether.h>
#include <linux/if_vlan.h>
@@ -892,6 +893,14 @@ static int cvm_oct_probe(struct platform_device *pdev)
break;
}

if (priv->of_node && of_phy_is_fixed_link(priv->of_node)) {
if (of_phy_register_fixed_link(priv->of_node)) {
netdev_err(dev, "Failed to register fixed link for interface %d, port %d\n",
interface, priv->port);
dev->netdev_ops = NULL;
}
}

if (!dev->netdev_ops) {
free_netdev(dev);
} else if (register_netdev(dev) < 0) {

0 comments on commit 179f5dc

Please sign in to comment.