From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 999F44590E; Thu, 5 Sep 2024 12:50:05 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B8A3542E73; Thu, 5 Sep 2024 12:50:00 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) by mails.dpdk.org (Postfix) with ESMTP id CE8634025C for ; Thu, 5 Sep 2024 12:49:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1725533399; x=1757069399; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2vpBfqy4d6exX29PDa3ImBPH2acKT2mJ7HzfdVuzDkU=; b=QmJ9HmwvJYkYfQesen6VogWzP7XYoG8rmOgFYcL6STEEVO/kI7+w4p5P mlfWjT9deTigAenotPEG2Dg7pJ0xZlovuFyewBmVA36mJaxVm1vM8/vZk HxrzJVRBeAM0xXt9INgqRDeDhhUezJTNEOCr72Kd2DCIw1aLAhahlLhbK K5HojoMCIVusjO2yAwo0WI3oJ1ZO3OmAyq3J8HEik1C3yKw+v5ADbKHX2 Mb5+Q8CAGgQowcWqb+0p7o0j4Ahdy0sv7OXz61EvxMQmsD398u9PQLcyY nnO7eCOh18zPZvhmrMSuyIGFb7hEsm1PSwi63zm7kcfmfDevc0NDdOeQr Q==; X-CSE-ConnectionGUID: kEsBWIqLTLOWn665UB6tvw== X-CSE-MsgGUID: Uu7zyg/QSny3+k8QCkhtDw== X-IronPort-AV: E=McAfee;i="6700,10204,11185"; a="24403150" X-IronPort-AV: E=Sophos;i="6.10,204,1719903600"; d="scan'208";a="24403150" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Sep 2024 03:49:52 -0700 X-CSE-ConnectionGUID: cMOaMy3CSGGy31TEvRLMug== X-CSE-MsgGUID: 144DPkiSQ3Ca58RZITBaHw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,204,1719903600"; d="scan'208";a="70506367" Received: from unknown (HELO localhost.localdomain) ([10.239.252.253]) by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Sep 2024 03:49:49 -0700 From: Mingjin Ye To: dev@dpdk.org Cc: Mingjin Ye , Simei Su , Thomas Monjalon , Ferruh Yigit , Andrew Rybchenko Subject: [PATCH v2 1/3] ethdev: add frequency adjustment API Date: Thu, 5 Sep 2024 10:26:22 +0000 Message-Id: <20240905102624.865044-2-mingjinx.ye@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240905102624.865044-1-mingjinx.ye@intel.com> References: <20240905102624.865044-1-mingjinx.ye@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org This patch adds freq adjustment API for PTP high accuracy. Signed-off-by: Simei Su Signed-off-by: Mingjin Ye --- v2: rte_eth_timesync_adjust_freq marked as experimental --- doc/guides/nics/features.rst | 4 +++- doc/guides/rel_notes/release_24_11.rst | 30 +++----------------------- lib/ethdev/ethdev_driver.h | 5 +++++ lib/ethdev/ethdev_trace.h | 9 ++++++++ lib/ethdev/ethdev_trace_points.c | 3 +++ lib/ethdev/rte_ethdev.c | 18 ++++++++++++++++ lib/ethdev/rte_ethdev.h | 21 ++++++++++++++++++ lib/ethdev/version.map | 3 +++ 8 files changed, 65 insertions(+), 28 deletions(-) diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst index cd0115ffb3..0508f118fe 100644 --- a/doc/guides/nics/features.rst +++ b/doc/guides/nics/features.rst @@ -677,10 +677,12 @@ Supports IEEE1588/802.1AS timestamping. * **[implements] eth_dev_ops**: ``timesync_enable``, ``timesync_disable`` ``timesync_read_rx_timestamp``, ``timesync_read_tx_timestamp``, - ``timesync_adjust_time``, ``timesync_read_time``, ``timesync_write_time``. + ``timesync_adjust_time``, ``timesync_adjust_freq``, + ``timesync_read_time``, ``timesync_write_time``. * **[related] API**: ``rte_eth_timesync_enable()``, ``rte_eth_timesync_disable()``, ``rte_eth_timesync_read_rx_timestamp()``, ``rte_eth_timesync_read_tx_timestamp``, ``rte_eth_timesync_adjust_time()``, + ``rte_eth_timesync_adjust_freq()``, ``rte_eth_timesync_read_time()``, ``rte_eth_timesync_write_time()``. diff --git a/doc/guides/rel_notes/release_24_11.rst b/doc/guides/rel_notes/release_24_11.rst index 0ff70d9057..10ac35e5c0 100644 --- a/doc/guides/rel_notes/release_24_11.rst +++ b/doc/guides/rel_notes/release_24_11.rst @@ -25,35 +25,11 @@ New Features ------------ .. This section should contain new features added in this release. - Sample format: - * **Add a title in the past tense with a full stop.** +* **Added Ethernet device clock incremental rate adjustment.** - Add a short 1-2 sentence description in the past tense. - The description should be enough to allow someone scanning - the release notes to understand the new feature. - - If the feature adds a lot of sub-features you can use a bullet list - like this: - - * Added feature foo to do something. - * Enhanced feature bar to do something else. - - Refer to the previous release notes for examples. - - Suggested order in release notes items: - * Core libs (EAL, mempool, ring, mbuf, buses) - * Device abstraction libs and PMDs (ordered alphabetically by vendor name) - - ethdev (lib, PMDs) - - cryptodev (lib, PMDs) - - eventdev (lib, PMDs) - - etc - * Other libs - * Apps, Examples, Tools (if significant) - - This section is a comment. Do not overwrite or remove it. - Also, make sure to start the actual text at the margin. - ======================================================= + Added new function ``rte_eth_timesync_adjust_freq`` to + adjust the clock increment rate for Ethernet devices. Removed Items diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h index 883e59a927..68cadc14a5 100644 --- a/lib/ethdev/ethdev_driver.h +++ b/lib/ethdev/ethdev_driver.h @@ -664,6 +664,9 @@ typedef int (*eth_timesync_read_tx_timestamp_t)(struct rte_eth_dev *dev, /** @internal Function used to adjust the device clock. */ typedef int (*eth_timesync_adjust_time)(struct rte_eth_dev *dev, int64_t); +/** @internal Function used to adjust the clock frequency. */ +typedef int (*eth_timesync_adjust_freq)(struct rte_eth_dev *dev, int64_t); + /** @internal Function used to get time from the device clock. */ typedef int (*eth_timesync_read_time)(struct rte_eth_dev *dev, struct timespec *timestamp); @@ -1378,6 +1381,8 @@ struct eth_dev_ops { eth_timesync_read_tx_timestamp_t timesync_read_tx_timestamp; /** Adjust the device clock */ eth_timesync_adjust_time timesync_adjust_time; + /** Adjust the clock frequency */ + eth_timesync_adjust_freq timesync_adjust_freq; /** Get the device clock time */ eth_timesync_read_time timesync_read_time; /** Set the device clock time */ diff --git a/lib/ethdev/ethdev_trace.h b/lib/ethdev/ethdev_trace.h index 3bec87bfdb..e273d5853e 100644 --- a/lib/ethdev/ethdev_trace.h +++ b/lib/ethdev/ethdev_trace.h @@ -2183,6 +2183,15 @@ RTE_TRACE_POINT_FP( rte_trace_point_emit_int(ret); ) +/* Called in loop in examples/ptpclient */ +RTE_TRACE_POINT_FP( + rte_eth_trace_timesync_adjust_freq, + RTE_TRACE_POINT_ARGS(uint16_t port_id, int64_t ppm, int ret), + rte_trace_point_emit_u16(port_id); + rte_trace_point_emit_i64(ppm); + rte_trace_point_emit_int(ret); +) + /* Called in loop in app/test-flow-perf */ RTE_TRACE_POINT_FP( rte_flow_trace_create, diff --git a/lib/ethdev/ethdev_trace_points.c b/lib/ethdev/ethdev_trace_points.c index 99e04f5893..a99fec0c1e 100644 --- a/lib/ethdev/ethdev_trace_points.c +++ b/lib/ethdev/ethdev_trace_points.c @@ -409,6 +409,9 @@ RTE_TRACE_POINT_REGISTER(rte_eth_trace_timesync_read_tx_timestamp, RTE_TRACE_POINT_REGISTER(rte_eth_trace_timesync_adjust_time, lib.ethdev.timesync_adjust_time) +RTE_TRACE_POINT_REGISTER(rte_eth_trace_timesync_adjust_freq, + lib.ethdev.timesync_adjust_freq) + RTE_TRACE_POINT_REGISTER(rte_eth_trace_timesync_read_time, lib.ethdev.timesync_read_time) diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index f1c658f49e..660eab2f1e 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -6310,6 +6310,24 @@ rte_eth_timesync_adjust_time(uint16_t port_id, int64_t delta) return ret; } +int +rte_eth_timesync_adjust_freq(uint16_t port_id, int64_t ppm) +{ + struct rte_eth_dev *dev; + int ret; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + dev = &rte_eth_devices[port_id]; + + if (*dev->dev_ops->timesync_adjust_freq == NULL) + return -ENOTSUP; + ret = eth_err(port_id, (*dev->dev_ops->timesync_adjust_freq)(dev, ppm)); + + rte_eth_trace_timesync_adjust_freq(port_id, ppm, ret); + + return ret; +} + int rte_eth_timesync_read_time(uint16_t port_id, struct timespec *timestamp) { diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index 548fada1c7..f4b93ca6ff 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -5297,6 +5297,26 @@ int rte_eth_timesync_read_tx_timestamp(uint16_t port_id, */ int rte_eth_timesync_adjust_time(uint16_t port_id, int64_t delta); +/** + * Adjust the clock increment rate on an Ethernet device. + * + * This is usually used in conjunction with other Ethdev timesync functions to + * synchronize the device time using the IEEE1588/802.1AS protocol. + * + * @param port_id + * The port identifier of the Ethernet device. + * @param ppm + * Parts per million with 16-bit fractional field + * + * @return + * - 0: Success. + * - -ENODEV: The port ID is invalid. + * - -EIO: if device is removed. + * - -ENOTSUP: The function is not supported by the Ethernet driver. + */ +__rte_experimental +int rte_eth_timesync_adjust_freq(uint16_t port_id, int64_t ppm); + /** * Read the time from the timesync clock on an Ethernet device. * @@ -5312,6 +5332,7 @@ int rte_eth_timesync_adjust_time(uint16_t port_id, int64_t delta); * - 0: Success. * - -EINVAL: Bad parameter. */ +__rte_experimental int rte_eth_timesync_read_time(uint16_t port_id, struct timespec *time); /** diff --git a/lib/ethdev/version.map b/lib/ethdev/version.map index 1669055ca5..199480ef07 100644 --- a/lib/ethdev/version.map +++ b/lib/ethdev/version.map @@ -325,6 +325,9 @@ EXPERIMENTAL { rte_flow_template_table_resizable; rte_flow_template_table_resize; rte_flow_template_table_resize_complete; + + # added in 24.11 + rte_eth_timesync_adjust_freq; }; INTERNAL { -- 2.25.1