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

Commit 6aa47c87 authored Jan 25, 2018 by Martin Habets Committed by David S. Miller Jan 25, 2018

sfc: only advertise TX timestamping if we have the license for it



We check the license for TX hardware timestamping capability.
The PTP probe will have enabled PTP sync events from the adapter.  If
 later, at TX queue init, it turns out we do not have the license, we
 don't need the sync events either.

Signed-off-by: Martin Habets <mhabets@solarflare.com>
Signed-off-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 2935e3c3

drivers/net/ethernet/sfc/ef10.c

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2433,8 +2433,12 @@ static void efx_ef10_tx_init(struct efx_tx_queue *tx_queue)
	* otherwise TXQ init will fail		* otherwise TXQ init will fail
	*/		*/
	if (!(nic_data->licensed_features &		if (!(nic_data->licensed_features &
	(1 << LICENSED_V3_FEATURES_TX_TIMESTAMPS_LBN)))		(1 << LICENSED_V3_FEATURES_TX_TIMESTAMPS_LBN))) {
	tx_queue->timestamping = false;		tx_queue->timestamping = false;
			/* Disable sync events on this channel. */
			if (efx->type->ptp_set_ts_sync_events)
			efx->type->ptp_set_ts_sync_events(efx, false, false);
			}

	/* TSOv2 is a limited resource that can only be configured on a limited		/* TSOv2 is a limited resource that can only be configured on a limited
	* number of queues. TSO without checksum offload is not really a thing,		* number of queues. TSO without checksum offload is not really a thing,

drivers/net/ethernet/sfc/ptp.c

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1657,6 +1657,17 @@ void efx_ptp_get_ts_info(struct efx_nic efx, struct ethtool_ts_info ts_info)
	ts_info->so_timestamping \|= (SOF_TIMESTAMPING_TX_HARDWARE \|		ts_info->so_timestamping \|= (SOF_TIMESTAMPING_TX_HARDWARE \|
	SOF_TIMESTAMPING_RX_HARDWARE \|		SOF_TIMESTAMPING_RX_HARDWARE \|
	SOF_TIMESTAMPING_RAW_HARDWARE);		SOF_TIMESTAMPING_RAW_HARDWARE);
			/* Check licensed features. If we don't have the license for TX
			* timestamps, the NIC will not support them.
			*/
			if (efx_ptp_use_mac_tx_timestamps(efx)) {
			struct efx_ef10_nic_data *nic_data = efx->nic_data;

			if (!(nic_data->licensed_features &
			(1 << LICENSED_V3_FEATURES_TX_TIMESTAMPS_LBN)))
			ts_info->so_timestamping &=
			~SOF_TIMESTAMPING_TX_HARDWARE;
			}
	if (primary && primary->ptp_data && primary->ptp_data->phc_clock)		if (primary && primary->ptp_data && primary->ptp_data->phc_clock)
	ts_info->phc_index =		ts_info->phc_index =
	ptp_clock_index(primary->ptp_data->phc_clock);		ptp_clock_index(primary->ptp_data->phc_clock);