Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62ebac92 authored by Ben Hutchings's avatar Ben Hutchings
Browse files

sfc: Report software timestamping capabilities 



The kernel can generate software receive timestamps and we should
report those for all ports regardless of hardware capabilities.

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
parent d4ef5b6f

drivers/net/ethernet/sfc/ethtool.c

+15 −1
Original line number Diff line number Diff line
@@ -1114,6 +1114,20 @@ static int efx_ethtool_set_rxfh_indir(struct net_device *net_dev, 
	return 0;

}



int efx_ethtool_get_ts_info(struct net_device *net_dev,

			    struct ethtool_ts_info *ts_info)

{

	struct efx_nic *efx = netdev_priv(net_dev);



	/* Software capabilities */

	ts_info->so_timestamping = (SOF_TIMESTAMPING_RX_SOFTWARE |

				    SOF_TIMESTAMPING_SOFTWARE);

	ts_info->phc_index = -1;



	efx_ptp_get_ts_info(efx, ts_info);

	return 0;

}



static int efx_ethtool_get_module_eeprom(struct net_device *net_dev,

					 struct ethtool_eeprom *ee,

					 u8 *data)
@@ -1176,7 +1190,7 @@ const struct ethtool_ops efx_ethtool_ops = { 
	.get_rxfh_indir_size	= efx_ethtool_get_rxfh_indir_size,

	.get_rxfh_indir		= efx_ethtool_get_rxfh_indir,

	.set_rxfh_indir		= efx_ethtool_set_rxfh_indir,

	.get_ts_info		= efx_ptp_get_ts_info,

	.get_ts_info		= efx_ethtool_get_ts_info,

	.get_module_info	= efx_ethtool_get_module_info,

	.get_module_eeprom	= efx_ethtool_get_module_eeprom,

};

drivers/net/ethernet/sfc/nic.h

+2 −2
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ extern int efx_sriov_set_vf_spoofchk(struct net_device *net_dev, int vf, 
struct ethtool_ts_info;

extern void efx_ptp_probe(struct efx_nic *efx);

extern int efx_ptp_ioctl(struct efx_nic *efx, struct ifreq *ifr, int cmd);

extern int efx_ptp_get_ts_info(struct net_device *net_dev,

extern void efx_ptp_get_ts_info(struct efx_nic *efx,

				struct ethtool_ts_info *ts_info);

extern bool efx_ptp_is_ptp_tx(struct efx_nic *efx, struct sk_buff *skb);

extern int efx_ptp_tx(struct efx_nic *efx, struct sk_buff *skb);

drivers/net/ethernet/sfc/ptp.c

+5 −8
Original line number Diff line number Diff line
@@ -1203,16 +1203,14 @@ static int efx_ptp_ts_init(struct efx_nic *efx, struct hwtstamp_config *init) 
	return 0;

}



int

efx_ptp_get_ts_info(struct net_device *net_dev, struct ethtool_ts_info *ts_info)

void efx_ptp_get_ts_info(struct efx_nic *efx, struct ethtool_ts_info *ts_info)

{

	struct efx_nic *efx = netdev_priv(net_dev);

	struct efx_ptp_data *ptp = efx->ptp_data;



	if (!ptp)

		return -EOPNOTSUPP;

		return;



	ts_info->so_timestamping = (SOF_TIMESTAMPING_TX_HARDWARE |

	ts_info->so_timestamping |= (SOF_TIMESTAMPING_TX_HARDWARE |

				     SOF_TIMESTAMPING_RX_HARDWARE |

				     SOF_TIMESTAMPING_RAW_HARDWARE);

	ts_info->phc_index = ptp_clock_index(ptp->phc_clock);
@@ -1224,7 +1222,6 @@ efx_ptp_get_ts_info(struct net_device *net_dev, struct ethtool_ts_info *ts_info) 
			       1 << HWTSTAMP_FILTER_PTP_V2_L4_EVENT |

			       1 << HWTSTAMP_FILTER_PTP_V2_L4_SYNC |

			       1 << HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ);

	return 0;

}



int efx_ptp_ioctl(struct efx_nic *efx, struct ifreq *ifr, int cmd)