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

Commit 24408e7a authored by Shannon Nelson's avatar Shannon Nelson Committed by Jeff Kirsher
Browse files

i40e/i40evf: grab the AQ spinlocks before clearing registers 



Make sure we have the spinlocks before we clear the ARQ and ASQ management
registers.  Also, widen the locked portion and make a sanity check earlier
in the send function to be sure we're working with safe register values.

Change-ID: I34b56044b33461ed780f3d2de8d62826cdf933f9
Signed-off-by: default avatarShannon Nelson <shannon.nelson@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 126b63d9

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

+23 −22
Original line number Diff line number Diff line
@@ -482,8 +482,12 @@ static i40e_status i40e_shutdown_asq(struct i40e_hw *hw) 
{

	i40e_status ret_code = 0;



	if (hw->aq.asq.count == 0)

		return I40E_ERR_NOT_READY;

	mutex_lock(&hw->aq.asq_mutex);



	if (hw->aq.asq.count == 0) {

		ret_code = I40E_ERR_NOT_READY;

		goto shutdown_asq_out;

	}



	/* Stop firmware AdminQ processing */

	wr32(hw, hw->aq.asq.head, 0);
@@ -492,16 +496,13 @@ static i40e_status i40e_shutdown_asq(struct i40e_hw *hw) 
	wr32(hw, hw->aq.asq.bal, 0);

	wr32(hw, hw->aq.asq.bah, 0);



	/* make sure lock is available */

	mutex_lock(&hw->aq.asq_mutex);



	hw->aq.asq.count = 0; /* to indicate uninitialized queue */



	/* free ring buffers */

	i40e_free_asq_bufs(hw);



shutdown_asq_out:

	mutex_unlock(&hw->aq.asq_mutex);



	return ret_code;

}
@@ -515,8 +516,12 @@ static i40e_status i40e_shutdown_arq(struct i40e_hw *hw) 
{

	i40e_status ret_code = 0;



	if (hw->aq.arq.count == 0)

		return I40E_ERR_NOT_READY;

	mutex_lock(&hw->aq.arq_mutex);



	if (hw->aq.arq.count == 0) {

		ret_code = I40E_ERR_NOT_READY;

		goto shutdown_arq_out;

	}



	/* Stop firmware AdminQ processing */

	wr32(hw, hw->aq.arq.head, 0);
@@ -525,16 +530,13 @@ static i40e_status i40e_shutdown_arq(struct i40e_hw *hw) 
	wr32(hw, hw->aq.arq.bal, 0);

	wr32(hw, hw->aq.arq.bah, 0);



	/* make sure lock is available */

	mutex_lock(&hw->aq.arq_mutex);



	hw->aq.arq.count = 0; /* to indicate uninitialized queue */



	/* free ring buffers */

	i40e_free_arq_bufs(hw);



shutdown_arq_out:

	mutex_unlock(&hw->aq.arq_mutex);



	return ret_code;

}
@@ -745,19 +747,21 @@ i40e_status i40e_asq_send_command(struct i40e_hw *hw, 
	u16  retval = 0;

	u32  val = 0;



	val = rd32(hw, hw->aq.asq.head);

	if (val >= hw->aq.num_asq_entries) {

	mutex_lock(&hw->aq.asq_mutex);



	if (hw->aq.asq.count == 0) {

		i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE,

			   "AQTX: head overrun at %d\n", val);

			   "AQTX: Admin queue not initialized.\n");

		status = I40E_ERR_QUEUE_EMPTY;

		goto asq_send_command_exit;

		goto asq_send_command_error;

	}



	if (hw->aq.asq.count == 0) {

	val = rd32(hw, hw->aq.asq.head);

	if (val >= hw->aq.num_asq_entries) {

		i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE,

			   "AQTX: Admin queue not initialized.\n");

			   "AQTX: head overrun at %d\n", val);

		status = I40E_ERR_QUEUE_EMPTY;

		goto asq_send_command_exit;

		goto asq_send_command_error;

	}



	details = I40E_ADMINQ_DETAILS(hw->aq.asq, hw->aq.asq.next_to_use);
