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

Commit 484bfa15 authored by Doug Berger's avatar Doug Berger Committed by David S. Miller
Browse files

Revert "net: bcmgenet: Software reset EPHY after power on" 



With commit f7d72996e222 ("net: bcmgenet: enable loopback during
UniMAC sw_reset") it is no longer necessary to force the software
reset of the internal EPHY before resetting the UniMAC to ensure a
clean reset.

Therefore this commit reverts commit 5dbebbb4 ("net: bcmgenet:
Software reset EPHY after power on").

Signed-off-by: default avatarDoug Berger <opendmb@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b0447ecb

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

+0 −1
Original line number Diff line number Diff line
@@ -1172,7 +1172,6 @@ static void bcmgenet_power_up(struct bcmgenet_priv *priv, 
		}

		bcmgenet_ext_writel(priv, reg, EXT_EXT_PWR_MGMT);

		bcmgenet_phy_power_set(priv->dev, true);

		bcmgenet_mii_reset(priv->dev);

		break;



	case GENET_POWER_CABLE_SENSE:

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

+0 −1
Original line number Diff line number Diff line
@@ -711,7 +711,6 @@ int bcmgenet_mii_init(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);

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 −16
Original line number Diff line number Diff line
@@ -121,22 +121,6 @@ static int bcmgenet_fixed_phy_link_update(struct net_device *dev, 
	return 0;

}



/* Perform a voluntary PHY software reset, since the EPHY is very finicky about

 * not doing it and will start corrupting packets

 */

void bcmgenet_mii_reset(struct net_device *dev)

{

	struct bcmgenet_priv *priv = netdev_priv(dev);



	if (GENET_IS_V4(priv))

		return;



	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);