Commit 8ecf2afb authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'rx-software-timestamp-for-all' 

Gal Pressman says:

====================
RX software timestamp for all

All devices support SOF_TIMESTAMPING_RX_SOFTWARE by virtue of
net_timestamp_check() being called in the device independent code.
Following Willem's suggestion [1], make it so drivers do not have to
handle SOF_TIMESTAMPING_RX_SOFTWARE and SOF_TIMESTAMPING_SOFTWARE, nor
setting of the PHC index to -1.

All drivers will now report RX software timestamp as supported.
The series is limited to 15 patches, I will submit other drivers in
subsequent submissions.

[1] https://lore.kernel.org/netdev/661550e348224_23a2b2294f7@willemb.c.googlers.com.notmuch/

v1: https://lore.kernel.org/20240829144253.122215-1-gal@nvidia.com
====================

Link: https://patch.msgid.link/20240901112803.212753-1-gal@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 3bbefbbd 406e862b

drivers/net/can/dev/dev.c

+0 −3
Original line number Diff line number Diff line
@@ -380,12 +380,9 @@ int can_ethtool_op_get_ts_info_hwts(struct net_device *dev, 
{

	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;

	info->phc_index = -1;

	info->tx_types = BIT(HWTSTAMP_TX_ON);

	info->rx_filters = BIT(HWTSTAMP_FILTER_ALL);

drivers/net/can/peak_canfd/peak_canfd.c

+0 −3
Original line number Diff line number Diff line
@@ -781,11 +781,8 @@ static int peak_get_ts_info(struct net_device *dev, 
{

	info->so_timestamping =

		SOF_TIMESTAMPING_TX_SOFTWARE |

		SOF_TIMESTAMPING_RX_SOFTWARE |

		SOF_TIMESTAMPING_SOFTWARE |

		SOF_TIMESTAMPING_RX_HARDWARE |

		SOF_TIMESTAMPING_RAW_HARDWARE;

	info->phc_index = -1;

	info->tx_types = BIT(HWTSTAMP_TX_OFF);

	info->rx_filters = BIT(HWTSTAMP_FILTER_ALL);

drivers/net/can/usb/peak_usb/pcan_usb_core.c

+0 −3
Original line number Diff line number Diff line
@@ -901,11 +901,8 @@ int pcan_get_ts_info(struct net_device *dev, struct kernel_ethtool_ts_info *info 
{

	info->so_timestamping =

		SOF_TIMESTAMPING_TX_SOFTWARE |

		SOF_TIMESTAMPING_RX_SOFTWARE |

		SOF_TIMESTAMPING_SOFTWARE |

		SOF_TIMESTAMPING_RX_HARDWARE |

		SOF_TIMESTAMPING_RAW_HARDWARE;

	info->phc_index = -1;

	info->tx_types = BIT(HWTSTAMP_TX_OFF);

	info->rx_filters = BIT(HWTSTAMP_FILTER_ALL);

drivers/net/ethernet/engleder/tsnep_ethtool.c

+0 −4
Original line number Diff line number Diff line
@@ -310,16 +310,12 @@ static int tsnep_ethtool_get_ts_info(struct net_device *netdev, 
	struct tsnep_adapter *adapter = netdev_priv(netdev);



	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;



	if (adapter->ptp_clock)

		info->phc_index = ptp_clock_index(adapter->ptp_clock);

	else

		info->phc_index = -1;



	info->tx_types = BIT(HWTSTAMP_TX_OFF) |

			 BIT(HWTSTAMP_TX_ON);

drivers/net/ethernet/freescale/enetc/enetc_ethtool.c

+2 −8
Original line number Diff line number Diff line
@@ -849,17 +849,13 @@ static int enetc_get_ts_info(struct net_device *ndev, 
	if (phc_idx) {

		info->phc_index = *phc_idx;

		symbol_put(enetc_phc_index);

	} else {

		info->phc_index = -1;

	}



#ifdef CONFIG_FSL_ENETC_PTP_CLOCK

	info->so_timestamping = SOF_TIMESTAMPING_TX_HARDWARE |

				SOF_TIMESTAMPING_RX_HARDWARE |

				SOF_TIMESTAMPING_RAW_HARDWARE |

				SOF_TIMESTAMPING_TX_SOFTWARE |

				SOF_TIMESTAMPING_RX_SOFTWARE |

				SOF_TIMESTAMPING_SOFTWARE;

				SOF_TIMESTAMPING_TX_SOFTWARE;



	info->tx_types = (1 << HWTSTAMP_TX_OFF) |

			 (1 << HWTSTAMP_TX_ON) |
@@ -867,9 +863,7 @@ static int enetc_get_ts_info(struct net_device *ndev, 
	info->rx_filters = (1 << HWTSTAMP_FILTER_NONE) |

			   (1 << HWTSTAMP_FILTER_ALL);

#else

	info->so_timestamping = SOF_TIMESTAMPING_RX_SOFTWARE |

				SOF_TIMESTAMPING_TX_SOFTWARE |

				SOF_TIMESTAMPING_SOFTWARE;

	info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE;

#endif

	return 0;

}