Commit fd64fd13 authored by Rahul Rameshbabu's avatar Rahul Rameshbabu Committed by Jakub Kicinski
Browse files

net/mlx5: Decouple PHC .adjtime and .adjphase implementations 



When running a phase adjustment operation, the free running clock should
not be modified at all. The phase control keyword is intended to trigger an
internal servo on the device that will converge to the provided delta. A
free running counter cannot implement phase adjustment.

Fixes: 8e11a68e ("net/mlx5: Add adjphase function to support hardware-only offset control")
Signed-off-by: default avatarRahul Rameshbabu <rrameshbabu@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Link: https://lore.kernel.org/r/20231114215846.5902-5-saeed@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ad4d82c3

drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c

+6 −1
Original line number Diff line number Diff line
@@ -384,7 +384,12 @@ static int mlx5_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta) 


static int mlx5_ptp_adjphase(struct ptp_clock_info *ptp, s32 delta)

{

	return mlx5_ptp_adjtime(ptp, delta);

	struct mlx5_clock *clock = container_of(ptp, struct mlx5_clock, ptp_info);

	struct mlx5_core_dev *mdev;



	mdev = container_of(clock, struct mlx5_core_dev, clock);



	return mlx5_ptp_adjtime_real_time(mdev, delta);

}



static int mlx5_ptp_freq_adj_real_time(struct mlx5_core_dev *mdev, long scaled_ppm)