From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A4AA2E7384 for ; Fri, 11 Sep 2026 00:34:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.14 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789086889; cv=none; b=TYzI2ZaF2DaWNxedlRTdpqFz/0ck6XjXnrobPfUlbgOD3K2IvArIxapLHe0SRrmaFhmFUTswB8uA4v8qBoKAO9ZtVTT4f6pqt8Il0Hognhoe5dD6eJ6Wp8KeO2HM2PHjeFtM+MUCtgFQO2aOdcmQsN/v22DzgA6lawj4fW1sgrw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789086889; c=relaxed/simple; bh=l3SFLY42a4wVkfIv0DzkE/pK8Fj1ufSq4Al7YAlE/7U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lQzsozpyou7HHwQ52JrTp+5UwbySrMUgISS68tFzYEvQpZovT1iKDtqXBenPz/Mtzi929dPLHXMxR1DG2xkJpTqohHSp0gmOcPuljCUSxEHs6sYbQHWFs3Pel14w5ZNh+1SAnCTp8AS4w3oPMIKcJXv1c/Vw5LlRkfyqOXiZLe0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Zc12vkHS; arc=none smtp.client-ip=192.198.163.14 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Zc12vkHS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1789086887; x=1820622887; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=l3SFLY42a4wVkfIv0DzkE/pK8Fj1ufSq4Al7YAlE/7U=; b=Zc12vkHSgUMhmfKyV9OKNMNpL+nBhFodxT/kIAMQydn4dYqTMK6s1lKZ TRmIxszh8y+PUHoE8z7QnkI8dHMfXdGLs6sUcTpOeXVaYlx3ij4VAqtgZ aevMRfh39/nUN3p1x/6yG2o5DOpeo7pAXgTdFdZSxVZez23xKj48VXrhb NtFthBl0oSvSxbKp/SiRpIKd9eVI2HfnECLU5GdTODzLgm9rJO7ek/KAF jp4E/3zSDz0hVLdOsGG276eBuldGKR+1uAGmRKtDPDR5d+PLARIRm1A3n F2L/FiD5cf9cwO+2pmCWkfPJmCWx/OgdGtGnIz1Kotc8tE20Bi8V0PGA6 g==; X-CSE-ConnectionGUID: fA+n7BL5RW+Lt9PM+WFv8w== X-CSE-MsgGUID: 7YTqO3x4R+6hJ9qQ5FTK9Q== X-IronPort-AV: E=McAfee;i="6800,10657,11901"; a="89564690" X-IronPort-AV: E=Sophos;i="6.27,96,1787036400"; d="scan'208";a="89564690" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Sep 2026 17:34:43 -0700 X-CSE-ConnectionGUID: RcyploCbTPO5iyti05BZZA== X-CSE-MsgGUID: QJC01fIOT0uGEnWoIx4/FQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,96,1787036400"; d="scan'208";a="272291051" Received: from anguy11-upstream.jf.intel.com ([10.166.9.133]) by orviesa009.jf.intel.com with ESMTP; 10 Sep 2026 17:34:44 -0700 From: Tony Nguyen To: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, andrew+netdev@lunn.ch, netdev@vger.kernel.org Cc: Karol Kolacinski , jacob.e.keller@intel.com, maciej.machnikowski@intel.com, przemyslaw.korba@intel.com, grzegorz.nitka@intel.com, sergey.temerkhanov@intel.com, arkadiusz.kubalewski@intel.com, poros@redhat.com, richardcochran@gmail.com, horms@kernel.org, Aleksandr Loktionov , Alexander Nowlin Subject: [PATCH net 04/15] ice: E822: keep Tx timestamps disabled during offset calibration Date: Thu, 10 Sep 2026 17:34:13 -0700 Message-ID: <20260911003430.3386340-5-anthony.l.nguyen@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20260911003430.3386340-1-anthony.l.nguyen@intel.com> References: <20260911003430.3386340-1-anthony.l.nguyen@intel.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Karol Kolacinski Do not clear the tx.calibrating flag immediately after starting the PHY timer in ice_ptp_port_phy_restart(). Instead, keep Tx timestamps disabled until the offset verification work (ice_ptp_wait_for_offsets) has confirmed that both Tx and Rx PHY offsets are properly configured. Previously, tx.calibrating was set to true, then immediately back to false right after ice_start_phy_timer_e82x() returned. This allowed Tx timestamp requests to be served during the window where offset verification was still pending. Timestamps produced during this window use uncalibrated PHY offsets and can produce incorrect values. When ptp4l receives incorrect timestamps, it may reject them and wait for the next sync interval (typically 1-2 seconds), compounding delays during link cycling. This contributes to the time transmitter port becoming unresponsive after repeated link down/up cycles. Move the tx.calibrating = false to ice_ptp_wait_for_offsets(), after both Tx and Rx offset configuration has completed successfully. This ensures that Tx timestamps are only reported with properly calibrated PHY offsets. If ice_start_phy_timer_e82x() fails, do not restore calibrating to false. The device is in a state where timestamps cannot succeed properly anyways. A dev_err message is already logged on failure to start the timer at the end of the function. Log a debug message while offset calibration is still pending, including the specific Tx/Rx error codes to aid debugging stalled calibration. This path is expected on every routine link-up: ov_work is first queued with no delay and the vernier offset cannot be computed until at least one packet has been transmitted, so the first several invocations normally land here. Use dev_dbg() rather than a rate-limited warning to avoid emitting KERN_WARNING on every link-up during normal operation. Log a debug message when calibration completes successfully. Fixes: 3a7496234d17 ("ice: implement basic E822 PTP support") Signed-off-by: Karol Kolacinski Reviewed-by: Aleksandr Loktionov Signed-off-by: Arkadiusz Kubalewski Signed-off-by: Przemyslaw Korba Tested-by: Alexander Nowlin Signed-off-by: Tony Nguyen --- drivers/net/ethernet/intel/ice/ice_ptp.c | 30 ++++++++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c index 68537705e839..d018f02f700d 100644 --- a/drivers/net/ethernet/intel/ice/ice_ptp.c +++ b/drivers/net/ethernet/intel/ice/ice_ptp.c @@ -1156,6 +1156,7 @@ static int ice_ptp_check_tx_fifo(struct ice_ptp_port *port) static void ice_ptp_wait_for_offsets(struct kthread_work *work) { struct ice_ptp_port *port; + unsigned long flags; struct ice_pf *pf; struct ice_hw *hw; int tx_err; @@ -1178,12 +1179,28 @@ static void ice_ptp_wait_for_offsets(struct kthread_work *work) tx_err = ice_phy_cfg_tx_offset_e82x(hw, port->port_num); rx_err = ice_phy_cfg_rx_offset_e82x(hw, port->port_num); if (tx_err || rx_err) { - /* Tx and/or Rx offset not yet configured, try again later */ + /* Tx and/or Rx offset not yet configured, try again later. + * This is expected during normal link-up: the vernier offset + * calibration cannot complete until at least one packet has + * been transmitted, so the first retries routinely land here. + */ + dev_dbg(ice_pf_to_dev(pf), + "PTP offset not yet valid for port %u (tx_err=%d rx_err=%d)\n", + port->port_num, tx_err, rx_err); kthread_queue_delayed_work(pf->ptp.kworker, &port->ov_work, msecs_to_jiffies(100)); return; } + + /* Tx and Rx offsets are now configured, enable Tx timestamps */ + spin_lock_irqsave(&port->tx.lock, flags); + port->tx.calibrating = false; + spin_unlock_irqrestore(&port->tx.lock, flags); + + dev_dbg(ice_pf_to_dev(pf), + "PTP offset valid for port %u, Tx timestamps enabled\n", + port->port_num); } /** @@ -1269,10 +1286,13 @@ ice_ptp_port_phy_restart(struct ice_ptp_port *ptp_port) if (err) break; - /* Enable Tx timestamps right away */ - spin_lock_irqsave(&ptp_port->tx.lock, flags); - ptp_port->tx.calibrating = false; - spin_unlock_irqrestore(&ptp_port->tx.lock, flags); + /* Do not clear calibrating flag here. Tx timestamps remain + * disabled until ice_ptp_wait_for_offsets() has verified + * that the Tx and Rx offset calibration has completed. + * Clearing it here would allow Tx timestamps to be reported + * before the PHY offset registers are configured, leading + * to incorrect timestamp values. + */ kthread_queue_delayed_work(pf->ptp.kworker, &ptp_port->ov_work, 0); -- 2.47.1