Commit 2924ad95 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

bnxt_en: Set BNXT_STATE_FW_RESET_DET flag earlier for the RDMA driver. 



During ifup, if the driver detects that firmware has gone through a
reset, it will go through a re-probe sequence.  If the RDMA driver is
loaded, the re-probe sequence includes calling the RDMA driver to stop.
We need to set the BNXT_STATE_FW_RESET_DET flag earlier so that it is
visible to the RDMA driver.  The RDMA driver's stop sequence is
different if firmware has gone through a reset.

Reviewed-by: default avatarPavan Chebbi <pavan.chebbi@broadcom.com>
Reviewed-by: default avatarP B S Naresh Kumar <nareshkumar.pbs@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 15a7deb8

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

+3 −1
Original line number Diff line number Diff line
@@ -9611,6 +9611,7 @@ static int bnxt_hwrm_if_change(struct bnxt *bp, bool up) 
	}

	if (resc_reinit || fw_reset) {

		if (fw_reset) {

			set_bit(BNXT_STATE_FW_RESET_DET, &bp->state);

			if (!test_bit(BNXT_STATE_IN_FW_RESET, &bp->state))

				bnxt_ulp_stop(bp);

			bnxt_free_ctx_mem(bp);
@@ -9619,16 +9620,17 @@ static int bnxt_hwrm_if_change(struct bnxt *bp, bool up) 
			bnxt_dcb_free(bp);

			rc = bnxt_fw_init_one(bp);

			if (rc) {

				clear_bit(BNXT_STATE_FW_RESET_DET, &bp->state);

				set_bit(BNXT_STATE_ABORT_ERR, &bp->state);

				return rc;

			}

			bnxt_clear_int_mode(bp);

			rc = bnxt_init_int_mode(bp);

			if (rc) {

				clear_bit(BNXT_STATE_FW_RESET_DET, &bp->state);

				netdev_err(bp->dev, "init int mode failed\n");

				return rc;

			}

			set_bit(BNXT_STATE_FW_RESET_DET, &bp->state);

		}

		if (BNXT_NEW_RM(bp)) {

			struct bnxt_hw_resc *hw_resc = &bp->hw_resc;