patch 'net/igc/base: fix deadlock when writing i225 register' has been queued to stable release 23.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
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=c18541adee3de649ebd672acc4166fcb499ab608

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From c18541adee3de649ebd672acc4166fcb499ab608 Mon Sep 17 00:00:00 2001
From: Dima Ruinskiy <dima.ruinskiy at intel.com>
Date: Thu, 6 Feb 2025 16:08:24 +0000
Subject: [PATCH] net/igc/base: fix deadlock when writing i225 register
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit f05363dceac78694638f86a8af1acd173ca9e3e0 ]

Currently, when writing GPY PHY registers, semaphore is acquired before
writing. However, if writing fails, semaphore is not released, causing a
deadlock down the line. Fix the issue by removing the premature return.

Fixes: 8cb7c57d9b3c ("net/igc: support device initialization")

Signed-off-by: Dima Ruinskiy <dima.ruinskiy at intel.com>
Signed-off-by: Anatoly Burakov <anatoly.burakov at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 .mailmap                       | 1 +
 drivers/net/igc/base/igc_phy.c | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.mailmap b/.mailmap
index 6984cb9940..acf910ab3b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -337,6 +337,7 @@ Dheemanth Mallikarjun <dheemanthm at vmware.com>
 Diana Wang <na.wang at corigine.com>
 Didier Pallard <didier.pallard at 6wind.com>
 Dilshod Urazov <dilshod.urazov at oktetlabs.ru>
+Dima Ruinskiy <dima.ruinskiy at intel.com>
 Ding Zhi <zhi.ding at 6wind.com>
 Diogo Behrens <diogo.behrens at huawei.com>
 Dirk-Holger Lenz <dirk.lenz at ng4t.com>
diff --git a/drivers/net/igc/base/igc_phy.c b/drivers/net/igc/base/igc_phy.c
index 2906bae21a..ddc2b6ecc1 100644
--- a/drivers/net/igc/base/igc_phy.c
+++ b/drivers/net/igc/base/igc_phy.c
@@ -4148,8 +4148,6 @@ s32 igc_write_phy_reg_gpy(struct igc_hw *hw, u32 offset, u16 data)
 		if (ret_val)
 			return ret_val;
 		ret_val = igc_write_phy_reg_mdic(hw, offset, data);
-		if (ret_val)
-			return ret_val;
 		hw->phy.ops.release(hw);
 	} else {
 		ret_val = igc_write_xmdio_reg(hw, (u16)offset, dev_addr,
@@ -4182,8 +4180,6 @@ s32 igc_read_phy_reg_gpy(struct igc_hw *hw, u32 offset, u16 *data)
 		if (ret_val)
 			return ret_val;
 		ret_val = igc_read_phy_reg_mdic(hw, offset, data);
-		if (ret_val)
-			return ret_val;
 		hw->phy.ops.release(hw);
 	} else {
 		ret_val = igc_read_xmdio_reg(hw, (u16)offset, dev_addr,
--
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-02-18 19:39:02.350614651 +0800
+++ 0045-net-igc-base-fix-deadlock-when-writing-i225-register.patch	2025-02-18 19:39:00.618244049 +0800
@@ -1 +1 @@
-From f05363dceac78694638f86a8af1acd173ca9e3e0 Mon Sep 17 00:00:00 2001
+From c18541adee3de649ebd672acc4166fcb499ab608 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit f05363dceac78694638f86a8af1acd173ca9e3e0 ]
@@ -11 +13,0 @@
-Cc: stable at dpdk.org
@@ -17,2 +19,2 @@
- .mailmap                             | 1 +
- drivers/net/intel/igc/base/igc_phy.c | 4 ----
+ .mailmap                       | 1 +
+ drivers/net/igc/base/igc_phy.c | 4 ----
@@ -22 +24 @@
-index dc3dd9e5a2..9ea6bd1df3 100644
+index 6984cb9940..acf910ab3b 100644
@@ -25 +27 @@
-@@ -358,6 +358,7 @@ Dhruv Tripathi <dhruv.tripathi at arm.com>
+@@ -337,6 +337,7 @@ Dheemanth Mallikarjun <dheemanthm at vmware.com>
@@ -33 +35 @@
-diff --git a/drivers/net/intel/igc/base/igc_phy.c b/drivers/net/intel/igc/base/igc_phy.c
+diff --git a/drivers/net/igc/base/igc_phy.c b/drivers/net/igc/base/igc_phy.c
@@ -35,2 +37,2 @@
---- a/drivers/net/intel/igc/base/igc_phy.c
-+++ b/drivers/net/intel/igc/base/igc_phy.c
+--- a/drivers/net/igc/base/igc_phy.c
++++ b/drivers/net/igc/base/igc_phy.c