Commit cb4d1d62 authored by Kshitij Soni's avatar Kshitij Soni Committed by David S. Miller
Browse files

bnxt_en: Retry failed NVM_INSTALL_UPDATE with defragmentation flag. 



If the HWRM_NVM_INSTALL_UPDATE command fails with the error code
NVM_INSTALL_UPDATE_CMD_ERR_CODE_FRAG_ERR, retry the command with
a new flag to allow defragmentation.  Since we are checking the
response for error code, we also need to take the mutex until
we finish reading the response.

Signed-off-by: default avatarKshitij Soni <kshitij.soni@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bac9a7e0

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

+26 −6
Original line number Diff line number Diff line
@@ -1578,17 +1578,37 @@ static int bnxt_flash_package_from_file(struct net_device *dev, 
	bnxt_hwrm_cmd_hdr_init(bp, &install, HWRM_NVM_INSTALL_UPDATE, -1, -1);

	install.install_type = cpu_to_le32(install_type);



	rc = hwrm_send_message(bp, &install, sizeof(install),

	mutex_lock(&bp->hwrm_cmd_lock);

	rc = _hwrm_send_message(bp, &install, sizeof(install),

				INSTALL_PACKAGE_TIMEOUT);

	if (rc)

		return -EOPNOTSUPP;

	if (rc) {

		rc = -EOPNOTSUPP;

		goto flash_pkg_exit;

	}



	if (resp->error_code) {

		u8 error_code = ((struct hwrm_err_output *)resp)->cmd_err;



		if (error_code == NVM_INSTALL_UPDATE_CMD_ERR_CODE_FRAG_ERR) {

			install.flags |= cpu_to_le16(

			       NVM_INSTALL_UPDATE_REQ_FLAGS_ALLOWED_TO_DEFRAG);

			rc = _hwrm_send_message(bp, &install, sizeof(install),

						INSTALL_PACKAGE_TIMEOUT);

			if (rc) {

				rc = -EOPNOTSUPP;

				goto flash_pkg_exit;

			}

		}

	}



	if (resp->result) {

		netdev_err(dev, "PKG install error = %d, problem_item = %d\n",

			   (s8)resp->result, (int)resp->problem_item);

		return -ENOPKG;

		rc = -ENOPKG;

	}

	return 0;

flash_pkg_exit:

	mutex_unlock(&bp->hwrm_cmd_lock);

	return rc;

}



static int bnxt_flash_device(struct net_device *dev,

CRA Git | Maintained and supported by SUSTech CRA and CCSE