Skip to content

ptp: convert drivers to .adjfine

Jacob Keller linux-renesas-soc netdev 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest9 patches 3 repliesIn review 8 of 9 applied
  2. v29 patches 5 repliesSuperseded
  3. v114 patches 13 repliesSuperseded

Changes in v3 from the cover letter

* Rebased to allow landing in 6.2
* Added Richard's Acked-by

Patches in v3 8 of 9 applied

#Subject and filesSizeRepliesApplied
1/9ptp: add missing documentation for parametersinclude/linux/ptp_clock_kernel.h+7 -00 repliesApplied
2/9ptp: introduce helpers to adjust by scaled parts per milliondrivers/net/ethernet/intel/e1000e/ptp.c drivers/net/ethernet/intel/i40e/i40e_ptp.c drivers/net/ethernet/intel/ice/ice_ptp.c +3 more+60 -790 replies
3/9drivers: convert unsupported .adjfreq to .adjfinedrivers/hv/hv_util.c drivers/ptp/ptp_kvm_common.c drivers/ptp/ptp_vmw.c+6 -60 repliesApplied
4/9ptp: mlx4: convert to .adjfine and adjust_by_scaled_ppmdrivers/net/ethernet/mellanox/mlx4/en_clock.c+11 -181 replyApplied
5/9ptp: mlx5: convert to .adjfine and adjust_by_scaled_ppmdrivers/net/ethernet/mellanox/mlx5/core/lib/clock.c+6 -160 repliesApplied
6/9ptp: lan743x: remove .adjfreq implementationdrivers/net/ethernet/microchip/lan743x_ptp.c+0 -350 repliesApplied
7/9ptp: lan743x: use diff_by_scaled_ppm in .adjfine implementationdrivers/net/ethernet/microchip/lan743x_ptp.c+6 -130 repliesApplied
8/9ptp: ravb: convert to .adjfine and adjust_by_scaled_ppmdrivers/net/ethernet/renesas/ravb_ptp.c+5 -122 repliesApplied
9/9ptp: xgbe: convert to .adjfine and adjust_by_scaled_ppmdrivers/net/ethernet/amd/xgbe/xgbe-ptp.c+4 -160 repliesApplied

Reviews trailers per patch

All 9 patches have a Reviewed-by or Acked-by.

PatchRichard CochranShirly OhnonaTom LendackyTariq Toukan
1/9A-b
2/9A-b
3/9A-b
4/9A-b R-b
5/9A-b T-b
6/9A-b
7/9A-b
8/9A-b
9/9A-b A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.

Read the v3 thread

Cover letter [net-next v3 0/9] ptp: convert drivers to .adjfine

Many drivers implementing PTP have not yet migrated to the new .adjfine frequency adjustment implementation.

A handful of these drivers use hardware with a simple increment value which is adjusted by multiplying by the adjustment factor and then dividing by 1 billion. This calculation is very easy to convert to .adjfine, by simply updating the divisor.

Introduce new helper functions, diff_by_scaled_ppm and adjust_by_scaled_ppm which perform the most common calculations used by drivers for this purpose.

The adjust_by_scaled_ppm takes the base increment and scaled PPM value, and calculates the new increment to use.

A few drivers need the difference and direction rather than a raw increment value. The diff_by_scaled_ppm calculates the difference and returns true if it should be a subtraction, false otherwise. This most closely aligns with existing driver implementations.

I previously submitted v1 of this series at [1], and got some feedback only on a handful of drivers. In the interest of merging the changes which have received feedback, I've dropped the following drivers out of this send:

* ptp_phc
* ptp_ipx46x
* tg3
* hclge
* stmac
* cpts

I plan to submit those drivers changes again at a later date. As before, there are some drivers which are not trivial to convert to the new helper functions. While they may be able to work, their implementation is different and I lack the hardware or datasheets to determine what the correct implementation would be.

* drivers/net/ethernet/broadcom/bnx2x
* drivers/net/ethernet/broadcom/bnxt
* drivers/net/ethernet/cavium/liquidio
* drivers/net/ethernet/chelsio/cxgb4
* drivers/net/ethernet/freescale
* drivers/net/ethernet/qlogic/qed
* drivers/net/ethernet/qlogic/qede
* drivers/net/ethernet/sfc
* drivers/net/ethernet/sfc/siena
* drivers/net/ethernet/ti/am65-cpts.c
* drivers/ptp/ptp_dte.c