@@ -782,8 +786,6 @@ i40e_status i40e_asq_send_command(struct i40e_hw *hw, 
	desc->flags &= ~cpu_to_le16(details->flags_dis);

	desc->flags |= cpu_to_le16(details->flags_ena);



	mutex_lock(&hw->aq.asq_mutex);



	if (buff_size > hw->aq.asq_buf_size) {

		i40e_debug(hw,

			   I40E_DEBUG_AQ_MESSAGE,
@@ -907,7 +909,6 @@ i40e_status i40e_asq_send_command(struct i40e_hw *hw, 


asq_send_command_error:

	mutex_unlock(&hw->aq.asq_mutex);

asq_send_command_exit:

	return status;

}

drivers/net/ethernet/intel/i40evf/i40e_adminq.c

+23 −22
Original line number Diff line number Diff line
@@ -469,8 +469,12 @@ static i40e_status i40e_shutdown_asq(struct i40e_hw *hw) 
{

	i40e_status ret_code = 0;



	if (hw->aq.asq.count == 0)

		return I40E_ERR_NOT_READY;

	mutex_lock(&hw->aq.asq_mutex);



	if (hw->aq.asq.count == 0) {

		ret_code = I40E_ERR_NOT_READY;

		goto shutdown_asq_out;

	}



	/* Stop firmware AdminQ processing */

	wr32(hw, hw->aq.asq.head, 0);
@@ -479,16 +483,13 @@ static i40e_status i40e_shutdown_asq(struct i40e_hw *hw) 
	wr32(hw, hw->aq.asq.bal, 0);

	wr32(hw, hw->aq.asq.bah, 0);



	/* make sure lock is available */

	mutex_lock(&hw->aq.asq_mutex);



	hw->aq.asq.count = 0; /* to indicate uninitialized queue */



	/* free ring buffers */

	i40e_free_asq_bufs(hw);



shutdown_asq_out:

	mutex_unlock(&hw->aq.asq_mutex);



	return ret_code;

}
@@ -502,8 +503,12 @@ static i40e_status i40e_shutdown_arq(struct i40e_hw *hw) 
{

	i40e_status ret_code = 0;



	if (hw->aq.arq.count == 0)

		return I40E_ERR_NOT_READY;

	mutex_lock(&hw->aq.arq_mutex);



	if (hw->aq.arq.count == 0) {

		ret_code = I40E_ERR_NOT_READY;

		goto shutdown_arq_out;

	}



	/* Stop firmware AdminQ processing */

	wr32(hw, hw->aq.arq.head, 0);
@@ -512,16 +517,13 @@ static i40e_status i40e_shutdown_arq(struct i40e_hw *hw) 
	wr32(hw, hw->aq.arq.bal, 0);

	wr32(hw, hw->aq.arq.bah, 0);



	/* make sure lock is available */

	mutex_lock(&hw->aq.arq_mutex);



	hw->aq.arq.count = 0; /* to indicate uninitialized queue */



	/* free ring buffers */

	i40e_free_arq_bufs(hw);



shutdown_arq_out:

	mutex_unlock(&hw->aq.arq_mutex);



	return ret_code;

}
@@ -685,19 +687,21 @@ i40e_status i40evf_asq_send_command(struct i40e_hw *hw, 
	u16  retval = 0;

	u32  val = 0;



	val = rd32(hw, hw->aq.asq.head);

	if (val >= hw->aq.num_asq_entries) {

	mutex_lock(&hw->aq.asq_mutex);



	if (hw->aq.asq.count == 0) {

		i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE,

			   "AQTX: head overrun at %d\n", val);

			   "AQTX: Admin queue not initialized.\n");

		status = I40E_ERR_QUEUE_EMPTY;

		goto asq_send_command_exit;

		goto asq_send_command_error;

	}



	if (hw->aq.asq.count == 0) {

	val = rd32(hw, hw->aq.asq.head);

	if (val >= hw->aq.num_asq_entries) {

		i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE,

			   "AQTX: Admin queue not initialized.\n");

			   "AQTX: head overrun at %d\n", val);

		status = I40E_ERR_QUEUE_EMPTY;

		goto asq_send_command_exit;

		goto asq_send_command_error;

	}



	details = I40E_ADMINQ_DETAILS(hw->aq.asq, hw->aq.asq.next_to_use);
@@ -722,8 +726,6 @@ i40e_status i40evf_asq_send_command(struct i40e_hw *hw, 
	desc->flags &= ~cpu_to_le16(details->flags_dis);

	desc->flags |= cpu_to_le16(details->flags_ena);



	mutex_lock(&hw->aq.asq_mutex);



	if (buff_size > hw->aq.asq_buf_size) {

		i40e_debug(hw,

			   I40E_DEBUG_AQ_MESSAGE,
@@ -848,7 +850,6 @@ i40e_status i40evf_asq_send_command(struct i40e_hw *hw, 


asq_send_command_error:

	mutex_unlock(&hw->aq.asq_mutex);

asq_send_command_exit:

	return status;

}