From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756658AbcCDB5N (ORCPT ); Thu, 3 Mar 2016 20:57:13 -0500 Received: from mail-pf0-f175.google.com ([209.85.192.175]:33425 "EHLO mail-pf0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755484AbcCDB5K (ORCPT ); Thu, 3 Mar 2016 20:57:10 -0500 From: John Stultz To: lkml Cc: John Stultz , Prarit Bhargava , Richard Cochran , Thomas Gleixner , Ingo Molnar , Andy Lutomirski , Jeff Kirsher , kevin.b.stanton@intel.com, kevin.j.clarke@intel.com, hpa@zytor.com, netdev@vger.kernel.org Subject: [PATCHv2 0/8][GIT PULLv2] time: Cross-timestamp infrastructure for 4.6 Date: Thu, 3 Mar 2016 17:56:58 -0800 Message-Id: <1457056626-4899-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: Richard Cochran Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Andy Lutomirski Cc: Jeff Kirsher 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