patch 'net/igc: fix timesync disable' has been queued to stable release 23.11.1

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 04/15/24. 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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=0291a1f49edd9b9cecdc41f2989200a7e061d9c9

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 0291a1f49edd9b9cecdc41f2989200a7e061d9c9 Mon Sep 17 00:00:00 2001
From: Wenwu Ma <wenwux.ma at intel.com>
Date: Fri, 15 Mar 2024 09:06:31 +0800
Subject: [PATCH] net/igc: fix timesync disable
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 6e4b297c22baad9c347fbf00dc7589a0a077dd00 ]

When disabling timesync, we should clear the IGC_RXPBS_CFG_TS_EN bit
of IGC_RXPBS, the patch fixes this.

Fixes: 4f6fbbf6f17d ("net/igc: support IEEE 1588 PTP")

Signed-off-by: Wenwu Ma <wenwux.ma at intel.com>
Tested-by: Tingting Liao <tingtingx.liao at intel.com>
---
 .mailmap                     | 1 +
 drivers/net/igc/igc_ethdev.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 69ef5145a9..24c4ad3b85 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1434,6 +1434,7 @@ Timothy Redaelli <tredaelli at redhat.com>
 Tim Shearer <tim.shearer at overturenetworks.com>
 Ting-Kai Ku <ting-kai.ku at intel.com>
 Ting Xu <ting.xu at intel.com>
+Tingting Liao <tingtingx.liao at intel.com>
 Tiwei Bie <tiwei.bie at intel.com> <btw at mail.ustc.edu.cn>
 Todd Fujinaka <todd.fujinaka at intel.com>
 Tomasz Cel <tomaszx.cel at intel.com>
diff --git a/drivers/net/igc/igc_ethdev.c b/drivers/net/igc/igc_ethdev.c
index 58c4f80927..690736b6d1 100644
--- a/drivers/net/igc/igc_ethdev.c
+++ b/drivers/net/igc/igc_ethdev.c
@@ -2853,7 +2853,7 @@ eth_igc_timesync_disable(struct rte_eth_dev *dev)
 	IGC_WRITE_REG(hw, IGC_TSYNCRXCTL, 0);
 
 	val = IGC_READ_REG(hw, IGC_RXPBS);
-	val &= IGC_RXPBS_CFG_TS_EN;
+	val &= ~IGC_RXPBS_CFG_TS_EN;
 	IGC_WRITE_REG(hw, IGC_RXPBS, val);
 
 	val = IGC_READ_REG(hw, IGC_SRRCTL(0));
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-13 20:43:08.586245344 +0800
+++ 0116-net-igc-fix-timesync-disable.patch	2024-04-13 20:43:05.147753736 +0800
@@ -1 +1 @@
-From 6e4b297c22baad9c347fbf00dc7589a0a077dd00 Mon Sep 17 00:00:00 2001
+From 0291a1f49edd9b9cecdc41f2989200a7e061d9c9 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 6e4b297c22baad9c347fbf00dc7589a0a077dd00 ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +22 @@
-index 491af1f6ff..f53fb59513 100644
+index 69ef5145a9..24c4ad3b85 100644
@@ -23 +25 @@
-@@ -1446,6 +1446,7 @@ Timothy Redaelli <tredaelli at redhat.com>
+@@ -1434,6 +1434,7 @@ Timothy Redaelli <tredaelli at redhat.com>
@@ -32 +34 @@
-index 08e9e16ae5..87d7f7caa0 100644
+index 58c4f80927..690736b6d1 100644
@@ -35 +37 @@
-@@ -2855,7 +2855,7 @@ eth_igc_timesync_disable(struct rte_eth_dev *dev)
+@@ -2853,7 +2853,7 @@ eth_igc_timesync_disable(struct rte_eth_dev *dev)