Commit 201825fb authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: ethtool: handle EOPNOTSUPP from ethtool get_ts_info() method 



Network drivers sometimes return -EOPNOTSUPP from their get_ts_info()
method, and this should not cause the reporting of PHY timestamping
information to be prohibited. Handle this error code, and also
arrange for ethtool_net_get_ts_info_by_phc() to return -EOPNOTSUPP
when the method is not implemented.

This allows e.g. PHYs connected to DSA switches which support
timestamping to report their timestamping capabilities.

Fixes: b9e3f7dc ("net: ethtool: tsinfo: Enhance tsinfo to support several hwtstamp by net topology")
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarKory Maincent <kory.maincent@bootlin.com>
Link: https://patch.msgid.link/E1uwiW3-00000004jRF-3CnC@rmk-PC.armlinux.org.uk


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

net/ethtool/common.c

+2 −2
Original line number Diff line number Diff line
@@ -905,7 +905,7 @@ int ethtool_net_get_ts_info_by_phc(struct net_device *dev, 
	int err;



	if (!ops->get_ts_info)

		return -ENODEV;

		return -EOPNOTSUPP;



	/* Does ptp comes from netdev */

	ethtool_init_tsinfo(info);
@@ -973,7 +973,7 @@ int ethtool_get_ts_info_by_phc(struct net_device *dev, 
	int err;



	err = ethtool_net_get_ts_info_by_phc(dev, info, hwprov_desc);

	if (err == -ENODEV) {

	if (err == -ENODEV || err == -EOPNOTSUPP) {

		struct phy_device *phy;



		phy = ethtool_phy_get_ts_info_by_phc(dev, info, hwprov_desc);