Commit ece9ab2a authored Jan 12, 2021 by Jakub Kicinski

Merge branch 'bnxt_en-bug-fixes'

Michael Chan says:

====================
bnxt_en: Bug fixes.

This series has 2 fixes.  The first one fixes a resource accounting error
with the RDMA driver loaded and the second one fixes the firmware
flashing sequence after defragmentation.
====================

Link: https://lore.kernel.org/r/1610357200-30755-1-git-send-email-michael.chan@broadcom.com


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

parents 2284bbd0 68748775

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -2532,7 +2532,7 @@ int bnxt_flash_package_from_fw_obj(struct net_device *dev, const struct firmware

		if (rc && ((struct hwrm_err_output *)&resp)->cmd_err ==
		NVM_INSTALL_UPDATE_CMD_ERR_CODE_FRAG_ERR) {
		install.flags \|=
		install.flags =
		cpu_to_le16(NVM_INSTALL_UPDATE_REQ_FLAGS_ALLOWED_TO_DEFRAG);

		rc = _hwrm_send_message_silent(bp, &install,
		@@ -2546,6 +2546,7 @@ int bnxt_flash_package_from_fw_obj(struct net_device *dev, const struct firmware
		* UPDATE directory and try the flash again
		*/
		defrag_attempted = true;
		install.flags = 0;
		rc = __bnxt_flash_nvram(bp->dev,
		BNX_DIR_TYPE_UPDATE,
		BNX_DIR_ORDINAL_FIRST,

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

+6 −2

Original line number	Diff line number	Diff line
		@@ -222,8 +222,12 @@ int bnxt_get_ulp_msix_base(struct bnxt *bp)

		int bnxt_get_ulp_stat_ctxs(struct bnxt *bp)
		{
		if (bnxt_ulp_registered(bp->edev, BNXT_ROCE_ULP))
		if (bnxt_ulp_registered(bp->edev, BNXT_ROCE_ULP)) {
		struct bnxt_en_dev *edev = bp->edev;

		if (edev->ulp_tbl[BNXT_ROCE_ULP].msix_requested)
		return BNXT_MIN_ROCE_STAT_CTXS;
		}

		return 0;
		}