diff options
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_fw_update.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_fw_update.c | 42 |
1 files changed, 18 insertions, 24 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_fw_update.c b/drivers/net/ethernet/intel/ice/ice_fw_update.c index d12f292a576a..a11a5626ff8c 100644 --- a/drivers/net/ethernet/intel/ice/ice_fw_update.c +++ b/drivers/net/ethernet/intel/ice/ice_fw_update.c @@ -276,7 +276,6 @@ ice_write_one_nvm_block(struct ice_pf *pf, u16 module, u32 offset, struct ice_rq_event_info event; struct ice_hw *hw = &pf->hw; u32 completion_offset; - int status; int err; memset(&event, 0, sizeof(event)); @@ -284,11 +283,11 @@ ice_write_one_nvm_block(struct ice_pf *pf, u16 module, u32 offset, dev_dbg(dev, "Writing block of %u bytes for module 0x%02x at offset %u\n", block_size, module, offset); - status = ice_aq_update_nvm(hw, module, offset, block_size, block, - last_cmd, 0, NULL); - if (status) { + err = ice_aq_update_nvm(hw, module, offset, block_size, block, + last_cmd, 0, NULL); + if (err) { dev_err(dev, "Failed to flash module 0x%02x with block of size %u at offset %u, err %d aq_err %s\n", - module, block_size, offset, status, + module, block_size, offset, err, ice_aq_str(hw->adminq.sq_last_status)); NL_SET_ERR_MSG_MOD(extack, "Failed to program flash module"); return -EIO; @@ -443,7 +442,6 @@ ice_erase_nvm_module(struct ice_pf *pf, u16 module, const char *component, struct ice_rq_event_info event; struct ice_hw *hw = &pf->hw; struct devlink *devlink; - int status; int err; dev_dbg(dev, "Beginning erase of flash component '%s', module 0x%02x\n", component, module); @@ -454,10 +452,10 @@ ice_erase_nvm_module(struct ice_pf *pf, u16 module, const char *component, devlink_flash_update_timeout_notify(devlink, "Erasing", component, ICE_FW_ERASE_TIMEOUT); - status = ice_aq_erase_nvm(hw, module, NULL); - if (status) { + err = ice_aq_erase_nvm(hw, module, NULL); + if (err) { dev_err(dev, "Failed to erase %s (module 0x%02x), err %d aq_err %s\n", - component, module, status, + component, module, err, ice_aq_str(hw->adminq.sq_last_status)); NL_SET_ERR_MSG_MOD(extack, "Failed to erase flash module"); err = -EIO; @@ -523,15 +521,14 @@ static int ice_switch_flash_banks(struct ice_pf *pf, u8 activate_flags, struct ice_rq_event_info event; struct ice_hw *hw = &pf->hw; u16 completion_retval; - int status; int err; memset(&event, 0, sizeof(event)); - status = ice_nvm_write_activate(hw, activate_flags); - if (status) { + err = ice_nvm_write_activate(hw, activate_flags); + if (err) { dev_err(dev, "Failed to switch active flash banks, err %d aq_err %s\n", - status, ice_aq_str(hw->adminq.sq_last_status)); + err, ice_aq_str(hw->adminq.sq_last_status)); NL_SET_ERR_MSG_MOD(extack, "Failed to switch active flash banks"); return -EIO; } @@ -667,7 +664,6 @@ int ice_flash_pldm_image(struct ice_pf *pf, const struct firmware *fw, struct device *dev = ice_pf_to_dev(pf); struct ice_hw *hw = &pf->hw; struct ice_fwu_priv priv; - int status; int err; switch (preservation) { @@ -689,10 +685,10 @@ int ice_flash_pldm_image(struct ice_pf *pf, const struct firmware *fw, priv.pf = pf; priv.activate_flags = preservation; - status = ice_acquire_nvm(hw, ICE_RES_WRITE); - if (status) { + err = ice_acquire_nvm(hw, ICE_RES_WRITE); + if (err) { dev_err(dev, "Failed to acquire device flash lock, err %d aq_err %s\n", - status, ice_aq_str(hw->adminq.sq_last_status)); + err, ice_aq_str(hw->adminq.sq_last_status)); NL_SET_ERR_MSG_MOD(extack, "Failed to acquire device flash lock"); return -EIO; } @@ -733,7 +729,6 @@ int ice_check_for_pending_update(struct ice_pf *pf, const char *component, struct ice_hw_dev_caps *dev_caps; struct ice_hw *hw = &pf->hw; u8 pending = 0; - int status; int err; dev_caps = kzalloc(sizeof(*dev_caps), GFP_KERNEL); @@ -745,8 +740,8 @@ int ice_check_for_pending_update(struct ice_pf *pf, const char *component, * may have changed, e.g. if an update was previously completed and * the system has not yet rebooted. */ - status = ice_discover_dev_caps(hw, dev_caps); - if (status) { + err = ice_discover_dev_caps(hw, dev_caps); + if (err) { NL_SET_ERR_MSG_MOD(extack, "Unable to read device capabilities"); kfree(dev_caps); return -EIO; @@ -794,11 +789,10 @@ int ice_check_for_pending_update(struct ice_pf *pf, const char *component, "Canceling previous pending update", component, 0, 0); - status = ice_acquire_nvm(hw, ICE_RES_WRITE); - if (status) { + err = ice_acquire_nvm(hw, ICE_RES_WRITE); + if (err) { dev_err(dev, "Failed to acquire device flash lock, err %d aq_err %s\n", - status, - ice_aq_str(hw->adminq.sq_last_status)); + err, ice_aq_str(hw->adminq.sq_last_status)); NL_SET_ERR_MSG_MOD(extack, "Failed to acquire device flash lock"); return -EIO; } |