Commit db950599 authored by Alice Michael's avatar Alice Michael Committed by Jeff Kirsher
Browse files

iavf: change remaining i40e defines to be iavf 



There were a couple of erroneously missed i40e names to
update to iavf left after the larger chunks.  Updated them
separately so now they should all be aligned as iavf.

Signed-off-by: default avatarAlice Michael <alice.michael@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent cc0ea2db

drivers/net/ethernet/intel/iavf/iavf_adminq.c

+48 −48
Original line number Diff line number Diff line
@@ -29,10 +29,10 @@ static void iavf_adminq_init_regs(struct iavf_hw *hw) 
}



/**

 *  i40e_alloc_adminq_asq_ring - Allocate Admin Queue send rings

 *  iavf_alloc_adminq_asq_ring - Allocate Admin Queue send rings

 *  @hw: pointer to the hardware structure

 **/

static enum iavf_status i40e_alloc_adminq_asq_ring(struct iavf_hw *hw)

static enum iavf_status iavf_alloc_adminq_asq_ring(struct iavf_hw *hw)

{

	enum iavf_status ret_code;
@@ -56,10 +56,10 @@ static enum iavf_status i40e_alloc_adminq_asq_ring(struct iavf_hw *hw) 
}



/**

 *  i40e_alloc_adminq_arq_ring - Allocate Admin Queue receive rings

 *  iavf_alloc_adminq_arq_ring - Allocate Admin Queue receive rings

 *  @hw: pointer to the hardware structure

 **/

static enum iavf_status i40e_alloc_adminq_arq_ring(struct iavf_hw *hw)

static enum iavf_status iavf_alloc_adminq_arq_ring(struct iavf_hw *hw)

{

	enum iavf_status ret_code;
@@ -73,34 +73,34 @@ static enum iavf_status i40e_alloc_adminq_arq_ring(struct iavf_hw *hw) 
}



/**

 *  i40e_free_adminq_asq - Free Admin Queue send rings

 *  iavf_free_adminq_asq - Free Admin Queue send rings

 *  @hw: pointer to the hardware structure

 *

 *  This assumes the posted send buffers have already been cleaned

 *  and de-allocated

 **/

static void i40e_free_adminq_asq(struct iavf_hw *hw)

static void iavf_free_adminq_asq(struct iavf_hw *hw)

{

	iavf_free_dma_mem(hw, &hw->aq.asq.desc_buf);

}



/**

 *  i40e_free_adminq_arq - Free Admin Queue receive rings

 *  iavf_free_adminq_arq - Free Admin Queue receive rings

 *  @hw: pointer to the hardware structure

 *

 *  This assumes the posted receive buffers have already been cleaned

 *  and de-allocated

 **/

static void i40e_free_adminq_arq(struct iavf_hw *hw)

static void iavf_free_adminq_arq(struct iavf_hw *hw)

{

	iavf_free_dma_mem(hw, &hw->aq.arq.desc_buf);

}



/**

 *  i40e_alloc_arq_bufs - Allocate pre-posted buffers for the receive queue

 *  iavf_alloc_arq_bufs - Allocate pre-posted buffers for the receive queue

 *  @hw: pointer to the hardware structure

 **/

static enum iavf_status i40e_alloc_arq_bufs(struct iavf_hw *hw)

static enum iavf_status iavf_alloc_arq_bufs(struct iavf_hw *hw)

{

	struct iavf_aq_desc *desc;

	struct iavf_dma_mem *bi;
@@ -165,10 +165,10 @@ unwind_alloc_arq_bufs: 
}



/**

 *  i40e_alloc_asq_bufs - Allocate empty buffer structs for the send queue

 *  iavf_alloc_asq_bufs - Allocate empty buffer structs for the send queue

 *  @hw: pointer to the hardware structure

 **/

static enum iavf_status i40e_alloc_asq_bufs(struct iavf_hw *hw)

static enum iavf_status iavf_alloc_asq_bufs(struct iavf_hw *hw)

