Skip to content

Commit 9ab7a70

Browse files
Shravya KNdavem330
authored andcommitted
bnxt_en: Fix error handling path in bnxt_init_chip()
WARN_ON() is triggered in __flush_work() if bnxt_init_chip() fails because we call cancel_work_sync() on dim work that has not been initialized. WARNING: CPU: 37 PID: 5223 at kernel/workqueue.c:4201 __flush_work.isra.0+0x212/0x230 The driver relies on the BNXT_STATE_NAPI_DISABLED bit to check if dim work has already been cancelled. But in the bnxt_open() path, BNXT_STATE_NAPI_DISABLED is not set and this causes the error path to think that it needs to cancel the uninitalized dim work. Fix it by setting BNXT_STATE_NAPI_DISABLED during initialization. The bit will be cleared when we enable NAPI and initialize dim work. Fixes: 4045296 ("bnxt_en: Fix DIM shutdown") Suggested-by: Somnath Kotur <[email protected]> Reviewed-by: Somnath Kotur <[email protected]> Signed-off-by: Shravya KN <[email protected]> Signed-off-by: Michael Chan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent b936a9b commit 9ab7a70

File tree

1 file changed

+3
-0
lines changed
  • drivers/net/ethernet/broadcom/bnxt

1 file changed

+3
-0
lines changed

drivers/net/ethernet/broadcom/bnxt/bnxt.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11602,6 +11602,9 @@ static void bnxt_init_napi(struct bnxt *bp)
1160211602
poll_fn = bnxt_poll_p5;
1160311603
else if (BNXT_CHIP_TYPE_NITRO_A0(bp))
1160411604
cp_nr_rings--;
11605+
11606+
set_bit(BNXT_STATE_NAPI_DISABLED, &bp->state);
11607+
1160511608
for (i = 0; i < cp_nr_rings; i++) {
1160611609
bnapi = bp->bnapi[i];
1160711610
netif_napi_add_config_locked(bp->dev, &bnapi->napi, poll_fn,

0 commit comments

Comments
 (0)