Commit 95657e6a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/nex 


t-queue

Tony Nguyen says:

====================
ice: detect and report PTP timestamp issues

Jacob Keller says:

This series fixes a few small issues with the cached PTP Hardware Clock
timestamp used for timestamp extension. It also introduces extra checks to
help detect issues with this logic, such as if the cached timestamp is not
updated within the 2 second window.

This introduces a few statistics similar to the ones already available in
other Intel drivers, including tx_hwtstamp_skipped and tx_hwtstamp_timeouts.

It is intended to aid in debugging issues we're seeing with some setups
which might be related to incorrect cached timestamp values.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8ea731d4 b1a582e6

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

+7 −0
Original line number Diff line number Diff line
@@ -136,6 +136,11 @@ static const struct ice_stats ice_gstrings_pf_stats[] = { 
	ICE_PF_STAT("mac_remote_faults.nic", stats.mac_remote_faults),

	ICE_PF_STAT("fdir_sb_match.nic", stats.fd_sb_match),

	ICE_PF_STAT("fdir_sb_status.nic", stats.fd_sb_status),

	ICE_PF_STAT("tx_hwtstamp_skipped", ptp.tx_hwtstamp_skipped),

	ICE_PF_STAT("tx_hwtstamp_timeouts", ptp.tx_hwtstamp_timeouts),

	ICE_PF_STAT("tx_hwtstamp_flushed", ptp.tx_hwtstamp_flushed),

	ICE_PF_STAT("tx_hwtstamp_discarded", ptp.tx_hwtstamp_discarded),

	ICE_PF_STAT("late_cached_phc_updates", ptp.late_cached_phc_updates),

};



static const u32 ice_regs_dump_list[] = {
@@ -2826,6 +2831,7 @@ ice_set_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring, 
		tx_rings[i].count = new_tx_cnt;

		tx_rings[i].desc = NULL;

		tx_rings[i].tx_buf = NULL;

		tx_rings[i].tx_tstamps = &pf->ptp.port.tx;

		err = ice_setup_tx_ring(&tx_rings[i]);

		if (err) {

			while (i--)
@@ -2884,6 +2890,7 @@ ice_set_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring, 
		/* clone ring and setup updated count */

		rx_rings[i] = *vsi->rx_rings[i];

		rx_rings[i].count = new_rx_cnt;

		rx_rings[i].cached_phctime = pf->ptp.cached_phc_time;

		rx_rings[i].desc = NULL;

		rx_rings[i].rx_buf = NULL;

		/* this is to allow wr32 to have something to write to

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

+1 −0
Original line number Diff line number Diff line
@@ -1522,6 +1522,7 @@ static int ice_vsi_alloc_rings(struct ice_vsi *vsi) 
		ring->netdev = vsi->netdev;

		ring->dev = dev;

		ring->count = vsi->num_rx_desc;

		ring->cached_phctime = pf->ptp.cached_phc_time;

		WRITE_ONCE(vsi->rx_rings[i], ring);

	}