Messages in this thread | | | From | John Stultz <> | Subject | [PATCHv2 0/8][GIT PULLv2] time: Cross-timestamp infrastructure for 4.6 | Date | Thu, 3 Mar 2016 17:56:58 -0800 |
| |
Hey Thomas, So again, here is Christopher's cross-timestamp infrastructure patchset which I wanted to send along for 4.6. (Including the minor tweaks you suggested). These apply against tip/timers/core.
Let me know if you have any objections.
thanks -john
Cc: Prarit Bhargava <prarit@redhat.com> Cc: Richard Cochran <richardcochran@gmail.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@kernel.org> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Cc: kevin.b.stanton@intel.com Cc: kevin.j.clarke@intel.com Cc: hpa@zytor.com Cc: jeffrey.t.kirsher@intel.com Cc: netdev@vger.kernel.org
The following changes since commit 232d26373d310a941ef2ab46e53ea62fe076ed13:
jiffies: Use CLOCKSOURCE_MASK instead of constant (2016-02-27 08:55:31 +0100)
are available in the git repository at:
https://git.linaro.org/people/john.stultz/linux.git fortglx/4.6/time
for you to fetch changes up to 01d7ada57ee9c735bd71fbe44ec0bcb70847afd4:
e1000e: Adds hardware supported cross timestamp on e1000e nic (2016-03-03 14:28:46 -0800) ---------------------------------------------------------------- Christopher S. Hall (8): time: Add cycles to nanoseconds translation time: Add timekeeping snapshot code capturing system time and counter time: Remove duplicated code in ktime_get_raw_and_real() time: Add driver cross timestamp interface for higher precision time synchronization time: Add history to cross timestamp interface supporting slower devices x86/tsc: Always Running Timer (ART) correlated clocksource ptp: Add PTP_SYS_OFFSET_PRECISE for driver crosstimestamping e1000e: Adds hardware supported cross timestamp on e1000e nic
Documentation/ptp/testptp.c | 6 +- arch/x86/include/asm/cpufeature.h | 2 +- arch/x86/include/asm/tsc.h | 2 + arch/x86/kernel/tsc.c | 59 ++++++ drivers/net/ethernet/intel/Kconfig | 9 + drivers/net/ethernet/intel/e1000e/defines.h | 5 + drivers/net/ethernet/intel/e1000e/ptp.c | 85 +++++++++ drivers/net/ethernet/intel/e1000e/regs.h | 4 + drivers/ptp/ptp_chardev.c | 27 +++ include/linux/pps_kernel.h | 17 +- include/linux/ptp_clock_kernel.h | 8 + include/linux/timekeeper_internal.h | 2 + include/linux/timekeeping.h | 58 ++++++ include/uapi/linux/ptp_clock.h | 13 +- kernel/time/timekeeping.c | 286 +++++++++++++++++++++++++--- 15 files changed, 543 insertions(+), 40 deletions(-)
-- 1.9.1
| |