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

Commit 6ac3ce82 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: bcmgenet: Remove excessive PHY reset 



We are currently issuing multiple PHY resets during a suspend/resume,
first during bcmgenet_power_up() which does a hardware reset, then a
software reset by calling bcmgenet_mii_reset(). This is both unnecessary
and can take as long as 10ms per MDIO transactions while we re-apply
workarounds because we do not yet have MDIO interrupts enabled.

phy_resume() takes care of re-apply our workarounds in case we need any,
and bcmgenet_power_up() does a PHY hardware reset, all of this is more
than enough to guarantee that the PHY operates correctly.

Fixes: 1c1008c7 ("net: bcmgenet: add main driver file")
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2c1bcaff

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

+0 −3
Original line number Diff line number Diff line
@@ -907,9 +907,6 @@ static void bcmgenet_power_up(struct bcmgenet_priv *priv, 
	}



	bcmgenet_ext_writel(priv, reg, EXT_EXT_PWR_MGMT);



	if (mode == GENET_POWER_PASSIVE)

		bcmgenet_mii_reset(priv->dev);

}



/* ioctl handle special commands that are not present in ethtool. */

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

+0 −1
Original line number Diff line number Diff line
@@ -672,7 +672,6 @@ GENET_IO_MACRO(rbuf, GENET_RBUF_OFF); 
int bcmgenet_mii_init(struct net_device *dev);

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

void bcmgenet_mii_exit(struct net_device *dev);

void bcmgenet_mii_reset(struct net_device *dev);

void bcmgenet_phy_power_set(struct net_device *dev, bool enable);

void bcmgenet_mii_setup(struct net_device *dev);

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

+0 −11
Original line number Diff line number Diff line
@@ -163,16 +163,6 @@ void bcmgenet_mii_setup(struct net_device *dev) 
	phy_print_status(phydev);

}



void bcmgenet_mii_reset(struct net_device *dev)

{

	struct bcmgenet_priv *priv = netdev_priv(dev);



	if (priv->phydev) {

		phy_init_hw(priv->phydev);

		phy_start_aneg(priv->phydev);

	}

}



void bcmgenet_phy_power_set(struct net_device *dev, bool enable)

{

	struct bcmgenet_priv *priv = netdev_priv(dev);
@@ -215,7 +205,6 @@ static void bcmgenet_internal_phy_setup(struct net_device *dev) 
	reg = bcmgenet_ext_readl(priv, EXT_EXT_PWR_MGMT);

	reg |= EXT_PWR_DN_EN_LD;

	bcmgenet_ext_writel(priv, reg, EXT_EXT_PWR_MGMT);

	bcmgenet_mii_reset(dev);

}



static void bcmgenet_moca_phy_setup(struct bcmgenet_priv *priv)