From: Vikas Gupta <vikas.gupta@broadcom.com>

Date: Thu, 3 Nov 2022 19:33:25 -0400

Subject: bnxt_en: fix the handling of PCIE-AER

Patch-mainline: v6.1-rc5

Git-commit: 0cf736a18a1e804037839bd8df9e36f0efdb8745

References: git-fixes

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: fb1e6e562b37 ("bnxt_en: Fix AER recovery.")

Signed-off-by: Vikas Gupta <vikas.gupta@broadcom.com>

Signed-off-by: Michael Chan <michael.chan@broadcom.com>

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>

---

 drivers/net/ethernet/broadcom/bnxt/bnxt.c      |   29 ++++++++++++++++++++++++-

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

 drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.c |    3 +-

 3 files changed, 31 insertions(+), 2 deletions(-)

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

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

@@ -13687,7 +13687,9 @@ static pci_ers_result_t bnxt_io_slot_res

 	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");

@@ -13715,11 +13717,36 @@ static pci_ers_result_t bnxt_io_slot_res

 		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;

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

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

@@ -1615,6 +1615,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,

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

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

@@ -462,7 +462,8 @@ static int __hwrm_send(struct bnxt *bp,

 		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;