patch 'net/ice/base: fix adjust timer programming for E830' has been queued to stable release 24.11.5

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 24.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/21/26. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/84189016ddaf0ec8365b236e56cae37914e2f405

Thanks.

Luca Boccassi

---
>From 84189016ddaf0ec8365b236e56cae37914e2f405 Mon Sep 17 00:00:00 2001
From: Grzegorz Nitka <grzegorz.nitka at intel.com>
Date: Tue, 10 Mar 2026 05:52:18 -0400
Subject: [PATCH] net/ice/base: fix adjust timer programming for E830

[ upstream commit f9767f70cb73429739954491d532951de1ba0165 ]

Fix incorrect 'adjust the timer' programming sequence for E830 devices
series. Only shadow registers GLTSYN_SHADJ were programmed in the current
implementation. According to the specification [1], write to command
GLTSYN_CMD register is also required with CMD field set to "Adjust the
Time" value, for the timer adjustment to take the effect.

The flow was broken for the adjustment less than S32_MAX/MIN range
(around +/- 2 seconds). For bigger adjustment, non-atomic programming
flow is used, involving set timer programming. Non-atomic flow is
implemented correctly.

Fixes: 881169950d80 ("net/ice/base: implement initial PTP support for E830")

Signed-off-by: Soumyadeep Hore <soumyadeep.hore at intel.com>
Signed-off-by: Grzegorz Nitka <grzegorz.nitka at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 drivers/net/ice/base/ice_ptp_hw.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ice/base/ice_ptp_hw.c b/drivers/net/ice/base/ice_ptp_hw.c
index 1e92e5ff21..2970f5d7f5 100644
--- a/drivers/net/ice/base/ice_ptp_hw.c
+++ b/drivers/net/ice/base/ice_ptp_hw.c
@@ -6086,7 +6086,7 @@ int ice_ptp_write_incval_locked(struct ice_hw *hw, u64 incval,
  */
 int ice_ptp_adj_clock(struct ice_hw *hw, s32 adj, bool lock_sbq)
 {
-	int err;
+	int err = 0;
 	u8 tmr_idx;
 
 	tmr_idx = hw->func_caps.ts_func_info.tmr_index_owned;
@@ -6104,8 +6104,8 @@ int ice_ptp_adj_clock(struct ice_hw *hw, s32 adj, bool lock_sbq)
 		err = ice_ptp_prep_phy_adj_eth56g(hw, adj, lock_sbq);
 		break;
 	case ICE_PHY_E830:
-		/* E830 sync PHYs automatically after setting GLTSYN_SHADJ */
-		return 0;
+		/* E830 sync PHYs automatically after setting cmd register */
+		break;
 	case ICE_PHY_E810:
 		err = ice_ptp_prep_phy_adj_e810(hw, adj, lock_sbq);
 		break;
-- 
2.47.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2026-03-19 22:00:48.270163882 +0000
+++ 0012-net-ice-base-fix-adjust-timer-programming-for-E830.patch	2026-03-19 22:00:47.782359370 +0000
@@ -1 +1 @@
-From f9767f70cb73429739954491d532951de1ba0165 Mon Sep 17 00:00:00 2001
+From 84189016ddaf0ec8365b236e56cae37914e2f405 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f9767f70cb73429739954491d532951de1ba0165 ]
+
@@ -18 +19,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
- drivers/net/intel/ice/base/ice_ptp_hw.c | 6 +++---
+ drivers/net/ice/base/ice_ptp_hw.c | 6 +++---
@@ -27,5 +28,5 @@
-diff --git a/drivers/net/intel/ice/base/ice_ptp_hw.c b/drivers/net/intel/ice/base/ice_ptp_hw.c
-index 7d16965674..5688f969ce 100644
---- a/drivers/net/intel/ice/base/ice_ptp_hw.c
-+++ b/drivers/net/intel/ice/base/ice_ptp_hw.c
-@@ -6083,7 +6083,7 @@ int ice_ptp_write_incval_locked(struct ice_hw *hw, u64 incval,
+diff --git a/drivers/net/ice/base/ice_ptp_hw.c b/drivers/net/ice/base/ice_ptp_hw.c
+index 1e92e5ff21..2970f5d7f5 100644
+--- a/drivers/net/ice/base/ice_ptp_hw.c
++++ b/drivers/net/ice/base/ice_ptp_hw.c
+@@ -6086,7 +6086,7 @@ int ice_ptp_write_incval_locked(struct ice_hw *hw, u64 incval,
@@ -40 +41 @@
-@@ -6101,8 +6101,8 @@ int ice_ptp_adj_clock(struct ice_hw *hw, s32 adj, bool lock_sbq)
+@@ -6104,8 +6104,8 @@ int ice_ptp_adj_clock(struct ice_hw *hw, s32 adj, bool lock_sbq)