Commit c2d20a38 authored by Kashyap Desai's avatar Kashyap Desai Committed by David S. Miller
Browse files

bnxt_en: delay pci_alloc_irq_vectors() in the AER path 



This patch is similar to the last patch to delay the
pci_alloc_irq_vectors() call in the AER path until after calling
bnxt_reserve_rings().  bnxt_reserve_rings() needs to properly map
the MSIX table first before we call pci_alloc_irq_vectors() which
may immediately write to the MSIX table in some architectures.

Move the bnxt_init_int_mode() call from bnxt_io_slot_reset() to
bnxt_io_resume() after calling bnxt_reserve_rings().

With this change, the AER path may call bnxt_open() ->
bnxt_hwrm_if_change() with bp->irq_tbl set to NULL.  bp->irq_tbl is
cleared when we call bnxt_clear_int_mode() in bnxt_io_slot_reset().
So we cannot use !bp->irq_tbl to detect aborted FW reset.  Add a
new BNXT_FW_RESET_STATE_ABORT to detect aborted FW reset in
bnxt_hwrm_if_change().

Signed-off-by: default avatarKashyap Desai <kashyap.desai@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1ae04e48

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

+11 −6
Original line number Diff line number Diff line
@@ -12325,12 +12325,15 @@ static int bnxt_hwrm_if_change(struct bnxt *bp, bool up) 
{

	struct hwrm_func_drv_if_change_output *resp;

	struct hwrm_func_drv_if_change_input *req;

	bool fw_reset = !bp->irq_tbl;

	bool resc_reinit = false;

	bool caps_change = false;

	int rc, retry = 0;

	bool fw_reset;

	u32 flags = 0;



	fw_reset = (bp->fw_reset_state == BNXT_FW_RESET_STATE_ABORT);

	bp->fw_reset_state = 0;



	if (!(bp->fw_cap & BNXT_FW_CAP_IF_CHANGE))

		return 0;
@@ -14833,7 +14836,7 @@ static void bnxt_fw_reset_abort(struct bnxt *bp, int rc) 
	clear_bit(BNXT_STATE_IN_FW_RESET, &bp->state);

	if (bp->fw_reset_state != BNXT_FW_RESET_STATE_POLL_VF)

		bnxt_dl_health_fw_status_update(bp, false);

	bp->fw_reset_state = 0;

	bp->fw_reset_state = BNXT_FW_RESET_STATE_ABORT;

	netif_close(bp->dev);

}
@@ -16931,10 +16934,9 @@ static pci_ers_result_t bnxt_io_slot_reset(struct pci_dev *pdev) 
		if (!err)

			result = PCI_ERS_RESULT_RECOVERED;



		/* IRQ will be initialized later in bnxt_io_resume */

		bnxt_ulp_irq_stop(bp);

		bnxt_clear_int_mode(bp);

		err = bnxt_init_int_mode(bp);

		bnxt_ulp_irq_restart(bp, err);

	}



reset_exit:
@@ -16963,10 +16965,13 @@ static void bnxt_io_resume(struct pci_dev *pdev) 


	err = bnxt_hwrm_func_qcaps(bp);

	if (!err) {

		if (netif_running(netdev))

		if (netif_running(netdev)) {

			err = bnxt_open(netdev);

		else

		} else {

			err = bnxt_reserve_rings(bp, true);

			if (!err)

				err = bnxt_init_int_mode(bp);

		}

	}



	if (!err)

drivers/net/ethernet/broadcom/bnxt/bnxt.h

+1 −0
Original line number Diff line number Diff line
@@ -2614,6 +2614,7 @@ struct bnxt { 
#define BNXT_FW_RESET_STATE_POLL_FW	4

#define BNXT_FW_RESET_STATE_OPENING	5

#define BNXT_FW_RESET_STATE_POLL_FW_DOWN	6

#define BNXT_FW_RESET_STATE_ABORT	7



	u16			fw_reset_min_dsecs;

#define BNXT_DFLT_FW_RST_MIN_DSECS	20