Commit 68748775 authored by Pavan Chebbi's avatar Pavan Chebbi Committed by Jakub Kicinski
Browse files

bnxt_en: Clear DEFRAG flag in firmware message when retry flashing. 



When the FW tells the driver to retry the INSTALL_UPDATE command after
it has cleared the NVM area, the driver is not clearing the previously
used ALLOWED_TO_DEFRAG flag. As a result the FW tries to defrag the NVM
area a second time in a loop and can fail the request.

Fixes: 1432c3f6 ("bnxt_en: Retry installing FW package under NO_SPACE error condition.")
Signed-off-by: default avatarPavan Chebbi <pavan.chebbi@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 869c4d5e

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,