diff options
| author | Michael Chan <michael.chan@broadcom.com> | 2021-07-18 21:36:28 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-07-19 17:25:44 +0200 |
| commit | 6cd657cb3ee6f4de57e635b126ffbe0e51d00f1a (patch) | |
| tree | fc51461f10d0f102e18ecd34a2c207a5c2897fd0 | |
| parent | bnxt_en: Refresh RoCE capabilities in bnxt_ulp_probe() (diff) | |
| download | linux-6cd657cb3ee6f4de57e635b126ffbe0e51d00f1a.tar.xz linux-6cd657cb3ee6f4de57e635b126ffbe0e51d00f1a.zip | |
bnxt_en: Add missing check for BNXT_STATE_ABORT_ERR in bnxt_fw_rset_task()
In the BNXT_FW_RESET_STATE_POLL_VF state in bnxt_fw_reset_task() after all
VFs have unregistered, we need to check for BNXT_STATE_ABORT_ERR after
we acquire the rtnl_lock. If the flag is set, we need to abort.
Fixes: 230d1f0de754 ("bnxt_en: Handle firmware reset.")
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index fdfb75a1608d..39908a3d9460 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -11992,6 +11992,10 @@ static void bnxt_fw_reset_task(struct work_struct *work) } bp->fw_reset_timestamp = jiffies; rtnl_lock(); + if (test_bit(BNXT_STATE_ABORT_ERR, &bp->state)) { + rtnl_unlock(); + goto fw_reset_abort; + } bnxt_fw_reset_close(bp); if (bp->fw_cap & BNXT_FW_CAP_ERR_RECOVER_RELOAD) { bp->fw_reset_state = BNXT_FW_RESET_STATE_POLL_FW_DOWN; |