Skip to content

Commit 484bfa1

Browse files
Doug Bergerdavem330
authored andcommitted
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 5dbebbb ("net: bcmgenet: Software reset EPHY after power on"). Signed-off-by: Doug Berger <opendmb@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent b0447ec commit 484bfa1

File tree

3 files changed

+0
-18
lines changed

3 files changed

+0
-18
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1172,7 +1172,6 @@ static void bcmgenet_power_up(struct bcmgenet_priv *priv,
11721172
}
11731173
bcmgenet_ext_writel(priv, reg, EXT_EXT_PWR_MGMT);
11741174
bcmgenet_phy_power_set(priv->dev, true);
1175-
bcmgenet_mii_reset(priv->dev);
11761175
break;
11771176

11781177
case GENET_POWER_CABLE_SENSE:

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,6 @@ int bcmgenet_mii_init(struct net_device *dev);
711711
int bcmgenet_mii_config(struct net_device *dev, bool init);
712712
int bcmgenet_mii_probe(struct net_device *dev);
713713
void bcmgenet_mii_exit(struct net_device *dev);
714-
void bcmgenet_mii_reset(struct net_device *dev);
715714
void bcmgenet_phy_power_set(struct net_device *dev, bool enable);
716715
void bcmgenet_mii_setup(struct net_device *dev);
717716

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -121,22 +121,6 @@ static int bcmgenet_fixed_phy_link_update(struct net_device *dev,
121121
return 0;
122122
}
123123

124-
/* Perform a voluntary PHY software reset, since the EPHY is very finicky about
125-
* not doing it and will start corrupting packets
126-
*/
127-
void bcmgenet_mii_reset(struct net_device *dev)
128-
{
129-
struct bcmgenet_priv *priv = netdev_priv(dev);
130-
131-
if (GENET_IS_V4(priv))
132-
return;
133-
134-
if (priv->phydev) {
135-
phy_init_hw(priv->phydev);
136-
phy_start_aneg(priv->phydev);
137-
}
138-
}
139-
140124
void bcmgenet_phy_power_set(struct net_device *dev, bool enable)
141125
{
142126
struct bcmgenet_priv *priv = netdev_priv(dev);

0 commit comments

Comments
 (0)