| Message ID | 1456978919-30076-1-git-send-email-john.stultz@linaro.org |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show
Return-Path: <netdev-owner@vger.kernel.org> X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 432B914130B for <patchwork-incoming@ozlabs.org>; Thu, 3 Mar 2016 15:26:00 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b=aSI0jczo; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753924AbcCCEWM (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Wed, 2 Mar 2016 23:22:12 -0500 Received: from mail-pa0-f47.google.com ([209.85.220.47]:36497 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752599AbcCCEWL (ORCPT <rfc822;netdev@vger.kernel.org>); Wed, 2 Mar 2016 23:22:11 -0500 Received: by mail-pa0-f47.google.com with SMTP id fi3so5216770pac.3 for <netdev@vger.kernel.org>; Wed, 02 Mar 2016 20:22:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=MhKPz41ZT6cW2rCddiWpxunqe0+Hwp9vOfPZA6Y117E=; b=aSI0jczoZZvLniWIFTUemxbIUR+izNoEzuibVjucRjzsZ9kVAax+f7uRrlpnQ0E3L2 80GLSTgvc4oId2hzkRL3ANRAsjR7zfuI3EDQ16+DH7hK5p73NqjuD6ejP3JGnLI250+M ObRaGU/MfhBBGNsRMAViplcoh0a8uM0kRflWA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=MhKPz41ZT6cW2rCddiWpxunqe0+Hwp9vOfPZA6Y117E=; b=ljRjMlEKAOC2FAyUS4m+IPluZAIMqF9959omATbMBWyaRkmKP7c6UwxKYzK/ytaMj9 2MbKujunc+oz++V7c4TzaV5N+2gk+RguXaZ0Zcd3fKFvq3TUrHQkddPoRrhK4L8cB+c9 CGE8+DWn+WTZ00T2JjYaKHgA5OtlixliTSEIHaMMW+At3WW0a+KRV0c0y44lnaw/nM5H gA9NMZFheUqW72PIwBpk+YYeMaOn07UFwhAEDH8sDynMrHDqY2dNYSoXD8bbshgzf3Fx gIlXGp14arddtoaugt0LVuY72wY+sfoDzQ53IdeOCMLeDKPmFnmmXFm/UVBJNj0w447/ 9k7g== X-Gm-Message-State: AD7BkJIkHXgkD+ZXKdWU59dgLJAJNg0gaUtBu1JXm4D822+CQF/JVl0g9yhDoit0PTTlhh/C X-Received: by 10.66.90.226 with SMTP id bz2mr754061pab.31.1456978930209; Wed, 02 Mar 2016 20:22:10 -0800 (PST) Received: from localhost.localdomain (c-76-115-103-22.hsd1.or.comcast.net. [76.115.103.22]) by smtp.gmail.com with ESMTPSA id xu1sm56468698pab.31.2016.03.02.20.22.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Mar 2016 20:22:09 -0800 (PST) From: John Stultz <john.stultz@linaro.org> To: lkml <linux-kernel@vger.kernel.org> Cc: John Stultz <john.stultz@linaro.org>, Prarit Bhargava <prarit@redhat.com>, Richard Cochran <richardcochran@gmail.com>, Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@kernel.org>, Andy Lutomirski <luto@amacapital.net>, Jeff Kirsher <jeffrey.t.kirsher@intel.com>, kevin.b.stanton@intel.com, kevin.j.clarke@intel.com, hpa@zytor.com, netdev@vger.kernel.org Subject: [PATCH 0/8][GIT PULL] time: Cross-timestamp infrastructure for 4.6 Date: Wed, 2 Mar 2016 20:21:51 -0800 Message-Id: <1456978919-30076-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: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
Hey Thomas, So here is Christopher's cross-timestamp infrastructure patchset which I wanted to send along for 4.6. 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 dbfa7fb88d3ab62268b36ee26b2987a01f72a6c9: net: e1000e: Adds hardware supported cross timestamp on e1000e nic (2016-03-02 17:44:58 -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 net: 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 | 62 ++++++ 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, 546 insertions(+), 40 deletions(-)