From: Kory Maincent <kory.maincent@bootlin.com>
To: Florian Fainelli <florian.fainelli@broadcom.com>,
Broadcom internal kernel review list
<bcm-kernel-feedback-list@broadcom.com>,
Andrew Lunn <andrew@lunn.ch>,
Heiner Kallweit <hkallweit1@gmail.com>,
Russell King <linux@armlinux.org.uk>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>,
Richard Cochran <richardcochran@gmail.com>,
Radu Pirea <radu-nicolae.pirea@oss.nxp.com>,
Jay Vosburgh <j.vosburgh@gmail.com>,
Andy Gospodarek <andy@greyhouse.net>,
Nicolas Ferre <nicolas.ferre@microchip.com>,
Claudiu Beznea <claudiu.beznea@tuxon.dev>,
Willem de Bruijn <willemdebruijn.kernel@gmail.com>,
Jonathan Corbet <corbet@lwn.net>,
Horatiu Vultur <horatiu.vultur@microchip.com>,
UNGLinuxDriver@microchip.com, Simon Horman <horms@kernel.org>,
Vladimir Oltean <vladimir.oltean@nxp.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-doc@vger.kernel.org,
Maxime Chevallier <maxime.chevallier@bootlin.com>,
Kory Maincent <kory.maincent@bootlin.com>
Subject: [PATCH net-next v6 14/16] net: ethtool: ts: Update GET_TS to reply the current selected timestamp
Date: Thu, 19 Oct 2023 16:29:29 +0200 [thread overview]
Message-ID: <20231019-feature_ptp_netnext-v6-14-71affc27b0e5@bootlin.com> (raw)
In-Reply-To: <20231019-feature_ptp_netnext-v6-0-71affc27b0e5@bootlin.com>
As the default selected timestamp API change we have to change also the
timestamp return by ethtool. This patch return now the current selected
timestamp.
Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---
net/ethtool/ts.c | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/net/ethtool/ts.c b/net/ethtool/ts.c
index f2dd65a2e69c..bd219512b8de 100644
--- a/net/ethtool/ts.c
+++ b/net/ethtool/ts.c
@@ -31,29 +31,13 @@ static int ts_prepare_data(const struct ethnl_req_info *req_base,
{
struct ts_reply_data *data = TS_REPDATA(reply_base);
struct net_device *dev = reply_base->dev;
- const struct ethtool_ops *ops = dev->ethtool_ops;
int ret;
ret = ethnl_ops_begin(dev);
if (ret < 0)
return ret;
- if (phy_has_tsinfo(dev->phydev)) {
- data->ts_layer = PHY_TIMESTAMPING;
- } else if (ops->get_ts_info) {
- struct ethtool_ts_info ts_info = {0};
-
- ops->get_ts_info(dev, &ts_info);
- if (ts_info.so_timestamping &
- SOF_TIMESTAMPING_HARDWARE_MASK)
- data->ts_layer = MAC_TIMESTAMPING;
-
- if (ts_info.so_timestamping &
- SOF_TIMESTAMPING_SOFTWARE_MASK)
- data->ts_layer = SOFTWARE_TIMESTAMPING;
- } else {
- data->ts_layer = NO_TIMESTAMPING;
- }
+ data->ts_layer = dev->ts_layer;
ethnl_ops_complete(dev);
--
2.25.1
next prev parent reply other threads:[~2023-10-19 14:30 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-19 14:29 [PATCH net-next v6 00/16] net: Make timestamping selectable Kory Maincent
2023-10-19 14:29 ` [PATCH net-next v6 01/16] net: Convert PHYs hwtstamp callback to use kernel_hwtstamp_config Kory Maincent
2023-10-19 14:29 ` [PATCH net-next v6 02/16] net: phy: Remove the call to phy_mii_ioctl in phy_hwstamp_get/set Kory Maincent
2023-10-19 14:29 ` [PATCH net-next v6 03/16] net: ethtool: Refactor identical get_ts_info implementations Köry Maincent
2023-10-19 14:29 ` [PATCH net-next v6 04/16] net: macb: Convert to ndo_hwtstamp_get() and ndo_hwtstamp_set() Kory Maincent
2023-10-19 14:29 ` [PATCH net-next v6 05/16] net: Make dev_set_hwtstamp_phylib accessible Kory Maincent
2023-10-19 18:53 ` Florian Fainelli
2023-10-19 14:29 ` [PATCH net-next v6 06/16] net: phy: micrel: fix ts_info value in case of no phc Kory Maincent
2023-10-19 14:29 ` [PATCH net-next v6 07/16] net_tstamp: Add TIMESTAMPING SOFTWARE and HARDWARE mask Kory Maincent
2023-10-19 14:48 ` Willem de Bruijn
2023-10-24 13:40 ` Köry Maincent
2023-10-24 14:21 ` Willem de Bruijn
2023-10-19 14:29 ` [PATCH net-next v6 08/16] net: ethtool: Add a command to expose current time stamping layer Kory Maincent
2023-10-19 14:29 ` [PATCH net-next v6 09/16] netlink: specs: Introduce new netlink command to get current timestamp Kory Maincent
2023-10-19 14:29 ` [PATCH net-next v6 10/16] net: ethtool: Add a command to list available time stamping layers Kory Maincent
2023-10-19 14:29 ` [PATCH net-next v6 11/16] netlink: specs: Introduce new netlink " Kory Maincent
2023-10-19 14:29 ` [PATCH net-next v6 12/16] net: Replace hwtstamp_source by timestamping layer Kory Maincent
2023-10-21 1:47 ` Jakub Kicinski
2023-10-23 7:56 ` Köry Maincent
2023-10-19 14:29 ` [PATCH net-next v6 13/16] net: Change the API of PHY default timestamp to MAC Kory Maincent
2023-10-19 14:29 ` Kory Maincent [this message]
2023-10-19 14:29 ` [PATCH net-next v6 15/16] net ethtool: net: Let the active time stamping layer be selectable Kory Maincent
2023-10-19 14:29 ` [PATCH net-next v6 16/16] netlink: specs: Introduce time stamping set command Kory Maincent
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231019-feature_ptp_netnext-v6-14-71affc27b0e5@bootlin.com \
--to=kory.maincent@bootlin.com \
--cc=UNGLinuxDriver@microchip.com \
--cc=andrew@lunn.ch \
--cc=andy@greyhouse.net \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=claudiu.beznea@tuxon.dev \
--cc=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=florian.fainelli@broadcom.com \
--cc=hkallweit1@gmail.com \
--cc=horatiu.vultur@microchip.com \
--cc=horms@kernel.org \
--cc=j.vosburgh@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=maxime.chevallier@bootlin.com \
--cc=netdev@vger.kernel.org \
--cc=nicolas.ferre@microchip.com \
--cc=pabeni@redhat.com \
--cc=radu-nicolae.pirea@oss.nxp.com \
--cc=richardcochran@gmail.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=vladimir.oltean@nxp.com \
--cc=willemdebruijn.kernel@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).