]> git.dujemihanovic.xyz Git - linux.git/commitdiff
net: mscc: ocelot: Remove setting of RX software timestamp
authorGal Pressman <gal@nvidia.com>
Fri, 6 Sep 2024 14:46:26 +0000 (17:46 +0300)
committerJakub Kicinski <kuba@kernel.org>
Tue, 10 Sep 2024 00:44:41 +0000 (17:44 -0700)
The responsibility for reporting of RX software timestamp has moved to
the core layer (see __ethtool_get_ts_info()), remove usage from the
device drivers.

Reviewed-by: Carolina Jubran <cjubran@nvidia.com>
Reviewed-by: Rahul Rameshbabu <rrameshbabu@nvidia.com>
Signed-off-by: Gal Pressman <gal@nvidia.com>
Link: https://patch.msgid.link/20240906144632.404651-11-gal@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/mscc/ocelot_ptp.c

index b3c28260adf8804e7708726d7dc9dc4a699d9ab4..e172638b0601025688ba229589df847b669b0039 100644 (file)
@@ -582,17 +582,13 @@ EXPORT_SYMBOL(ocelot_hwstamp_set);
 int ocelot_get_ts_info(struct ocelot *ocelot, int port,
                       struct kernel_ethtool_ts_info *info)
 {
-       info->phc_index = ocelot->ptp_clock ?
-                         ptp_clock_index(ocelot->ptp_clock) : -1;
-       if (info->phc_index == -1) {
-               info->so_timestamping |= SOF_TIMESTAMPING_TX_SOFTWARE |
-                                        SOF_TIMESTAMPING_RX_SOFTWARE |
-                                        SOF_TIMESTAMPING_SOFTWARE;
+       if (ocelot->ptp_clock) {
+               info->phc_index = ptp_clock_index(ocelot->ptp_clock);
+       } else {
+               info->so_timestamping |= SOF_TIMESTAMPING_TX_SOFTWARE;
                return 0;
        }
        info->so_timestamping |= SOF_TIMESTAMPING_TX_SOFTWARE |
-                                SOF_TIMESTAMPING_RX_SOFTWARE |
-                                SOF_TIMESTAMPING_SOFTWARE |
                                 SOF_TIMESTAMPING_TX_HARDWARE |
                                 SOF_TIMESTAMPING_RX_HARDWARE |
                                 SOF_TIMESTAMPING_RAW_HARDWARE;