diff mbox series

[v1,22/24] net/e1000/base: fix reset for 82580

Message ID	bf6a15965c5777781966b9c11d61953a02c84278.1738858026.git.anatoly.burakov@intel.com (mailing list archive)
State	Accepted
Delegated to:	Bruce Richardson
Headers	From: Anatoly Burakov <anatoly.burakov@intel.com> To: dev@dpdk.org Subject: [PATCH v1 22/24] net/e1000/base: fix reset for 82580 Date: Thu, 6 Feb 2025 16:08:45 +0000 Message-ID: <bf6a15965c5777781966b9c11d61953a02c84278.1738858026.git.anatoly.burakov@intel.com> In-Reply-To: <cover.1738858026.git.anatoly.burakov@intel.com> References: <cover.1738328106.git.anatoly.burakov@intel.com> <cover.1738858026.git.anatoly.burakov@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: dev-bounces@dpdk.org
Series	Fixes for igc and e1000 \| [v1,00/24] Fixes for igc and e1000 [v1,01/24] net/igc/base: fix deadlock in i225 [v1,02/24] net/igc/base: fix infinite loop [v1,03/24] net/igc/base: fix bitwise op type mismatch [v1,04/24] net/igc/base: increase PHY power up delay [v1,05/24] net/igc/base: reset loop variable [v1,06/24] net/igc/base: fix LTR for i225 [v1,07/24] net/igc/base: fix typo in LTR calculation [v1,08/24] net/igc/base: fix unused value [v1,09/24] net/igc/base: fix semaphore timeout value [v1,10/24] net/igc/base: fix iterator type [v1,11/24] net/igc/base: fix MAC addr hash bit shift [v1,12/24] net/igc/base: fix data type in MAC hash [v1,13/24] net/igc/base: fix static analysis warning [v1,14/24] net/e1000/base: fix semaphore timeout value [v1,15/24] net/e1000/base: correct mPHY access logic [v1,16/24] net/e1000/base: fix iterator type [v1,17/24] net/e1000/base: fix MAC addr hash bit shift [v1,18/24] net/e1000/base: fix data type in MAC hash [v1,19/24] net/e1000/base: fix uninitialized variable usage [v1,20/24] net/e1000/base: fix static analysis warning [v1,21/24] net/e1000/base: fix static analysis warning [v1,22/24] net/e1000/base: fix reset for 82580 [v1,23/24] net/e1000/base: fix unchecked return [v1,24/24] net/e1000/base: skip MANC check for 82575

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

Burakov, Anatoly Feb. 6, 2025, 4:08 p.m. UTC

From: Barbara Skobiej <barbara.skobiej@intel.com>

Fix setting device reset status bit in e1000_reset_hw_82580() function
for 82580 by first reading the register value, and then setting the
device reset bit.

Fixes: af75078fece3 ("first public release")
Cc: stable@dpdk.org

Signed-off-by: Barbara Skobiej <barbara.skobiej@intel.com>
Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 drivers/net/intel/e1000/base/e1000_82575.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/drivers/net/intel/e1000/base/e1000_82575.c b/drivers/net/intel/e1000/base/e1000_82575.c
index 53900cf8f1..948c80f2fa 100644
--- a/drivers/net/intel/e1000/base/e1000_82575.c
+++ b/drivers/net/intel/e1000/base/e1000_82575.c
@@ -2280,7 +2280,7 @@  STATIC s32 e1000_reset_hw_82580(struct e1000_hw *hw)
 	s32 ret_val = E1000_SUCCESS;
 	/* BH SW mailbox bit in SW_FW_SYNC */
 	u16 swmbsw_mask = E1000_SW_SYNCH_MB;
-	u32 ctrl;
+	u32 ctrl, status;
 	bool global_device_reset = hw->dev_spec._82575.global_device_reset;
 
 	DEBUGFUNC("e1000_reset_hw_82580");
@@ -2345,7 +2345,8 @@  STATIC s32 e1000_reset_hw_82580(struct e1000_hw *hw)
 	}
 
 	/* clear global device reset status bit */
-	E1000_WRITE_REG(hw, E1000_STATUS, E1000_STAT_DEV_RST_SET);
+	status = E1000_READ_REG(hw, E1000_STATUS);
+	E1000_WRITE_REG(hw, E1000_STATUS, status | E1000_STAT_DEV_RST_SET);
 
 	/* Clear any pending interrupt events. */
 	E1000_WRITE_REG(hw, E1000_IMC, 0xffffffff);