Commit 0cf736a1 authored by Vikas Gupta's avatar Vikas Gupta Committed by Jakub Kicinski
Browse files

bnxt_en: fix the handling of PCIE-AER 



Fix the sequence required for PCIE-AER. While slot reset occurs, firmware
might not be ready and the driver needs to check for its recovery.  We
also need to remap the health registers for some chips and clear the
resource reservations.  The resources will be allocated again during
bnxt_io_resume().

Fixes: fb1e6e56 ("bnxt_en: Fix AER recovery.")
Signed-off-by: default avatarVikas Gupta <vikas.gupta@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent b4c66425

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

+28 −1
Original line number Diff line number Diff line
@@ -13922,7 +13922,9 @@ static pci_ers_result_t bnxt_io_slot_reset(struct pci_dev *pdev) 
	pci_ers_result_t result = PCI_ERS_RESULT_DISCONNECT;

	struct net_device *netdev = pci_get_drvdata(pdev);

	struct bnxt *bp = netdev_priv(netdev);

	int err = 0, off;

	int retry = 0;

	int err = 0;

	int off;



	netdev_info(bp->dev, "PCI Slot Reset\n");
@@ -13950,11 +13952,36 @@ static pci_ers_result_t bnxt_io_slot_reset(struct pci_dev *pdev) 
		pci_restore_state(pdev);

		pci_save_state(pdev);



		bnxt_inv_fw_health_reg(bp);

		bnxt_try_map_fw_health_reg(bp);



		/* In some PCIe AER scenarios, firmware may take up to

		 * 10 seconds to become ready in the worst case.

		 */

		do {

			err = bnxt_try_recover_fw(bp);

			if (!err)

				break;

			retry++;

		} while (retry < BNXT_FW_SLOT_RESET_RETRY);



		if (err) {

			dev_err(&pdev->dev, "Firmware not ready\n");

			goto reset_exit;

		}



		err = bnxt_hwrm_func_reset(bp);

		if (!err)

			result = PCI_ERS_RESULT_RECOVERED;



		bnxt_ulp_irq_stop(bp);

		bnxt_clear_int_mode(bp);

		err = bnxt_init_int_mode(bp);

		bnxt_ulp_irq_restart(bp, err);

	}



reset_exit:

	bnxt_clear_reservations(bp, true);

	rtnl_unlock();



	return result;

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

+1 −0
Original line number Diff line number Diff line
@@ -1621,6 +1621,7 @@ struct bnxt_fw_health { 


#define BNXT_FW_RETRY			5

#define BNXT_FW_IF_RETRY		10

#define BNXT_FW_SLOT_RESET_RETRY	4



enum board_idx {

	BCM57301,

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

+2 −1
Original line number Diff line number Diff line
@@ -476,7 +476,8 @@ static int __hwrm_send(struct bnxt *bp, struct bnxt_hwrm_ctx *ctx) 
		memset(ctx->resp, 0, PAGE_SIZE);



	req_type = le16_to_cpu(ctx->req->req_type);

	if (BNXT_NO_FW_ACCESS(bp) && req_type != HWRM_FUNC_RESET) {

	if (BNXT_NO_FW_ACCESS(bp) &&

	    (req_type != HWRM_FUNC_RESET && req_type != HWRM_VER_GET)) {

		netdev_dbg(bp->dev, "hwrm req_type 0x%x skipped, FW channel down\n",

			   req_type);

		goto exit;