{

	struct iavf_dma_mem *bi;

	enum iavf_status ret_code;
@@ -206,10 +206,10 @@ unwind_alloc_asq_bufs: 
}



/**

 *  i40e_free_arq_bufs - Free receive queue buffer info elements

 *  iavf_free_arq_bufs - Free receive queue buffer info elements

 *  @hw: pointer to the hardware structure

 **/

static void i40e_free_arq_bufs(struct iavf_hw *hw)

static void iavf_free_arq_bufs(struct iavf_hw *hw)

{

	int i;
@@ -225,10 +225,10 @@ static void i40e_free_arq_bufs(struct iavf_hw *hw) 
}



/**

 *  i40e_free_asq_bufs - Free send queue buffer info elements

 *  iavf_free_asq_bufs - Free send queue buffer info elements

 *  @hw: pointer to the hardware structure

 **/

static void i40e_free_asq_bufs(struct iavf_hw *hw)

static void iavf_free_asq_bufs(struct iavf_hw *hw)

{

	int i;
@@ -248,12 +248,12 @@ static void i40e_free_asq_bufs(struct iavf_hw *hw) 
}



/**

 *  i40e_config_asq_regs - configure ASQ registers

 *  iavf_config_asq_regs - configure ASQ registers

 *  @hw: pointer to the hardware structure

 *

 *  Configure base address and length registers for the transmit queue

 **/

static enum iavf_status i40e_config_asq_regs(struct iavf_hw *hw)

static enum iavf_status iavf_config_asq_regs(struct iavf_hw *hw)

{

	enum iavf_status ret_code = 0;

	u32 reg = 0;
@@ -277,12 +277,12 @@ static enum iavf_status i40e_config_asq_regs(struct iavf_hw *hw) 
}



/**

 *  i40e_config_arq_regs - ARQ register configuration

 *  iavf_config_arq_regs - ARQ register configuration

 *  @hw: pointer to the hardware structure

 *

 * Configure base address and length registers for the receive (event queue)

 **/

static enum iavf_status i40e_config_arq_regs(struct iavf_hw *hw)

static enum iavf_status iavf_config_arq_regs(struct iavf_hw *hw)

{

	enum iavf_status ret_code = 0;

	u32 reg = 0;
@@ -309,7 +309,7 @@ static enum iavf_status i40e_config_arq_regs(struct iavf_hw *hw) 
}



/**

 *  i40e_init_asq - main initialization routine for ASQ

 *  iavf_init_asq - main initialization routine for ASQ

 *  @hw: pointer to the hardware structure

 *

 *  This is the main initialization routine for the Admin Send Queue
@@ -321,7 +321,7 @@ static enum iavf_status i40e_config_arq_regs(struct iavf_hw *hw) 
 *  Do *NOT* hold the lock when calling this as the memory allocation routines

 *  called are not going to be atomic context safe

 **/

static enum iavf_status i40e_init_asq(struct iavf_hw *hw)

static enum iavf_status iavf_init_asq(struct iavf_hw *hw)

{

	enum iavf_status ret_code = 0;
@@ -342,17 +342,17 @@ static enum iavf_status i40e_init_asq(struct iavf_hw *hw) 
	hw->aq.asq.next_to_clean = 0;



	/* allocate the ring memory */

	ret_code = i40e_alloc_adminq_asq_ring(hw);

	ret_code = iavf_alloc_adminq_asq_ring(hw);

	if (ret_code)

		goto init_adminq_exit;



	/* allocate buffers in the rings */

	ret_code = i40e_alloc_asq_bufs(hw);

	ret_code = iavf_alloc_asq_bufs(hw);

	if (ret_code)

		goto init_adminq_free_rings;



	/* initialize base registers */

	ret_code = i40e_config_asq_regs(hw);

	ret_code = iavf_config_asq_regs(hw);

	if (ret_code)

