Commit 52fc70a3 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'rx-sw-tstamp-for-all' 

Gal Pressman says:

====================
RX software timestamp for all - round 2

Round 1 of drivers conversion was merged [1], this is round 2, more
drivers to follow.

[1] https://lore.kernel.org/netdev/20240901112803.212753-1-gal@nvidia.com/


====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2c4cec16 26f74155

drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c

+0 −4
Original line number Diff line number Diff line
@@ -3640,16 +3640,12 @@ static int bnx2x_get_ts_info(struct net_device *dev, 


	if (bp->flags & PTP_SUPPORTED) {

		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 (bp->ptp_clock)

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

		else

			info->phc_index = -1;



		info->rx_filters = (1 << HWTSTAMP_FILTER_NONE) |

				   (1 << HWTSTAMP_FILTER_PTP_V1_L4_EVENT) |

drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c

+3 −8
Original line number Diff line number Diff line
@@ -1556,10 +1556,7 @@ static int get_ts_info(struct net_device *dev, struct kernel_ethtool_ts_info *ts 
	struct  adapter *adapter = pi->adapter;



	ts_info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |

				   SOF_TIMESTAMPING_RX_SOFTWARE |

				   SOF_TIMESTAMPING_SOFTWARE;



	ts_info->so_timestamping |= SOF_TIMESTAMPING_RX_HARDWARE |

				   SOF_TIMESTAMPING_RX_HARDWARE |

				   SOF_TIMESTAMPING_TX_HARDWARE |

				   SOF_TIMESTAMPING_RAW_HARDWARE;
@@ -1575,8 +1572,6 @@ static int get_ts_info(struct net_device *dev, struct kernel_ethtool_ts_info *ts 


	if (adapter->ptp_clock)

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

	else

		ts_info->phc_index = -1;



	return 0;

}

drivers/net/ethernet/intel/i40e/i40e_ethtool.c

+0 −4
Original line number Diff line number Diff line
@@ -2555,16 +2555,12 @@ static int i40e_get_ts_info(struct net_device *dev, 
		return ethtool_op_get_ts_info(dev, info);



	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 (pf->ptp_clock)

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

	else

		info->phc_index = -1;



	info->tx_types = BIT(HWTSTAMP_TX_OFF) | BIT(HWTSTAMP_TX_ON);

drivers/net/ethernet/intel/ice/ice_ethtool.c

+0 −2
Original line number Diff line number Diff line
@@ -3792,8 +3792,6 @@ ice_get_ts_info(struct net_device *dev, struct kernel_ethtool_ts_info *info) 
		return ethtool_op_get_ts_info(dev, info);



	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;

drivers/net/ethernet/intel/igb/igb_ethtool.c

+1 −7
Original line number Diff line number Diff line
@@ -2387,15 +2387,11 @@ static int igb_get_ts_info(struct net_device *dev, 


	if (adapter->ptp_clock)

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

	else

		info->phc_index = -1;



	switch (adapter->hw.mac.type) {

	case e1000_82575:

		info->so_timestamping =

			SOF_TIMESTAMPING_TX_SOFTWARE |

			SOF_TIMESTAMPING_RX_SOFTWARE |

			SOF_TIMESTAMPING_SOFTWARE;

			SOF_TIMESTAMPING_TX_SOFTWARE;

		return 0;

	case e1000_82576:

	case e1000_82580:
@@ -2405,8 +2401,6 @@ static int igb_get_ts_info(struct net_device *dev, 
	case e1000_i211:

		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;