Commit c9f5a5da authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Jakub Kicinski
Browse files

net: ethernet: ti: cpsw: disable PHY EEE advertisement 



It seems the cpsw MAC doesn't support EEE. See e.g. the commit message of
ce289942 ("ARM: dts: am335x-baltos: disable EEE for Atheros 8035 PHY").
There are cases where this causes issues if the PHY's on both sides have
negotiated EEE. As a workaround EEE modes of the PHY are marked broken
in DT, effectively disabling EEE advertisement.
Improve this by using new function phy_disable_eee() in the MAC driver.
This properly disables EEE advertisement, and allows to remove the
eee-broken-xxx properties from DT. As EEE is disabled anyway, we can
remove also the set_eee ethtool op.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/d08a798e-8565-422c-b2ed-121794db077f@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent b55498ff

drivers/net/ethernet/ti/cpsw.c

+2 −1
Original line number Diff line number Diff line
@@ -635,6 +635,8 @@ static void cpsw_slave_open(struct cpsw_slave *slave, struct cpsw_priv *priv) 


	slave->phy = phy;



	phy_disable_eee(slave->phy);



	phy_attached_info(slave->phy);



	phy_start(slave->phy);
@@ -1225,7 +1227,6 @@ static const struct ethtool_ops cpsw_ethtool_ops = { 
	.get_link_ksettings	= cpsw_get_link_ksettings,

	.set_link_ksettings	= cpsw_set_link_ksettings,

	.get_eee	= cpsw_get_eee,

	.set_eee	= cpsw_set_eee,

	.nway_reset	= cpsw_nway_reset,

	.get_ringparam = cpsw_get_ringparam,

	.set_ringparam = cpsw_set_ringparam,

drivers/net/ethernet/ti/cpsw_ethtool.c

+0 −12
Original line number Diff line number Diff line
@@ -434,18 +434,6 @@ int cpsw_get_eee(struct net_device *ndev, struct ethtool_keee *edata) 
		return -EOPNOTSUPP;

}



int cpsw_set_eee(struct net_device *ndev, struct ethtool_keee *edata)

{

	struct cpsw_priv *priv = netdev_priv(ndev);

	struct cpsw_common *cpsw = priv->cpsw;

	int slave_no = cpsw_slave_index(cpsw, priv);



	if (cpsw->slaves[slave_no].phy)

		return phy_ethtool_set_eee(cpsw->slaves[slave_no].phy, edata);

	else

		return -EOPNOTSUPP;

}



int cpsw_nway_reset(struct net_device *ndev)

{

	struct cpsw_priv *priv = netdev_priv(ndev);

drivers/net/ethernet/ti/cpsw_new.c

+2 −1
Original line number Diff line number Diff line
@@ -778,6 +778,8 @@ static void cpsw_slave_open(struct cpsw_slave *slave, struct cpsw_priv *priv) 


	slave->phy = phy;



	phy_disable_eee(slave->phy);



	phy_attached_info(slave->phy);



	phy_start(slave->phy);
@@ -1209,7 +1211,6 @@ static const struct ethtool_ops cpsw_ethtool_ops = { 
	.get_link_ksettings	= cpsw_get_link_ksettings,

	.set_link_ksettings	= cpsw_set_link_ksettings,

	.get_eee		= cpsw_get_eee,

	.set_eee		= cpsw_set_eee,

	.nway_reset		= cpsw_nway_reset,

	.get_ringparam		= cpsw_get_ringparam,

	.set_ringparam		= cpsw_set_ringparam,

drivers/net/ethernet/ti/cpsw_priv.h

+0 −1
Original line number Diff line number Diff line
@@ -497,7 +497,6 @@ int cpsw_get_link_ksettings(struct net_device *ndev, 
int cpsw_set_link_ksettings(struct net_device *ndev,

			    const struct ethtool_link_ksettings *ecmd);

int cpsw_get_eee(struct net_device *ndev, struct ethtool_keee *edata);

int cpsw_set_eee(struct net_device *ndev, struct ethtool_keee *edata);

int cpsw_nway_reset(struct net_device *ndev);

void cpsw_get_ringparam(struct net_device *ndev,

			struct ethtool_ringparam *ering,