Re: [Intel-wired-lan] [PATCH net-next 14/15] ice: make Tx and Rx vernier offset calibration independent

[Tony Nguyen <anthony.l.nguyen@intel.com>]

On 11/1/2022 3:52 PM, Jacob Keller wrote:

<snip>

> @@ -1809,6 +1836,9 @@ static int ice_phy_cfg_tx_offset_e822(struct ice_hw *hw, u8 port)
>   	if (err)
>   		return err;
>   
> +	dev_info(ice_hw_to_dev(hw),
> +		 "Port=%d Tx vernier offset calibration complete\n", port);

nit: This can be one line

> +
>   	return 0;
>   }
>   
> @@ -2011,6 +2041,11 @@ ice_calc_fixed_rx_offset_e822(struct ice_hw *hw, enum ice_ptp_link_spd link_spd)
>    * measurements taken in hardware with some data about known fixed delay as
>    * well as adjusting for multi-lane alignment delay.
>    *
> + * This function will not return successfully until the Rx offset calculations
> + * have been completed, which requires waiting until at least one packet has
> + * been received by the device. It is safe to call this function periodically
> + * until calibration succeeds, as it will only program the offset once.
> + *
>    * This function must be called only after the offset registers are valid,
>    * i.e. after the Vernier calibration wait has passed, to ensure that the PHY
>    * has measured the offset.
> @@ -2019,13 +2054,38 @@ ice_calc_fixed_rx_offset_e822(struct ice_hw *hw, enum ice_ptp_link_spd link_spd)
>    * latency values, we use measurements in 1/100th of a nanosecond, and divide
>    * the TUs per second up front. This avoids overflow while allowing
>    * calculation of the adjustment using integer arithmetic.
> + *
> + * Returns zero on success, -EBUSY if the hardware vernier offset
> + * calibration has not completed, or another error code on failure.
>    */
> -static int ice_phy_cfg_rx_offset_e822(struct ice_hw *hw, u8 port)
> +int ice_phy_cfg_rx_offset_e822(struct ice_hw *hw, u8 port)
>   {
>   	enum ice_ptp_link_spd link_spd;
>   	enum ice_ptp_fec_mode fec_mode;
>   	u64 total_offset, pmd, val;
>   	int err;
> +	u32 reg;
> +
> +	/* Nothing to do if we've already programmed the offset */
> +	err = ice_read_phy_reg_e822(hw, port, P_REG_RX_OR, &reg);
> +	if (err) {
> +		ice_debug(hw, ICE_DBG_PTP, "Failed to read RX_OR for port %u, err %d\n",
> +			  port, err);
> +		return err;
> +	}
> +
> +	if (reg)
> +		return 0;
> +
> +	err = ice_read_phy_reg_e822(hw, port, P_REG_RX_OV_STATUS, &reg);
> +	if (err) {
> +		ice_debug(hw, ICE_DBG_PTP, "Failed to read RX_OV_STATUS for port %u, err %d\n",
> +			  port, err);
> +		return err;
> +	}
> +
> +	if (!(reg & P_REG_RX_OV_STATUS_OV_M))
> +		return -EBUSY;
>   
>   	err = ice_phy_get_speed_and_fec_e822(hw, port, &link_spd, &fec_mode);
>   	if (err)
> @@ -2086,6 +2146,9 @@ static int ice_phy_cfg_rx_offset_e822(struct ice_hw *hw, u8 port)
>   	if (err)
>   		return err;
>   
> +	dev_info(ice_hw_to_dev(hw),
> +		 "Port=%d Rx vernier offset calibration complete\n", port);

This one too.

> +
>   	return 0;
>   }
>   

_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan@osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan