Skip to content

ptp: Provide support for auxiliary clocks for PTP_SYS_OFFSET_EXTENDED

Thomas Gleixner lkml netdev 2 versions – Applied

Status from this message: The following commit has been merged into the timers/ptp branch of tip:

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest3 patches 4 repliesApplied 3/3
  2. v13 patches 12 repliesSuperseded

Changes in v2 from the cover letter

- Make patch 1, which provides the timestamping function temporarily define CLOCK_AUX* if undefined so that it can be merged independently,

- Add a missing check for CONFIG_POSIX_AUX_CLOCK in the PTP IOCTL

- Picked up tags

Patches in v2 All 3 applied

#Subject and filesSizeRepliesApplied
1/3timekeeping: Provide ktime_get_clock_ts64()include/linux/timekeeping.h kernel/time/timekeeping.c+43 -00 repliesApplied
2/3ptp: Use ktime_get_clock_ts64() for timestampinginclude/linux/ptp_clock_kernel.h+4 -300 repliesApplied
3/3ptp: Enable auxiliary clocks for PTP_SYS_OFFSET_EXTENDEDdrivers/ptp/ptp_chardev.c+19 -50 repliesApplied

Reviews trailers per patch

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

PatchVadim FedorenkoJohn Stultz
1/3R-b A-b
2/3R-b A-b
3/3R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [patch V2 0/3] ptp: Provide support for auxiliary clocks for PTP_SYS_OFFSET_EXTENDED

This is a follow up to the V1 series, which can be found here:

     https://lore.kernel.org/all/[email protected]

to address the merge logistics problem, which I created myself.

Changes vs. V1:

- Make patch 1, which provides the timestamping function temporarily define CLOCK_AUX* if undefined so that it can be merged independently,

- Add a missing check for CONFIG_POSIX_AUX_CLOCK in the PTP IOCTL

- Picked up tags

Merge logistics if agreed on:

1) Patch #1 is applied to the tip tree on top of plain v6.16-rc1 and tagged

2) That tag is merged into tip:timers/ptp and the temporary CLOCK_AUX define is removed in a subsequent commit

3) Network folks merge the tag and apply patches #2 + #3

So the only fallout from this are the extra merges in both trees and the cleanup commit in the tip tree. But that way there are no dependencies and no duplicate commits with different SHAs.

Thoughts?

Due to the above constraints there is no branch offered to pull from right now. Sorry for the inconveniance. Should have thought about that earlier.

Thanks,

tglx

---
 drivers/ptp/ptp_chardev.c        |   24 +++++++++++++++++++-----
 include/linux/ptp_clock_kernel.h |   34 ++++------------------------------
 include/linux/timekeeping.h      |   10 ++++++++++
 kernel/time/timekeeping.c        |   33 +++++++++++++++++++++++++++++++++
 4 files changed, 66 insertions(+), 35 deletions(-)