Commit 3f2216e8 authored by Jacob Keller's avatar Jacob Keller Committed by Paolo Abeni
Browse files

ice: rename verify_cached to has_ready_bitmap 



The tx->verify_cached flag is used to inform the Tx timestamp tracking
code whether it needs to verify the cached Tx timestamp value against
a previous captured value. This is necessary on E810 hardware which does
not have a Tx timestamp ready bitmap.

In addition, we currently rely on the fact that the
ice_get_phy_tx_tstamp_ready() function returns all 1s for E810 hardware.
Instead of introducing a brand new flag, rename and verify_cached to
has_ready_bitmap, inverting the relevant checks.

Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarKarol Kolacinski <karol.kolacinski@intel.com>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent c75d5e67

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

+6 −6
Original line number Diff line number Diff line
@@ -606,11 +606,11 @@ void ice_ptp_complete_tx_single_tstamp(struct ice_ptp_tx *tx) 
	 * timestamp. If it is not, skip this for now assuming it hasn't yet

	 * been captured by hardware.

	 */

	if (!drop_ts && tx->verify_cached &&

	if (!drop_ts && !tx->has_ready_bitmap &&

	    raw_tstamp == tx->tstamps[idx].cached_tstamp)

		return;



	if (tx->verify_cached && raw_tstamp)

	if (!tx->has_ready_bitmap && raw_tstamp)

		tx->tstamps[idx].cached_tstamp = raw_tstamp;

	clear_bit(idx, tx->in_use);

	skb = tx->tstamps[idx].skb;
@@ -751,7 +751,7 @@ static void ice_ptp_process_tx_tstamp(struct ice_ptp_tx *tx) 
		 * from the last cached timestamp. If it is not, skip this for

		 * now assuming it hasn't yet been captured by hardware.

		 */

		if (!drop_ts && tx->verify_cached &&

		if (!drop_ts && !tx->has_ready_bitmap &&

		    raw_tstamp == tx->tstamps[idx].cached_tstamp)

			continue;
@@ -761,7 +761,7 @@ static void ice_ptp_process_tx_tstamp(struct ice_ptp_tx *tx) 


skip_ts_read:

		spin_lock_irqsave(&tx->lock, flags);

		if (tx->verify_cached && raw_tstamp)

		if (!tx->has_ready_bitmap && raw_tstamp)

			tx->tstamps[idx].cached_tstamp = raw_tstamp;

		clear_bit(idx, tx->in_use);

		skb = tx->tstamps[idx].skb;
@@ -1014,7 +1014,7 @@ ice_ptp_init_tx_e82x(struct ice_pf *pf, struct ice_ptp_tx *tx, u8 port) 
	tx->block = port / ICE_PORTS_PER_QUAD;

	tx->offset = (port % ICE_PORTS_PER_QUAD) * INDEX_PER_PORT_E82X;

	tx->len = INDEX_PER_PORT_E82X;

	tx->verify_cached = 0;

	tx->has_ready_bitmap = 1;



	return ice_ptp_alloc_tx_tracker(tx);

}
@@ -1037,7 +1037,7 @@ ice_ptp_init_tx_e810(struct ice_pf *pf, struct ice_ptp_tx *tx) 
	 * verify new timestamps against cached copy of the last read

	 * timestamp.

	 */

	tx->verify_cached = 1;

	tx->has_ready_bitmap = 0;



	return ice_ptp_alloc_tx_tracker(tx);

}

drivers/net/ethernet/intel/ice/ice_ptp.h

+5 −3
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ struct ice_perout_channel { 
 * the last timestamp we read for a given index. If the current timestamp

 * value is the same as the cached value, we assume a new timestamp hasn't

 * been captured. This avoids reporting stale timestamps to the stack. This is

 * only done if the verify_cached flag is set in ice_ptp_tx structure.

 * only done if the has_ready_bitmap flag is not set in ice_ptp_tx structure.

 */

struct ice_tx_tstamp {

	struct sk_buff *skb;
@@ -130,7 +130,9 @@ enum ice_tx_tstamp_work { 
 * @init: if true, the tracker is initialized;

 * @calibrating: if true, the PHY is calibrating the Tx offset. During this

 *               window, timestamps are temporarily disabled.

 * @verify_cached: if true, verify new timestamp differs from last read value

 * @has_ready_bitmap: if true, the hardware has a valid Tx timestamp ready

 *                    bitmap register. If false, fall back to verifying new

 *                    timestamp values against previously cached copy.

 * @last_ll_ts_idx_read: index of the last LL TS read by the FW

 */

struct ice_ptp_tx {
@@ -143,7 +145,7 @@ struct ice_ptp_tx { 
	u8 len;

	u8 init : 1;

	u8 calibrating : 1;

	u8 verify_cached : 1;

	u8 has_ready_bitmap : 1;

	s8 last_ll_ts_idx_read;

};