My end goal is to drop the .adjfreq implementation entirely, and to that end I plan on modifying these drivers in the future to directly use scaled_ppm_to_ppb as the simplest method to convert them.

Changes since v2:
* Rebased to allow landing in 6.2
* Added Richard's Acked-by

Cc "K. Y. Srinivasan" <[email protected]>
Cc Haiyang Zhang <[email protected]>
Cc Stephen Hemminger <[email protected]>
Cc Wei Liu <[email protected]>
Cc Dexuan Cui <[email protected]>
Cc Tom Lendacky <[email protected]>
Cc Shyam Sundar S K <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Eric Dumazet <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc Paolo Abeni <[email protected]>
Cc Siva Reddy Kallam <[email protected]>
Cc Prashant Sreedharan <[email protected]>
Cc Michael Chan <[email protected]>
Cc Yisen Zhuang <[email protected]>
Cc Salil Mehta <[email protected]>
Cc Jesse Brandeburg <[email protected]>
Cc Tony Nguyen <[email protected]>
Cc Tariq Toukan <[email protected]>
Cc Saeed Mahameed <[email protected]>
Cc Leon Romanovsky <[email protected]>
Cc Bryan Whitehead <[email protected]>
Cc Sergey Shtylyov <[email protected]>
Cc Giuseppe Cavallaro <[email protected]>
Cc Alexandre Torgue <[email protected]>
Cc Jose Abreu <[email protected]>
Cc Maxime Coquelin <[email protected]>
Cc Richard Cochran <[email protected]>
Cc Vivek Thampi <[email protected]>
Cc VMware PV-Drivers Reviewers <[email protected]>
Cc Jie Wang <[email protected]>
Cc Jacob Keller <[email protected]>
Cc Guangbin Huang <[email protected]>
Cc Eran Ben Elisha <[email protected]>
Cc Aya Levin <[email protected]>
Cc Cai Huoqing <[email protected]>
Cc Biju Das <[email protected]>
Cc Lad Prabhakar <[email protected]>
Cc Phil Edworthy <[email protected]>
Cc Jiasheng Jiang <[email protected]>
Cc "Gustavo A. R. Silva" <[email protected]>
Cc Linus Walleij <[email protected]>
Cc Wan Jiabing <[email protected]>
Cc Lv Ruyi <[email protected]>
Cc Arnd Bergmann <[email protected]>

Jacob Keller (9):
ptp: add missing documentation for parameters
ptp: introduce helpers to adjust by scaled parts per million
drivers: convert unsupported .adjfreq to .adjfine
ptp: mlx4: convert to .adjfine and adjust_by_scaled_ppm
ptp: mlx5: convert to .adjfine and adjust_by_scaled_ppm
ptp: lan743x: remove .adjfreq implementation
ptp: lan743x: use diff_by_scaled_ppm in .adjfine implementation
ptp: ravb: convert to .adjfine and adjust_by_scaled_ppm
ptp: xgbe: convert to .adjfine and adjust_by_scaled_ppm

 drivers/hv/hv_util.c                          |  4 +-
 drivers/net/ethernet/amd/xgbe/xgbe-ptp.c      | 20 ++-----
 drivers/net/ethernet/intel/e1000e/ptp.c       | 16 ++----
 drivers/net/ethernet/intel/i40e/i40e_ptp.c    | 17 ++----
 drivers/net/ethernet/intel/ice/ice_ptp.c      | 18 +------
 drivers/net/ethernet/intel/igb/igb_ptp.c      | 18 +------
 drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c  | 24 ++-------
 drivers/net/ethernet/mellanox/mlx4/en_clock.c | 29 ++++------
 .../ethernet/mellanox/mlx5/core/lib/clock.c   | 22 +++-----
 drivers/net/ethernet/microchip/lan743x_ptp.c  | 54 +++----------------
 drivers/net/ethernet/renesas/ravb_ptp.c       | 17 ++----
 drivers/ptp/ptp_kvm_common.c                  |  4 +-
 drivers/ptp/ptp_vmw.c                         |  4 +-
 include/linux/ptp_clock_kernel.h              | 53 ++++++++++++++++++
 14 files changed, 105 insertions(+), 195 deletions(-)

base-commit: 915b96c52763e2988e6368b538b487a7138b8fa4

Signature · 1 line
2.37.1.394.gc50926e1f488