When erasing, notify userspace of how long we will potentially take to
erase a module. This allows for better status reporting, because the
devlink program can display the timeout to the user in case the command
takes more than a few seconds to complete.
Since we're re-using the erase timeout value, make it a macro rather
than a magic number.
Signed-off-by: Jacob Keller <jacob.e.kel...@intel.com>
---
drivers/net/ethernet/intel/ice/ice_fw_update.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_fw_update.c
b/drivers/net/ethernet/intel/ice/ice_fw_update.c
index 142123155a0f..1ab805873cb1 100644
--- a/drivers/net/ethernet/intel/ice/ice_fw_update.c
+++ b/drivers/net/ethernet/intel/ice/ice_fw_update.c
@@ -399,6 +399,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
@@ -429,7 +434,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) {
@@ -441,8 +446,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);
base-commit: bcbf1be0ad49eed35f3cf27fb668f77e0c94f5f7
--
2.28.0.497.g54e85e7af1ac
