Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fdd052c authored by Shannon Nelson's avatar Shannon Nelson Committed by Jeff Kirsher
Browse files

i40e: fix up NVM update sm error handling 



The state transitions after an error were not managed well, so
these changes get us back to the INIT state or don't transition
out of the INIT state after most errors.

Change-ID: I90aa0e4e348dc4f58cbcdce9c5d4b7fd35981c6c
Signed-off-by: default avatarShannon Nelson <shannon.nelson@intel.com>
Acked-by: default avatarMichal Kosiarz <michal.kosiarz@intel.com>
Tested-by: default avatarJim Young <jamesx.m.young@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent c509c1de

drivers/net/ethernet/intel/i40e/i40e_nvm.c

+16 −10
Original line number Diff line number Diff line
@@ -535,6 +535,9 @@ static i40e_status i40e_nvmupd_state_init(struct i40e_hw *hw, 
			*errno = i40e_aq_rc_to_posix(hw->aq.asq_last_status);

		} else {

			status = i40e_nvmupd_nvm_read(hw, cmd, bytes, errno);

			if (status)

				i40e_release_nvm(hw);

			else

				hw->nvmupd_state = I40E_NVMUPD_STATE_READING;

		}

		break;
@@ -571,6 +574,9 @@ static i40e_status i40e_nvmupd_state_init(struct i40e_hw *hw, 
			*errno = i40e_aq_rc_to_posix(hw->aq.asq_last_status);

		} else {

			status = i40e_nvmupd_nvm_write(hw, cmd, bytes, errno);

			if (status)

				i40e_release_nvm(hw);

			else

				hw->nvmupd_state = I40E_NVMUPD_STATE_WRITING;

		}

		break;
@@ -671,30 +677,30 @@ static i40e_status i40e_nvmupd_state_writing(struct i40e_hw *hw, 


	case I40E_NVMUPD_WRITE_LCB:

		status = i40e_nvmupd_nvm_write(hw, cmd, bytes, errno);

		if (!status) {

		if (!status)

			hw->aq.nvm_release_on_done = true;

		hw->nvmupd_state = I40E_NVMUPD_STATE_INIT;

		}

		break;



	case I40E_NVMUPD_CSUM_CON:

		status = i40e_update_nvm_checksum(hw);

		if (status)

		if (status) {

			*errno = hw->aq.asq_last_status ?

				   i40e_aq_rc_to_posix(hw->aq.asq_last_status) :

				   -EIO;

			hw->nvmupd_state = I40E_NVMUPD_STATE_INIT;

		}

		break;



	case I40E_NVMUPD_CSUM_LCB:

		status = i40e_update_nvm_checksum(hw);

		if (status) {

		if (status)

			*errno = hw->aq.asq_last_status ?

				   i40e_aq_rc_to_posix(hw->aq.asq_last_status) :

				   -EIO;

		} else {

		else

			hw->aq.nvm_release_on_done = true;

		hw->nvmupd_state = I40E_NVMUPD_STATE_INIT;

		}

		break;



	default: