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

Commit 9d312cfb authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'Incorrect-use-of-phy_read_status' 



Florian Fainelli says:

====================
net: Incorrect use of phy_read_status()

This patch series removes incorrect uses of phy_read_status() which can clobber
the PHY device link while we are executing with the state machine running.

greth was potentially another candidate, but it does funky stuff with
auto-negotation that I am still trying to understand.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 501ec187 e69e4626

drivers/net/ethernet/marvell/mv643xx_eth.c

+1 −3
Original line number Diff line number Diff line
@@ -1504,8 +1504,6 @@ mv643xx_eth_get_link_ksettings_phy(struct mv643xx_eth_private *mp, 
	int err;

	u32 supported, advertising;



	err = phy_read_status(dev->phydev);

	if (err == 0)

	err = phy_ethtool_ksettings_get(dev->phydev, cmd);



	/*

drivers/net/ethernet/marvell/pxa168_eth.c

+1 −19
Original line number Diff line number Diff line
@@ -274,8 +274,6 @@ enum hash_table_entry { 
	HASH_ENTRY_RECEIVE_DISCARD_BIT = 2

};



static int pxa168_get_link_ksettings(struct net_device *dev,

				     struct ethtool_link_ksettings *cmd);

static int pxa168_init_hw(struct pxa168_eth_private *pep);

static int pxa168_init_phy(struct net_device *dev);

static void eth_port_reset(struct net_device *dev);
@@ -987,10 +985,6 @@ static int pxa168_init_phy(struct net_device *dev) 
	if (err)

		return err;



	err = pxa168_get_link_ksettings(dev, &cmd);

	if (err)

		return err;



	cmd.base.phy_address = pep->phy_addr;

	cmd.base.speed = pep->phy_speed;

	cmd.base.duplex = pep->phy_duplex;
@@ -1370,18 +1364,6 @@ static int pxa168_eth_do_ioctl(struct net_device *dev, struct ifreq *ifr, 
	return -EOPNOTSUPP;

}



static int pxa168_get_link_ksettings(struct net_device *dev,

				     struct ethtool_link_ksettings *cmd)

{

	int err;



	err = phy_read_status(dev->phydev);

	if (err == 0)

		err = phy_ethtool_ksettings_get(dev->phydev, cmd);



	return err;

}



static void pxa168_get_drvinfo(struct net_device *dev,

			       struct ethtool_drvinfo *info)

{
@@ -1396,7 +1378,7 @@ static const struct ethtool_ops pxa168_ethtool_ops = { 
	.nway_reset	= phy_ethtool_nway_reset,

	.get_link	= ethtool_op_get_link,

	.get_ts_info	= ethtool_op_get_ts_info,

	.get_link_ksettings = pxa168_get_link_ksettings,

	.get_link_ksettings = phy_ethtool_get_link_ksettings,

	.set_link_ksettings = phy_ethtool_set_link_ksettings,

};

drivers/net/ethernet/ti/netcp_ethss.c

+0 −2
Original line number Diff line number Diff line
@@ -2313,7 +2313,6 @@ static int gbe_slave_open(struct gbe_intf *gbe_intf) 
		dev_dbg(priv->dev, "phy found: id is: 0x%s\n",

			phydev_name(slave->phy));

		phy_start(slave->phy);

		phy_read_status(slave->phy);

	}

	return 0;

}
@@ -3119,7 +3118,6 @@ static void init_secondary_ports(struct gbe_priv *gbe_dev, 
			dev_dbg(dev, "phy found: id is: 0x%s\n",

				phydev_name(slave->phy));

			phy_start(slave->phy);

			phy_read_status(slave->phy);

		}

	}

}

net/dsa/slave.c

+3 −7
Original line number Diff line number Diff line
@@ -684,14 +684,10 @@ dsa_slave_get_link_ksettings(struct net_device *dev, 
			     struct ethtool_link_ksettings *cmd)

{

	struct dsa_slave_priv *p = netdev_priv(dev);

	int err;

	int err = -EOPNOTSUPP;



	err = -EOPNOTSUPP;

	if (p->phy != NULL) {

		err = phy_read_status(p->phy);

		if (err == 0)

	if (p->phy != NULL)

		err = phy_ethtool_ksettings_get(p->phy, cmd);

	}



	return err;

}