		goto init_adminq_free_rings;
@@ -361,14 +361,14 @@ static enum iavf_status i40e_init_asq(struct iavf_hw *hw) 
	goto init_adminq_exit;



init_adminq_free_rings:

	i40e_free_adminq_asq(hw);

	iavf_free_adminq_asq(hw);



init_adminq_exit:

	return ret_code;

}



/**

 *  i40e_init_arq - initialize ARQ

 *  iavf_init_arq - initialize ARQ

 *  @hw: pointer to the hardware structure

 *

 *  The main initialization routine for the Admin Receive (Event) Queue.
@@ -380,7 +380,7 @@ init_adminq_exit: 
 *  Do *NOT* hold the lock when calling this as the memory allocation routines

 *  called are not going to be atomic context safe

 **/

static enum iavf_status i40e_init_arq(struct iavf_hw *hw)

static enum iavf_status iavf_init_arq(struct iavf_hw *hw)

{

	enum iavf_status ret_code = 0;
@@ -401,17 +401,17 @@ static enum iavf_status i40e_init_arq(struct iavf_hw *hw) 
	hw->aq.arq.next_to_clean = 0;



	/* allocate the ring memory */

	ret_code = i40e_alloc_adminq_arq_ring(hw);

	ret_code = iavf_alloc_adminq_arq_ring(hw);

	if (ret_code)

		goto init_adminq_exit;



	/* allocate buffers in the rings */

	ret_code = i40e_alloc_arq_bufs(hw);

	ret_code = iavf_alloc_arq_bufs(hw);

	if (ret_code)

		goto init_adminq_free_rings;



	/* initialize base registers */

	ret_code = i40e_config_arq_regs(hw);

	ret_code = iavf_config_arq_regs(hw);

	if (ret_code)

		goto init_adminq_free_rings;
@@ -420,19 +420,19 @@ static enum iavf_status i40e_init_arq(struct iavf_hw *hw) 
	goto init_adminq_exit;



init_adminq_free_rings:

	i40e_free_adminq_arq(hw);

	iavf_free_adminq_arq(hw);



init_adminq_exit:

	return ret_code;

}



/**

 *  i40e_shutdown_asq - shutdown the ASQ

 *  iavf_shutdown_asq - shutdown the ASQ

 *  @hw: pointer to the hardware structure

 *

 *  The main shutdown routine for the Admin Send Queue

 **/

static enum iavf_status i40e_shutdown_asq(struct iavf_hw *hw)

static enum iavf_status iavf_shutdown_asq(struct iavf_hw *hw)

{

	enum iavf_status ret_code = 0;
@@ -453,7 +453,7 @@ static enum iavf_status i40e_shutdown_asq(struct iavf_hw *hw) 
	hw->aq.asq.count = 0; /* to indicate uninitialized queue */



	/* free ring buffers */

	i40e_free_asq_bufs(hw);

	iavf_free_asq_bufs(hw);



shutdown_asq_out:

	mutex_unlock(&hw->aq.asq_mutex);
@@ -461,12 +461,12 @@ shutdown_asq_out: 
}



/**

 *  i40e_shutdown_arq - shutdown ARQ

 *  iavf_shutdown_arq - shutdown ARQ

 *  @hw: pointer to the hardware structure

 *

 *  The main shutdown routine for the Admin Receive Queue

 **/

static enum iavf_status i40e_shutdown_arq(struct iavf_hw *hw)

static enum iavf_status iavf_shutdown_arq(struct iavf_hw *hw)

{

	enum iavf_status ret_code = 0;
@@ -487,7 +487,7 @@ static enum iavf_status i40e_shutdown_arq(struct iavf_hw *hw) 
	hw->aq.arq.count = 0; /* to indicate uninitialized queue */



	/* free ring buffers */

	i40e_free_arq_bufs(hw);

	iavf_free_arq_bufs(hw);



shutdown_arq_out:

	mutex_unlock(&hw->aq.arq_mutex);
@@ -525,12 +525,12 @@ enum iavf_status iavf_init_adminq(struct iavf_hw *hw) 
	hw->aq.asq_cmd_timeout = IAVF_ASQ_CMD_TIMEOUT;



