Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00d51094 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

Revert "net: bcmgenet: Remove init parameter from bcmgenet_mii_config" 



This reverts commit 28b45910 ("net: bcmgenet: Remove init parameter
from bcmgenet_mii_config") because in the process of moving from
dev_info() to dev_info_once() we essentially lost the helpful printed
messages once the second instance of the driver is loaded.
dev_info_once() does not actually print the message once per device
instance, but once period.

Fixes: 28b45910 ("net: bcmgenet: Remove init parameter from bcmgenet_mii_config")
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarDoug Berger <opendmb@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1daa8790

drivers/net/ethernet/broadcom/genet/bcmgenet.c

+1 −1
Original line number Diff line number Diff line
@@ -3669,7 +3669,7 @@ static int bcmgenet_resume(struct device *d) 


	phy_init_hw(priv->phydev);

	/* Speed settings must be restored */

	bcmgenet_mii_config(priv->dev);

	bcmgenet_mii_config(priv->dev, false);



	/* disable ethernet MAC while updating its registers */

	umac_enable_set(priv, CMD_TX_EN | CMD_RX_EN, false);

drivers/net/ethernet/broadcom/genet/bcmgenet.h

+1 −1
Original line number Diff line number Diff line
@@ -698,7 +698,7 @@ GENET_IO_MACRO(rbuf, GENET_RBUF_OFF); 


/* MDIO routines */

int bcmgenet_mii_init(struct net_device *dev);

int bcmgenet_mii_config(struct net_device *dev);

int bcmgenet_mii_config(struct net_device *dev, bool init);

int bcmgenet_mii_probe(struct net_device *dev);

void bcmgenet_mii_exit(struct net_device *dev);

void bcmgenet_mii_reset(struct net_device *dev);

drivers/net/ethernet/broadcom/genet/bcmmii.c

+4 −3
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static void bcmgenet_moca_phy_setup(struct bcmgenet_priv *priv) 
					  bcmgenet_fixed_phy_link_update);

}



int bcmgenet_mii_config(struct net_device *dev)

int bcmgenet_mii_config(struct net_device *dev, bool init)

{

	struct bcmgenet_priv *priv = netdev_priv(dev);

	struct phy_device *phydev = priv->phydev;
@@ -327,7 +327,8 @@ int bcmgenet_mii_config(struct net_device *dev) 
		bcmgenet_ext_writel(priv, reg, EXT_RGMII_OOB_CTRL);

	}



	dev_info_once(kdev, "configuring instance for %s\n", phy_name);

	if (init)

		dev_info(kdev, "configuring instance for %s\n", phy_name);



	return 0;

}
@@ -375,7 +376,7 @@ int bcmgenet_mii_probe(struct net_device *dev) 
	 * PHY speed which is needed for bcmgenet_mii_config() to configure

	 * things appropriately.

	 */

	ret = bcmgenet_mii_config(dev);

	ret = bcmgenet_mii_config(dev, true);

	if (ret) {

		phy_disconnect(priv->phydev);

		return ret;