From patchwork Fri Oct 2 15:20:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Mrzyglod X-Patchwork-Id: 7373 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 1F67B8E5A; Fri, 2 Oct 2015 17:22:32 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id E53608DB1 for ; Fri, 2 Oct 2015 17:22:29 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP; 02 Oct 2015 08:22:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,623,1437462000"; d="scan'208";a="818014332" Received: from unknown ([10.217.248.93]) by orsmga002.jf.intel.com with SMTP; 02 Oct 2015 08:22:27 -0700 Received: by (sSMTP sendmail emulation); Fri, 02 Oct 2015 17:21:23 +0200 From: Daniel Mrzyglod To: dev@dpdk.org Date: Fri, 2 Oct 2015 17:20:06 +0200 Message-Id: <1443799208-9408-2-git-send-email-danielx.t.mrzyglod@intel.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1443799208-9408-1-git-send-email-danielx.t.mrzyglod@intel.com> References: <1443799208-9408-1-git-send-email-danielx.t.mrzyglod@intel.com> Subject: [dpdk-dev] [PATCH 1/3] ethdev: add additional ieee1588 support functions X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Add additional functions to support the existing IEEE1588 functionality. * rte_eth_timesync_settime(), function to set the device clock time. * rte_eth_timesync_gettime, function to get the device clock time. * rte_eth_timesync_adjust, function to adjust the device clock time. Signed-off-by: Daniel Mrzyglod --- lib/librte_ether/rte_ethdev.c | 36 +++++++++++++++++++ lib/librte_ether/rte_ethdev.h | 64 ++++++++++++++++++++++++++++++++++ lib/librte_ether/rte_ether_version.map | 9 +++++ 3 files changed, 109 insertions(+) diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index f593f6e..6f26f3a 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -3272,6 +3272,42 @@ rte_eth_timesync_read_rx_timestamp(uint8_t port_id, struct timespec *timestamp, } int +rte_eth_timesync_adjust(uint8_t port_id, int64_t delta) +{ + struct rte_eth_dev *dev; + + VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + dev = &rte_eth_devices[port_id]; + + FUNC_PTR_OR_ERR_RET(*dev->dev_ops->timesync_adjust, -ENOTSUP); + return (*dev->dev_ops->timesync_adjust)(dev, delta); +} + +int +rte_eth_timesync_gettime(uint8_t port_id, struct timespec *timestamp) +{ + struct rte_eth_dev *dev; + + VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + dev = &rte_eth_devices[port_id]; + + FUNC_PTR_OR_ERR_RET(*dev->dev_ops->timesync_gettime, -ENOTSUP); + return (*dev->dev_ops->timesync_gettime)(dev, timestamp); +} + +int +rte_eth_timesync_settime(uint8_t port_id, struct timespec *timestamp) +{ + struct rte_eth_dev *dev; + + VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + dev = &rte_eth_devices[port_id]; + + FUNC_PTR_OR_ERR_RET(*dev->dev_ops->timesync_settime, -ENOTSUP); + return (*dev->dev_ops->timesync_settime)(dev, timestamp); +} + +int rte_eth_timesync_read_tx_timestamp(uint8_t port_id, struct timespec *timestamp) { struct rte_eth_dev *dev; diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index 8a8c82b..6fdaacd 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -1129,6 +1129,17 @@ typedef int (*eth_timesync_read_tx_timestamp_t)(struct rte_eth_dev *dev, struct timespec *timestamp); /**< @internal Function used to read a TX IEEE1588/802.1AS timestamp. */ +typedef int (*eth_timesync_adjust)(struct rte_eth_dev *dev, int64_t); +/**< @internal Function used to adjust device clock */ + +typedef int (*eth_timesync_gettime)(struct rte_eth_dev *dev, + struct timespec *timestamp); +/**< @internal Function used to get time from device clock. */ + +typedef int (*eth_timesync_settime)(struct rte_eth_dev *dev, + struct timespec *timestamp); +/**< @internal Function used to get time from device clock */ + typedef int (*eth_get_reg_length_t)(struct rte_eth_dev *dev); /**< @internal Retrieve device register count */ @@ -1312,6 +1323,12 @@ struct eth_dev_ops { eth_timesync_read_rx_timestamp_t timesync_read_rx_timestamp; /** Read the IEEE1588/802.1AS TX timestamp. */ eth_timesync_read_tx_timestamp_t timesync_read_tx_timestamp; + /** Adjust the device clock */ + eth_timesync_adjust timesync_adjust; + /** Get the device clock timespec */ + eth_timesync_gettime timesync_gettime; + /** Set the device clock timespec */ + eth_timesync_settime timesync_settime; }; /** @@ -3598,6 +3615,53 @@ extern int rte_eth_timesync_read_rx_timestamp(uint8_t port_id, extern int rte_eth_timesync_read_tx_timestamp(uint8_t port_id, struct timespec *timestamp); +/** + * Adjust the timesync clock on an Ethernet device.. + * + * @param port_id + * The port identifier of the Ethernet device. + * @param delta + * The adjustment in nanoseconds + * + * @return + * - 0: Success. + * - -ENODEV: The port ID is invalid. + * - -ENOTSUP: The function is not supported by the Ethernet driver. + */ +extern int rte_eth_timesync_adjust(uint8_t port_id, int64_t delta); + +/** + * Read the time from the timesync clock on an Ethernet device. + * + * @param port_id + * The port identifier of the Ethernet device. + * @param time + * Pointer to the timespec struct. + * + * @return + * - 0: Success. + */ +extern int rte_eth_timesync_gettime(uint8_t port_id, + struct timespec *time); + + +/** + * Set the time of the timesync clock on an Ethernet device. + * + * @param port_id + * The port identifier of the Ethernet device. + * @param time + * Pointer to the timespec struct. + * + * @return + * - 0: Success. + * - -EINVAL: No timestamp is available. + * - -ENODEV: The port ID is invalid. + * - -ENOTSUP: The function is not supported by the Ethernet driver. + */ +extern int rte_eth_timesync_settime(uint8_t port_id, + struct timespec *time); + #ifdef __cplusplus } #endif diff --git a/lib/librte_ether/rte_ether_version.map b/lib/librte_ether/rte_ether_version.map index 8345a6c..0820af3 100644 --- a/lib/librte_ether/rte_ether_version.map +++ b/lib/librte_ether/rte_ether_version.map @@ -127,3 +127,12 @@ DPDK_2.1 { rte_eth_timesync_read_tx_timestamp; } DPDK_2.0; + +DPDK_2.2 { + global: + + rte_eth_timesync_adjust; + rte_eth_timesync_gettime; + rte_eth_timesync_settime; + +} DPDK_2.1;