	/* allocate the ASQ */

	ret_code = i40e_init_asq(hw);

	ret_code = iavf_init_asq(hw);

	if (ret_code)

		goto init_adminq_destroy_locks;



	/* allocate the ARQ */

	ret_code = i40e_init_arq(hw);

	ret_code = iavf_init_arq(hw);

	if (ret_code)

		goto init_adminq_free_asq;
@@ -538,7 +538,7 @@ enum iavf_status iavf_init_adminq(struct iavf_hw *hw) 
	goto init_adminq_exit;



init_adminq_free_asq:

	i40e_shutdown_asq(hw);

	iavf_shutdown_asq(hw);

init_adminq_destroy_locks:



init_adminq_exit:
@@ -556,19 +556,19 @@ enum iavf_status iavf_shutdown_adminq(struct iavf_hw *hw) 
	if (iavf_check_asq_alive(hw))

		iavf_aq_queue_shutdown(hw, true);



	i40e_shutdown_asq(hw);

	i40e_shutdown_arq(hw);

	iavf_shutdown_asq(hw);

	iavf_shutdown_arq(hw);



	return ret_code;

}



/**

 *  i40e_clean_asq - cleans Admin send queue

 *  iavf_clean_asq - cleans Admin send queue

 *  @hw: pointer to the hardware structure

 *

 *  returns the number of free desc

 **/

static u16 i40e_clean_asq(struct iavf_hw *hw)

static u16 iavf_clean_asq(struct iavf_hw *hw)

{

	struct iavf_adminq_ring *asq = &hw->aq.asq;

	struct iavf_asq_cmd_details *details;
@@ -583,8 +583,8 @@ static u16 i40e_clean_asq(struct iavf_hw *hw) 
			   "ntc %d head %d.\n", ntc, rd32(hw, hw->aq.asq.head));



		if (details->callback) {

			I40E_ADMINQ_CALLBACK cb_func =

					(I40E_ADMINQ_CALLBACK)details->callback;

			IAVF_ADMINQ_CALLBACK cb_func =

					(IAVF_ADMINQ_CALLBACK)details->callback;

			desc_cb = *desc;

			cb_func(hw, &desc_cb);

		}
@@ -708,7 +708,7 @@ enum iavf_status iavf_asq_send_command(struct iavf_hw *hw, 
	/* the clean function called here could be called in a separate thread

	 * in case of asynchronous completions

	 */

	if (i40e_clean_asq(hw) == 0) {

	if (iavf_clean_asq(hw) == 0) {

		iavf_debug(hw,

			   IAVF_DEBUG_AQ_MESSAGE,

			   "AQTX: Error queue is full.\n");

drivers/net/ethernet/intel/iavf/iavf_adminq.h

+2 −2
Original line number Diff line number Diff line
@@ -84,11 +84,11 @@ struct iavf_adminq_info { 
};



/**

 * i40e_aq_rc_to_posix - convert errors to user-land codes

 * iavf_aq_rc_to_posix - convert errors to user-land codes

 * aq_ret: AdminQ handler error code can override aq_rc

 * aq_rc: AdminQ firmware error code to convert

 **/

static inline int i40e_aq_rc_to_posix(int aq_ret, int aq_rc)

static inline int iavf_aq_rc_to_posix(int aq_ret, int aq_rc)

{

	int aq_to_posix[] = {

		0,           /* IAVF_AQ_RC_OK */

drivers/net/ethernet/intel/iavf/iavf_type.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


/* forward declaration */

struct iavf_hw;

typedef void (*I40E_ADMINQ_CALLBACK)(struct iavf_hw *, struct iavf_aq_desc *);

typedef void (*IAVF_ADMINQ_CALLBACK)(struct iavf_hw *, struct iavf_aq_desc *);



/* Data type manipulation macros. */

CRA Git | Maintained and supported by SUSTech CRA and CCSE