From patchwork Mon Jun 28 15:34:32 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Cochran X-Patchwork-Id: 57152 X-Patchwork-Delegate: davem@davemloft.net Return-Path: 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 18776B6EEB for ; Tue, 29 Jun 2010 01:34:36 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755232Ab0F1Pec (ORCPT ); Mon, 28 Jun 2010 11:34:32 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:34550 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754411Ab0F1Peb (ORCPT ); Mon, 28 Jun 2010 11:34:31 -0400 Received: by fxm14 with SMTP id 14so759495fxm.19 for ; Mon, 28 Jun 2010 08:34:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=n0nyMdU9ekLWFdA0/2YbGq6e+bomsnbpCFVCT6QGZyk=; b=XkY2RqSglzc1r5kxAoWIDVUff+r/d9J2vSY94I5wfFTL/rLU33/5x1g4yd0+dO3qyx gcUIeC+yNfE/YUvESaV0WZaeFU0E+K6RUFaCZD02gq1HDSE/2rGGssAO/tfJTgCRPqPI E0X8aSY6m5K7epB60oBfZOSp78uXqAnot+OUU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=eFzivtS+NjUwbYB906nKAMtSf4Cgdo/JPueVNUK2oZdEN/xXEobMAaaJBRS9oRCdKO YRhE36ZFUkmBzn16j0LBvkkuQu2U0OLR9kHCy+9HQuTD8gTrW+rQ0q1A5I5ACbd3Gfgz 4tnqh0uJ6c2xcQF52xF+lB/xU3K7e/9YnHpt8= Received: by 10.87.67.25 with SMTP id u25mr7259065fgk.32.1277739269833; Mon, 28 Jun 2010 08:34:29 -0700 (PDT) Received: from riccoc20.at.omicron.at (vs162244.vserver.de [62.75.162.244]) by mx.google.com with ESMTPS id 31sm6416108fkt.19.2010.06.28.08.34.28 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 28 Jun 2010 08:34:28 -0700 (PDT) Date: Mon, 28 Jun 2010 17:34:32 +0200 From: Richard Cochran To: netdev@vger.kernel.org Subject: [PATCH 2/4] phylib: add a way to make PHY time stamps possible. Message-ID: <2f61db64ce60f41c83f335ce9f3a4dde5a50ed85.1277737223.git.richard.cochran@omicron.at> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch adds a new networking option to allow hardware time stamps from PHY devices. Using PHY time stamps will still require adding two inline function calls to each MAC driver. The CONFIG option makes these calls safe to add, since the calls become NOOPs when the option is disabled. The patch also adds phylib driver methods for the SIOCSHWTSTAMP ioctl and callbacks for transmit and receive time stamping. Drivers may optionally implement these functions. Signed-off-by: Richard Cochran --- include/linux/phy.h | 7 +++++++ include/linux/skbuff.h | 29 +++++++++++++++++++++++++++++ net/Kconfig | 11 +++++++++++ 3 files changed, 47 insertions(+), 0 deletions(-) diff --git a/include/linux/phy.h b/include/linux/phy.h index 987e111..3566bde 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -234,6 +234,8 @@ enum phy_state { PHY_RESUMING }; +struct sk_buff; + /* phy_device: An instance of a PHY * * drv: Pointer to the driver for this PHY instance @@ -402,6 +404,11 @@ struct phy_driver { /* Clears up any memory if needed */ void (*remove)(struct phy_device *phydev); + /* Handles SIOCSHWTSTAMP ioctl for hardware time stamping. */ + int (*hwtstamp)(struct phy_device *phydev, struct ifreq *ifr); + int (*rxtstamp)(struct phy_device *phydev, struct sk_buff *skb); + int (*txtstamp)(struct phy_device *phydev, struct sk_buff *skb); + struct device_driver driver; }; #define to_phy_driver(d) container_of(d, struct phy_driver, driver) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index fe70e66..6163022 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1961,6 +1961,33 @@ static inline void sw_tx_timestamp(struct sk_buff *skb) } #endif +#ifdef CONFIG_NETWORK_PHY_TIMESTAMPING + +static inline void phy_tx_timestamp(struct phy_device *phy, struct sk_buff *skb) +{ + union skb_shared_tx *shtx = skb_tx(skb); + if (shtx->hardware && phy && phy->drv->txtstamp) + phy->drv->txtstamp(phy, skb); +} + +static inline void phy_rx_timestamp(struct phy_device *phy, struct sk_buff *skb) +{ + if (phy && phy->drv->rxtstamp) + phy->drv->rxtstamp(phy, skb); +} + +#else /* CONFIG_NETWORK_PHY_TIMESTAMPING */ + +static inline void phy_tx_timestamp(struct phy_device *phy, struct sk_buff *skb) +{ +} + +static inline void phy_rx_timestamp(struct phy_device *phy, struct sk_buff *skb) +{ +} + +#endif /* !CONFIG_NETWORK_PHY_TIMESTAMPING */ + /** * skb_tx_timestamp() - Driver hook for software timestamping * @@ -1973,6 +2000,7 @@ static inline void sw_tx_timestamp(struct sk_buff *skb) */ static inline void skb_tx_timestamp(struct phy_device *phy, struct sk_buff *skb) { + phy_tx_timestamp(phy, skb); sw_tx_timestamp(skb); } @@ -1987,6 +2015,7 @@ static inline void skb_tx_timestamp(struct phy_device *phy, struct sk_buff *skb) */ static inline void skb_rx_timestamp(struct phy_device *phy, struct sk_buff *skb) { + phy_rx_timestamp(phy, skb); } extern __sum16 __skb_checksum_complete_head(struct sk_buff *skb, int len); diff --git a/net/Kconfig b/net/Kconfig index 73e8d97..09a1d26 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -97,6 +97,17 @@ config NETWORK_TXTS_FALLBACK If you are unsure how to answer this question, answer N. +config NETWORK_PHY_TIMESTAMPING + bool "Timestamping in PHY devices" + depends on EXPERIMENTAL + help + This allows timestamping of network packets by PHYs with + hardware timestamping capabilities. This option adds some + overhead in the transmit and receive paths. Note that this + option also requires support in the MAC driver. + + If you are unsure how to answer this question, answer N. + menuconfig NETFILTER bool "Network packet filtering framework (Netfilter)" ---help---