| Message ID | 20210801102340.19660-1-smalin@marvell.com |
|---|---|
| State | New |
| Headers | show |
| Series | qed: Avoid db_recovery during recovery | expand |
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): On Sun, 1 Aug 2021 13:23:40 +0300 you wrote: > Avoid calling the qed doorbell recovery - qed_db_rec_handler() > during device recovery. > > Signed-off-by: Ariel Elior <aelior@marvell.com> > Signed-off-by: Shai Malin <smalin@marvell.com> > --- > drivers/net/ethernet/qlogic/qed/qed_main.c | 5 +++++ > 1 file changed, 5 insertions(+) Here is the summary with links: - qed: Avoid db_recovery during recovery https://git.kernel.org/netdev/net-next/c/995c3d49bd71 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c index aa48b1b7eddc..6871d892eabf 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_main.c +++ b/drivers/net/ethernet/qlogic/qed/qed_main.c @@ -1215,6 +1215,10 @@ static void qed_slowpath_task(struct work_struct *work) if (test_and_clear_bit(QED_SLOWPATH_PERIODIC_DB_REC, &hwfn->slowpath_task_flags)) { + /* skip qed_db_rec_handler during recovery/unload */ + if (hwfn->cdev->recov_in_prog || !hwfn->slowpath_wq_active) + goto out; + qed_db_rec_handler(hwfn, ptt); if (hwfn->periodic_db_rec_count--) qed_slowpath_delayed_work(hwfn, @@ -1222,6 +1226,7 @@ static void qed_slowpath_task(struct work_struct *work) QED_PERIODIC_DB_REC_INTERVAL); } +out: qed_ptt_release(hwfn, ptt); }