Hi Andrew
On 6/07/20 6:29 am, Andrew Lunn wrote:
> To ensure that the octoen MDIO driver has been loaded, the Cavium
> ethernet drivers reference a dummy symbol in the MDIO driver. This
> forces it to be loaded first. And this symbol has not been cleanly
> implemented, resulting in warnings when build W=1 C=1.
>
> Since device tree is being used, and a phandle points to the PHY on
> the MDIO bus, we can make use of deferred probing. If the PHY fails to
> connect, it should be because the MDIO bus driver has not loaded
> yet. Return -EPROBE_DEFER so it will be tried again later.
>
> Cc: Sunil Goutham <sgout...@marvell.com>
> Cc: Robert Richter <rrich...@marvell.com>
> Cc: Chris Packham <chris.pack...@alliedtelesis.co.nz>
> Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
> Signed-off-by: Andrew Lunn <and...@lunn.ch>
Gave this a quick spin on one of our boards using the Octeon SoC. Looks
good to me
Tested-by: Chris Packham <chris.pack...@alliedtelesis.co.nz>
> ---
> drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 6 +-----
> drivers/net/phy/mdio-octeon.c | 6 ------
> drivers/staging/octeon/ethernet-mdio.c | 2 +-
> drivers/staging/octeon/ethernet-mdio.h | 2 --
> drivers/staging/octeon/ethernet.c | 2 --
> 5 files changed, 2 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
> b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
> index cbaa1924afbe..4bf0237ee52e 100644
> --- a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
> +++ b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
> @@ -961,7 +961,7 @@ static int octeon_mgmt_init_phy(struct net_device *netdev)
> PHY_INTERFACE_MODE_MII);
>
> if (!phydev)
> - return -ENODEV;
> + return -EPROBE_DEFER;
>
> return 0;
> }
> @@ -1554,12 +1554,8 @@ static struct platform_driver octeon_mgmt_driver = {
> .remove = octeon_mgmt_remove,
> };
>
> -extern void octeon_mdiobus_force_mod_depencency(void);
> -
> static int __init octeon_mgmt_mod_init(void)
> {
> - /* Force our mdiobus driver module to be loaded first. */
> - octeon_mdiobus_force_mod_depencency();
> return platform_driver_register(&octeon_mgmt_driver);
> }
>
> diff --git a/drivers/net/phy/mdio-octeon.c b/drivers/net/phy/mdio-octeon.c
> index a2f93948db97..d1e1009d51af 100644
> --- a/drivers/net/phy/mdio-octeon.c
> +++ b/drivers/net/phy/mdio-octeon.c
> @@ -108,12 +108,6 @@ static struct platform_driver octeon_mdiobus_driver = {
> .remove = octeon_mdiobus_remove,
> };
>
> -void octeon_mdiobus_force_mod_depencency(void)
> -{
> - /* Let ethernet drivers force us to be loaded. */
> -}
> -EXPORT_SYMBOL(octeon_mdiobus_force_mod_depencency);
> -
> module_platform_driver(octeon_mdiobus_driver);
>
> MODULE_DESCRIPTION("Cavium OCTEON MDIO bus driver");
> diff --git a/drivers/staging/octeon/ethernet-mdio.c
> b/drivers/staging/octeon/ethernet-mdio.c
> index c798672d61b2..cfb673a52b25 100644
> --- a/drivers/staging/octeon/ethernet-mdio.c
> +++ b/drivers/staging/octeon/ethernet-mdio.c
> @@ -163,7 +163,7 @@ int cvm_oct_phy_setup_device(struct net_device *dev)
> of_node_put(phy_node);
>
> if (!phydev)
> - return -ENODEV;
> + return -EPROBE_DEFER;
>
> priv->last_link = 0;
> phy_start(phydev);
> diff --git a/drivers/staging/octeon/ethernet-mdio.h
> b/drivers/staging/octeon/ethernet-mdio.h
> index e3771d48c49b..7f6716e3fad4 100644
> --- a/drivers/staging/octeon/ethernet-mdio.h
> +++ b/drivers/staging/octeon/ethernet-mdio.h
> @@ -22,7 +22,5 @@
>
> extern const struct ethtool_ops cvm_oct_ethtool_ops;
>
> -void octeon_mdiobus_force_mod_depencency(void);
> -
> int cvm_oct_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
> int cvm_oct_phy_setup_device(struct net_device *dev);
> diff --git a/drivers/staging/octeon/ethernet.c
> b/drivers/staging/octeon/ethernet.c
> index f42c3816ce49..920ab08e4311 100644
> --- a/drivers/staging/octeon/ethernet.c
> +++ b/drivers/staging/octeon/ethernet.c
> @@ -689,8 +689,6 @@ static int cvm_oct_probe(struct platform_device *pdev)
> mtu_overhead += VLAN_HLEN;
> #endif
>
> - octeon_mdiobus_force_mod_depencency();
> -
> pip = pdev->dev.of_node;
> if (!pip) {
> pr_err("Error: No 'pip' in /aliases\n");
