ice: report timeout length for erasing during devlink flash
Subsystems (2)
PATCH 1/1 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.
--- drivers/net/ethernet/intel/ice/ice_fw_update.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/ice/ice_fw_update.c +7 -3
@@ -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);
base-commit: 6a4868314a36d2580a87ade92e2d3f302eec3f03
Signature · 1 line
2.29.0
PATCH 1/1 ice: report timeout length for erasing during devlink flash
Quoted 9 lines · Jacob Keller
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 Jacob Keller <[email protected]>
Quoted 48 lines
--- drivers/net/ethernet/intel/ice/ice_fw_update.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)drivers/net/ethernet/intel/ice/ice_fw_update.c +7
-3@@ -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);base-commit:
6a4868314a36d2580a87ade92e2d3f302eec3f03--
2.29.0_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan at osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
Signature · 2 lines
============================================== Mr. Shannon Nelson Parents can't afford to be squeamish.