@@ -108,8 +108,11 @@ static int mlxfw_fsm_state_wait(struct mlxfw_dev *mlxfw_dev, u32 fwhandle,
retry:
err = mlxfw_dev->ops->fsm_query_state(mlxfw_dev, fwhandle,
&curr_fsm_state, &fsm_state_err);
- if (err)
+ if (err) {
+ NL_SET_ERR_MSG_MOD(extack, "FSM state query failed, err (%d)",
+ err);
return err;
+ }
if (fsm_state_err != MLXFW_FSM_STATE_ERR_OK)
return mlxfw_fsm_state_err(mlxfw_dev, extack, fsm_state_err);
@@ -149,8 +152,12 @@ static int mlxfw_flash_component(struct mlxfw_dev *mlxfw_dev,
err = mlxfw_dev->ops->component_query(mlxfw_dev, comp->index,
&comp_max_size, &comp_align_bits,
&comp_max_write_size);
- if (err)
+ if (err) {
+ NL_SET_ERR_MSG_MOD(extack,
+ "FSM component query failed, comp_name(%s) err (%d)",
+ comp_name, err);
return err;
+ }
comp_max_size = min_t(u32, comp_max_size, MLXFW_FSM_MAX_COMPONENT_SIZE);
if (comp->data_size > comp_max_size) {
@@ -168,8 +175,12 @@ static int mlxfw_flash_component(struct mlxfw_dev *mlxfw_dev,
err = mlxfw_dev->ops->fsm_component_update(mlxfw_dev, fwhandle,
comp->index,
comp->data_size);
- if (err)
+ if (err) {
+ NL_SET_ERR_MSG_MOD(extack,
+ "FSM component update failed, comp_name(%s) err (%d)",
+ comp_name, err);
return err;
+ }
err = mlxfw_fsm_state_wait(mlxfw_dev, fwhandle,
MLXFW_FSM_STATE_DOWNLOAD, extack);
@@ -188,8 +199,12 @@ static int mlxfw_flash_component(struct mlxfw_dev *mlxfw_dev,
err = mlxfw_dev->ops->fsm_block_download(mlxfw_dev, fwhandle,
block_ptr, block_size,
offset);
- if (err)
+ if (err) {
+ NL_SET_ERR_MSG_MOD(extack,
+ "Component download failed, comp_name(%s) err (%d)",
+ comp_name, err);
goto err_out;
+ }
mlxfw_status_notify(mlxfw_dev, "Downloading component",
comp_name, offset + block_size,
comp->data_size);
@@ -199,8 +214,12 @@ static int mlxfw_flash_component(struct mlxfw_dev *mlxfw_dev,
mlxfw_status_notify(mlxfw_dev, "Verifying component", comp_name, 0, 0);
err = mlxfw_dev->ops->fsm_component_verify(mlxfw_dev, fwhandle,
comp->index);
- if (err)
+ if (err) {
+ NL_SET_ERR_MSG_MOD(extack,
+ "FSM component verify failed, comp_name(%s) err (%d)",
+ comp_name, err);
goto err_out;
+ }
err = mlxfw_fsm_state_wait(mlxfw_dev, fwhandle,
MLXFW_FSM_STATE_LOCKED, extack);
@@ -235,8 +254,13 @@ static int mlxfw_flash_components(struct mlxfw_dev *mlxfw_dev, u32 fwhandle,
comp = mlxfw_mfa2_file_component_get(mfa2_file, mlxfw_dev->psid,
mlxfw_dev->psid_size, i);
- if (IS_ERR(comp))
- return PTR_ERR(comp);
+ if (IS_ERR(comp)) {
+ err = PTR_ERR(comp);
+ NL_SET_ERR_MSG_MOD(extack,
+ "Failed to get MFA2 component, component (%d) err (%d)",
+ i, err);
+ return err;
+ }
mlxfw_info(mlxfw_dev, "Flashing component type %d\n",
comp->index);
@@ -263,8 +287,13 @@ int mlxfw_firmware_flash(struct mlxfw_dev *mlxfw_dev,
}
mfa2_file = mlxfw_mfa2_file_init(firmware);
- if (IS_ERR(mfa2_file))
- return PTR_ERR(mfa2_file);
+ if (IS_ERR(mfa2_file)) {
+ err = PTR_ERR(mfa2_file);
+ NL_SET_ERR_MSG_MOD(extack,
+ "Failed to initialize MFA2 firmware file, err (%d)",
+ err);
+ return err;
+ }
mlxfw_info(mlxfw_dev, "Initialize firmware flash process\n");
devlink_flash_update_begin_notify(mlxfw_dev->devlink);