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 9EB0E4590C; Thu, 5 Sep 2024 12:32:20 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6CE8842E69; Thu, 5 Sep 2024 12:32:12 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) by mails.dpdk.org (Postfix) with ESMTP id 87DCD42E56 for ; Thu, 5 Sep 2024 12:32:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1725532330; x=1757068330; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Y+IN6HyUEVsxJEu2VCwTXtVvIUQdftvB40ulLdySPKk=; b=Kipmg0aUpYWe+cdRSujf3kqGKWrQX/4POVLIEemEemxW4R8e72J/ftjJ Q0angWEkjJxcihY662z8+AQQB6g+KLvqNlfVfUX4wJ+UVWq303MwfvaCt OMKrllbx89dnNpO2chkD/knmsm/dJx/iSmWGZ74+xJc2QJRPCjpSRY9jz dOPTB+zCgQ2qCcJjNZiyZ/f5YzRpks6UmppOfFaxwdRNJY+FXKaYqv07z 7tdFftx+0sZardn9kEBw9sAxyKkN7RIGBcIbtI0Vkkv8b1t1JDMa0ZGS8 /13bzjTHui7RLVINDG7BfunM+Sold8btkWVT/iQiYYDKLmBITJfNAIDfm Q==; X-CSE-ConnectionGUID: b2VhWAf5QPqUNCoMnF3J2g== X-CSE-MsgGUID: KkZqpuo/Qqywc56hkk1QLA== X-IronPort-AV: E=McAfee;i="6700,10204,11185"; a="24433014" X-IronPort-AV: E=Sophos;i="6.10,204,1719903600"; d="scan'208";a="24433014" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Sep 2024 03:32:09 -0700 X-CSE-ConnectionGUID: UhjFtGv1R1ijcKNHRsqudg== X-CSE-MsgGUID: 5ng33xWJSpWT7uxDLhbR5Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,204,1719903600"; d="scan'208";a="66318936" Received: from unknown (HELO localhost.localdomain) ([10.239.252.253]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Sep 2024 03:32:07 -0700 From: Mingjin Ye To: dev@dpdk.org Cc: Mingjin Ye , Simei Su Subject: [PATCH 2/3] net/ice: add frequency adjustment support for PTP Date: Thu, 5 Sep 2024 10:08:38 +0000 Message-Id: <20240905100839.861860-3-mingjinx.ye@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240905100839.861860-1-mingjinx.ye@intel.com> References: <20240905100839.861860-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 Add ice support for new ethdev API to adjust frequency for IEEE1588 PTP. Also, this patch reworks code for converting software update to hardware update. Signed-off-by: Simei Su Signed-off-by: Mingjin Ye --- doc/guides/nics/ice.rst | 15 +++ drivers/net/ice/ice_ethdev.c | 177 ++++++++++++++++++++++++++--------- drivers/net/ice/ice_ethdev.h | 2 + drivers/net/ice/ice_rxtx.c | 4 +- 4 files changed, 153 insertions(+), 45 deletions(-) diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst index ae975d19ad..dec4cc2434 100644 --- a/doc/guides/nics/ice.rst +++ b/doc/guides/nics/ice.rst @@ -328,6 +328,21 @@ Forward Error Correction (FEC) Supports get/set FEC mode and get FEC capability. +Time Synchronisation +~~~~~~~~~~~~~~~~~~~~ + +The system operator can run a PTP (Precision Time Protocol) client application +to synchronise the time on the network card (and optionally the time on the +system) to the PTP master. + +ICE PMD supports PTP client applications that use the DPDK IEEE1588 API to +communicate with the PTP master clock. Note that the PTP client application +needs to run on the PF and vector mode needs to be disabled. + +.. code-block:: console + + examples/dpdk-ptpclient -c f -n 3 -a 0000:ec:00.1 -- -T 1 -p 0x1 --controller=pi + Generic Flow Support ~~~~~~~~~~~~~~~~~~~~ diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index 304f959b7e..33293a917f 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -176,6 +177,7 @@ static int ice_timesync_read_rx_timestamp(struct rte_eth_dev *dev, static int ice_timesync_read_tx_timestamp(struct rte_eth_dev *dev, struct timespec *timestamp); static int ice_timesync_adjust_time(struct rte_eth_dev *dev, int64_t delta); +static int ice_timesync_adjust_freq(struct rte_eth_dev *dev, int64_t ppm); static int ice_timesync_read_time(struct rte_eth_dev *dev, struct timespec *timestamp); static int ice_timesync_write_time(struct rte_eth_dev *dev, @@ -307,6 +309,7 @@ static const struct eth_dev_ops ice_eth_dev_ops = { .timesync_read_rx_timestamp = ice_timesync_read_rx_timestamp, .timesync_read_tx_timestamp = ice_timesync_read_tx_timestamp, .timesync_adjust_time = ice_timesync_adjust_time, + .timesync_adjust_freq = ice_timesync_adjust_freq, .timesync_read_time = ice_timesync_read_time, .timesync_write_time = ice_timesync_write_time, .timesync_disable = ice_timesync_disable, @@ -2332,6 +2335,34 @@ ice_get_supported_rxdid(struct ice_hw *hw) return supported_rxdid; } +static void ice_ptp_init_info(struct rte_eth_dev *dev) +{ + struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private); + struct ice_adapter *ad = + ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); + + switch (hw->phy_model) { + case ICE_PHY_ETH56G: + ad->ptp_tx_block = hw->pf_id; + ad->ptp_tx_index = 0; + break; + case ICE_PHY_E810: + /* fallthrough */ + case ICE_PHY_E830: + ad->ptp_tx_block = hw->port_info->lport; + ad->ptp_tx_index = 0; + break; + case ICE_PHY_E822: + ad->ptp_tx_block = hw->pf_id / ICE_PORTS_PER_QUAD; + ad->ptp_tx_index = (hw->pf_id % ICE_PORTS_PER_QUAD) * + ICE_PORTS_PER_PHY_E822 * ICE_QUADS_PER_PHY_E822; + break; + default: + PMD_DRV_LOG(WARNING, "Unsupported PHY model"); + break; + } +} + static int ice_dev_init(struct rte_eth_dev *dev) { @@ -2499,6 +2530,9 @@ ice_dev_init(struct rte_eth_dev *dev) /* Initialize PHY model */ ice_ptp_init_phy_model(hw); + /* Initialize PTP info */ + ice_ptp_init_info(dev); + if (hw->phy_model == ICE_PHY_E822) { ret = ice_start_phy_timer_e822(hw, hw->pf_id); if (ret) @@ -6466,23 +6500,6 @@ ice_timesync_enable(struct rte_eth_dev *dev) } } - /* Initialize cycle counters for system time/RX/TX timestamp */ - memset(&ad->systime_tc, 0, sizeof(struct rte_timecounter)); - memset(&ad->rx_tstamp_tc, 0, sizeof(struct rte_timecounter)); - memset(&ad->tx_tstamp_tc, 0, sizeof(struct rte_timecounter)); - - ad->systime_tc.cc_mask = ICE_CYCLECOUNTER_MASK; - ad->systime_tc.cc_shift = 0; - ad->systime_tc.nsec_mask = 0; - - ad->rx_tstamp_tc.cc_mask = ICE_CYCLECOUNTER_MASK; - ad->rx_tstamp_tc.cc_shift = 0; - ad->rx_tstamp_tc.nsec_mask = 0; - - ad->tx_tstamp_tc.cc_mask = ICE_CYCLECOUNTER_MASK; - ad->tx_tstamp_tc.cc_shift = 0; - ad->tx_tstamp_tc.nsec_mask = 0; - ad->ptp_ena = 1; return 0; @@ -6497,14 +6514,13 @@ ice_timesync_read_rx_timestamp(struct rte_eth_dev *dev, ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); struct ice_rx_queue *rxq; uint32_t ts_high; - uint64_t ts_ns, ns; + uint64_t ts_ns; rxq = dev->data->rx_queues[flags]; ts_high = rxq->time_high; ts_ns = ice_tstamp_convert_32b_64b(hw, ad, 1, ts_high); - ns = rte_timecounter_update(&ad->rx_tstamp_tc, ts_ns); - *timestamp = rte_ns_to_timespec(ns); + *timestamp = rte_ns_to_timespec(ts_ns); return 0; } @@ -6516,22 +6532,18 @@ ice_timesync_read_tx_timestamp(struct rte_eth_dev *dev, struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private); struct ice_adapter *ad = ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); - uint8_t lport; - uint64_t ts_ns, ns, tstamp; + uint64_t ts_ns, tstamp; const uint64_t mask = 0xFFFFFFFF; int ret; - lport = hw->port_info->lport; - - ret = ice_read_phy_tstamp(hw, lport, 0, &tstamp); - if (ret) { + ret = ice_read_phy_tstamp(hw, ad->ptp_tx_block, ad->ptp_tx_index, &tstamp); + if (ret || tstamp == 0) { PMD_DRV_LOG(ERR, "Failed to read phy timestamp"); return -1; } ts_ns = ice_tstamp_convert_32b_64b(hw, ad, 1, (tstamp >> 8) & mask); - ns = rte_timecounter_update(&ad->tx_tstamp_tc, ts_ns); - *timestamp = rte_ns_to_timespec(ns); + *timestamp = rte_ns_to_timespec(ts_ns); return 0; } @@ -6539,28 +6551,108 @@ ice_timesync_read_tx_timestamp(struct rte_eth_dev *dev, static int ice_timesync_adjust_time(struct rte_eth_dev *dev, int64_t delta) { - struct ice_adapter *ad = - ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); + struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private); + uint8_t tmr_idx = hw->func_caps.ts_func_info.tmr_index_assoc; + uint32_t lo, lo2, hi; + uint64_t time, ns; + int ret; + + if (delta > INT32_MAX || delta < INT32_MIN) { + lo = ICE_READ_REG(hw, GLTSYN_TIME_L(tmr_idx)); + hi = ICE_READ_REG(hw, GLTSYN_TIME_H(tmr_idx)); + lo2 = ICE_READ_REG(hw, GLTSYN_TIME_L(tmr_idx)); + + if (lo2 < lo) { + lo = ICE_READ_REG(hw, GLTSYN_TIME_L(tmr_idx)); + hi = ICE_READ_REG(hw, GLTSYN_TIME_H(tmr_idx)); + } + + time = ((uint64_t)hi << 32) | lo; + ns = time + delta; + + wr32(hw, GLTSYN_SHTIME_L(tmr_idx), ICE_LO_DWORD(ns)); + wr32(hw, GLTSYN_SHTIME_H(tmr_idx), ICE_HI_DWORD(ns)); + wr32(hw, GLTSYN_SHTIME_0(tmr_idx), 0); + + ret = ice_ptp_init_time(hw, ns, true); + if (ret) { + PMD_DRV_LOG(ERR, "PTP init time failed, err %d", ret); + return -1; + } + return 0; + } + + ret = ice_ptp_adj_clock(hw, delta, true); + if (ret) { + PMD_DRV_LOG(ERR, "PTP adj clock failed, err %d", ret); + return -1; + } + + return 0; +} + +static int +ice_timesync_adjust_freq(struct rte_eth_dev *dev, int64_t ppm) +{ + struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private); + int64_t incval, diff = 0; + bool negative = false; + uint64_t div, rem; + uint64_t divisor = 1000000ULL << 16; + int shift; + int ret; + + incval = ice_get_base_incval(hw, ICE_SRC_TMR_MODE_NANOSECONDS); + + if (ppm < 0) { + negative = true; + ppm = -ppm; + } + + /* can incval * ppm overflow ? */ + if (log2(incval) + log2(ppm) > 62) { + rem = ppm % divisor; + div = ppm / divisor; + diff = div * incval; + ppm = rem; - ad->systime_tc.nsec += delta; - ad->rx_tstamp_tc.nsec += delta; - ad->tx_tstamp_tc.nsec += delta; + shift = log2(incval) + log2(ppm) - 62; + if (shift > 0) { + /* drop precision */ + ppm >>= shift; + divisor >>= shift; + } + } + + if (divisor) + diff = diff + incval * ppm / divisor; + + if (negative) + incval -= diff; + else + incval += diff; + ret = ice_ptp_write_incval_locked(hw, incval, true); + if (ret) { + PMD_DRV_LOG(ERR, "PTP failed to set incval, err %d", ret); + return -1; + } return 0; } static int ice_timesync_write_time(struct rte_eth_dev *dev, const struct timespec *ts) { - struct ice_adapter *ad = - ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); + struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private); uint64_t ns; + int ret; ns = rte_timespec_to_ns(ts); - - ad->systime_tc.nsec = ns; - ad->rx_tstamp_tc.nsec = ns; - ad->tx_tstamp_tc.nsec = ns; + ret = ice_ptp_init_time(hw, ns, true); + if (ret) { + PMD_DRV_LOG(ERR, "PTP init time failed, err %d", ret); + return -1; + } return 0; } @@ -6569,11 +6661,9 @@ static int ice_timesync_read_time(struct rte_eth_dev *dev, struct timespec *ts) { struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private); - struct ice_adapter *ad = - ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); uint8_t tmr_idx = hw->func_caps.ts_func_info.tmr_index_assoc; uint32_t hi, lo, lo2; - uint64_t time, ns; + uint64_t time; lo = ICE_READ_REG(hw, GLTSYN_TIME_L(tmr_idx)); hi = ICE_READ_REG(hw, GLTSYN_TIME_H(tmr_idx)); @@ -6585,8 +6675,7 @@ ice_timesync_read_time(struct rte_eth_dev *dev, struct timespec *ts) } time = ((uint64_t)hi << 32) | lo; - ns = rte_timecounter_update(&ad->systime_tc, time); - *ts = rte_ns_to_timespec(ns); + *ts = rte_ns_to_timespec(time); return 0; } diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h index 3ea9f37dc8..db192e76fe 100644 --- a/drivers/net/ice/ice_ethdev.h +++ b/drivers/net/ice/ice_ethdev.h @@ -614,6 +614,8 @@ struct ice_adapter { struct rte_timecounter systime_tc; struct rte_timecounter rx_tstamp_tc; struct rte_timecounter tx_tstamp_tc; + uint8_t ptp_tx_block; + uint8_t ptp_tx_index; bool ptp_ena; uint64_t time_hw; struct ice_fdir_prof_info fdir_prof_info[ICE_MAX_PTGS]; diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index f270498ed1..5f399e8aae 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -3066,7 +3066,9 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) else if (ol_flags & RTE_MBUF_F_TX_IEEE1588_TMST) cd_type_cmd_tso_mss |= ((uint64_t)ICE_TX_CTX_DESC_TSYN << - ICE_TXD_CTX_QW1_CMD_S); + ICE_TXD_CTX_QW1_CMD_S) | + (((uint64_t)txq->vsi->adapter->ptp_tx_index << + ICE_TXD_CTX_QW1_TSYN_S) & ICE_TXD_CTX_QW1_TSYN_M); ctx_txd->tunneling_params = rte_cpu_to_le_32(cd_tunneling_params); -- 2.25.1