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

Commit 981e25c3 authored by Paul M Stillwell Jr's avatar Paul M Stillwell Jr Committed by Jeff Kirsher
Browse files

i40e: Handle admin Q timeout when releasing NVM 



There are some rare cases where the release resource call will return an
admin Q timeout. In these cases the code needs to try to release the
resource again until it succeeds or it times out.

Signed-off-by: default avatarPaul M Stillwell Jr <paul.m.stillwell.jr@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 4d5957cb

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

+19 −2
Original line number Diff line number Diff line
@@ -134,8 +134,25 @@ i40e_status i40e_acquire_nvm(struct i40e_hw *hw, 
 **/

void i40e_release_nvm(struct i40e_hw *hw)

{

	if (!hw->nvm.blank_nvm_mode)

		i40e_aq_release_resource(hw, I40E_NVM_RESOURCE_ID, 0, NULL);

	i40e_status ret_code = I40E_SUCCESS;

	u32 total_delay = 0;



	if (hw->nvm.blank_nvm_mode)

		return;



	ret_code = i40e_aq_release_resource(hw, I40E_NVM_RESOURCE_ID, 0, NULL);



	/* there are some rare cases when trying to release the resource

	 * results in an admin Q timeout, so handle them correctly

	 */

	while ((ret_code == I40E_ERR_ADMIN_QUEUE_TIMEOUT) &&

	       (total_delay < hw->aq.asq_cmd_timeout)) {

		usleep_range(1000, 2000);

		ret_code = i40e_aq_release_resource(hw,

						    I40E_NVM_RESOURCE_ID,

						    0, NULL);

		total_delay++;

	}

}



/**