[PATCH net] iavf: do not override the adapter state in the watchdog task (again)

Subsystems: intel ethernet drivers, networking drivers, the rest

STALE1757d

2 messages, 2 authors, 2021-12-13 · open the first message on its own page

[PATCH net] iavf: do not override the adapter state in the watchdog task (again)

From: Stefan Assmann <hidden>
Date: 2021-12-01 08:15:14

The watchdog task incorrectly changes the state to __IAVF_RESETTING,
instead of letting the reset task take care of that. This was already
resolved by
22c8fd71d3a5 iavf: do not override the adapter state in the watchdog task
but the problem was reintroduced by the recent code refactoring in
45eebd62999d.

Fixes: 45eebd62999d ("iavf: Refactor iavf state machine tracking")

Signed-off-by: Stefan Assmann <redacted>
---
 drivers/net/ethernet/intel/iavf/iavf_main.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c
index 14934a7a13ef..360dfb7594cb 100644
--- a/drivers/net/ethernet/intel/iavf/iavf_main.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c

@@ -2085,7 +2085,6 @@ static void iavf_watchdog_task(struct work_struct *work)
 	/* check for hw reset */
 	reg_val = rd32(hw, IAVF_VF_ARQLEN1) & IAVF_VF_ARQLEN1_ARQENABLE_MASK;
 	if (!reg_val) {
-		iavf_change_state(adapter, __IAVF_RESETTING);
 		adapter->flags |= IAVF_FLAG_RESET_PENDING;
 		adapter->aq_required = 0;
 		adapter->current_op = VIRTCHNL_OP_UNKNOWN;

-- 
2.31.1

RE: [Intel-wired-lan] [PATCH net] iavf: do not override the adapter state in the watchdog task (again)

From: Jankowski, Konrad0 <hidden>
Date: 2021-12-13 13:28:18

quoted hunk

-----Original Message-----
From: Intel-wired-lan <redacted> On Behalf Of
Stefan Assmann
Sent: środa, 1 grudnia 2021 09:15
To: intel-wired-lan@lists.osuosl.org
Cc: netdev@vger.kernel.org; sassmann@kpanic.de; Palczewski, Mateusz
[off-list ref]
Subject: [Intel-wired-lan] [PATCH net] iavf: do not override the adapter state
in the watchdog task (again)

The watchdog task incorrectly changes the state to __IAVF_RESETTING,
instead of letting the reset task take care of that. This was already resolved
by
22c8fd71d3a5 iavf: do not override the adapter state in the watchdog task
but the problem was reintroduced by the recent code refactoring in
45eebd62999d.

Fixes: 45eebd62999d ("iavf: Refactor iavf state machine tracking")

Signed-off-by: Stefan Assmann <redacted>
---
 drivers/net/ethernet/intel/iavf/iavf_main.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c

b/drivers/net/ethernet/intel/iavf/iavf_main.c
index 14934a7a13ef..360dfb7594cb 100644

--- a/drivers/net/ethernet/intel/iavf/iavf_main.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c

@@ -2085,7 +2085,6 @@ static void iavf_watchdog_task(struct work_struct

Tested-by: Konrad Jankowski <redacted>

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help