Commit 08e1294d authored by Jacob Keller's avatar Jacob Keller Committed by Tony Nguyen
Browse files

ice: report timeout length for erasing during devlink flash 



When erasing, notify userspace of how long we will potentially take to
erase a module. Doing so allows userspace to report the timeout, giving
a clear indication of the upper time bound of the operation.

Since we're re-using the erase timeout value, make it a macro rather
than a magic number.

Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Reviewed-by: default avatarShannon Nelson <snelson@pensando.io>
Tested-by: default avatarTony Brelinski <tonyx.brelinski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 4d469ec8

drivers/net/ethernet/intel/ice/ice_fw_update.c

+7 −3
Original line number Diff line number Diff line
@@ -417,6 +417,11 @@ ice_write_nvm_module(struct ice_pf *pf, u16 module, const char *component, 
	return err;

}



/* Length in seconds to wait before timing out when erasing a flash module.

 * Yes, erasing really can take minutes to complete.

 */

#define ICE_FW_ERASE_TIMEOUT 300



/**

 * ice_erase_nvm_module - Erase an NVM module and await firmware completion

 * @pf: the PF data structure
@@ -449,7 +454,7 @@ ice_erase_nvm_module(struct ice_pf *pf, u16 module, const char *component, 


	devlink = priv_to_devlink(pf);



	devlink_flash_update_status_notify(devlink, "Erasing", component, 0, 0);

	devlink_flash_update_timeout_notify(devlink, "Erasing", component, ICE_FW_ERASE_TIMEOUT);



	status = ice_aq_erase_nvm(hw, module, NULL);

	if (status) {
@@ -461,8 +466,7 @@ ice_erase_nvm_module(struct ice_pf *pf, u16 module, const char *component, 
		goto out_notify_devlink;

	}



	/* Yes, this really can take minutes to complete */

	err = ice_aq_wait_for_event(pf, ice_aqc_opc_nvm_erase, 300 * HZ, &event);

	err = ice_aq_wait_for_event(pf, ice_aqc_opc_nvm_erase, ICE_FW_ERASE_TIMEOUT * HZ, &event);

	if (err) {

		dev_err(dev, "Timed out waiting for firmware to respond with erase completion for %s (module 0x%02x), err %d\n",

			component, module, err);