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

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

iavf: replace i40e variables with iavf 



Update the old variables and flags marked as i40e to match
the iavf name of the driver.

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 d650fb40

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

+40 −40
Original line number Diff line number Diff line
@@ -37,16 +37,16 @@ static enum iavf_status i40e_alloc_adminq_asq_ring(struct iavf_hw *hw) 
	enum iavf_status ret_code;



	ret_code = iavf_allocate_dma_mem(hw, &hw->aq.asq.desc_buf,

					 i40e_mem_atq_ring,

					 iavf_mem_atq_ring,

					 (hw->aq.num_asq_entries *

					 sizeof(struct i40e_aq_desc)),

					 sizeof(struct iavf_aq_desc)),

					 IAVF_ADMINQ_DESC_ALIGNMENT);

	if (ret_code)

		return ret_code;



	ret_code = iavf_allocate_virt_mem(hw, &hw->aq.asq.cmd_buf,

					  (hw->aq.num_asq_entries *

					  sizeof(struct i40e_asq_cmd_details)));

					  sizeof(struct iavf_asq_cmd_details)));

	if (ret_code) {

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

		return ret_code;
@@ -64,9 +64,9 @@ static enum iavf_status i40e_alloc_adminq_arq_ring(struct iavf_hw *hw) 
	enum iavf_status ret_code;



	ret_code = iavf_allocate_dma_mem(hw, &hw->aq.arq.desc_buf,

					 i40e_mem_arq_ring,

					 iavf_mem_arq_ring,

					 (hw->aq.num_arq_entries *

					 sizeof(struct i40e_aq_desc)),

					 sizeof(struct iavf_aq_desc)),

					 IAVF_ADMINQ_DESC_ALIGNMENT);



	return ret_code;
@@ -102,7 +102,7 @@ static void i40e_free_adminq_arq(struct iavf_hw *hw) 
 **/

static enum iavf_status i40e_alloc_arq_bufs(struct iavf_hw *hw)

{

	struct i40e_aq_desc *desc;

	struct iavf_aq_desc *desc;

	struct iavf_dma_mem *bi;

	enum iavf_status ret_code;

	int i;
@@ -123,7 +123,7 @@ static enum iavf_status i40e_alloc_arq_bufs(struct iavf_hw *hw) 
	for (i = 0; i < hw->aq.num_arq_entries; i++) {

		bi = &hw->aq.arq.r.arq_bi[i];

		ret_code = iavf_allocate_dma_mem(hw, bi,

						 i40e_mem_arq_buf,

						 iavf_mem_arq_buf,

						 hw->aq.arq_buf_size,

						 IAVF_ADMINQ_DESC_ALIGNMENT);

		if (ret_code)
@@ -132,9 +132,9 @@ static enum iavf_status i40e_alloc_arq_bufs(struct iavf_hw *hw) 
		/* now configure the descriptors for use */

		desc = IAVF_ADMINQ_DESC(hw->aq.arq, i);



		desc->flags = cpu_to_le16(I40E_AQ_FLAG_BUF);

		if (hw->aq.arq_buf_size > I40E_AQ_LARGE_BUF)

			desc->flags |= cpu_to_le16(I40E_AQ_FLAG_LB);

		desc->flags = cpu_to_le16(IAVF_AQ_FLAG_BUF);

		if (hw->aq.arq_buf_size > IAVF_AQ_LARGE_BUF)

			desc->flags |= cpu_to_le16(IAVF_AQ_FLAG_LB);

		desc->opcode = 0;

		/* This is in accordance with Admin queue design, there is no

		 * register for buffer size configuration
@@ -186,7 +186,7 @@ static enum iavf_status i40e_alloc_asq_bufs(struct iavf_hw *hw) 
	for (i = 0; i < hw->aq.num_asq_entries; i++) {

		bi = &hw->aq.asq.r.asq_bi[i];

		ret_code = iavf_allocate_dma_mem(hw, bi,

						 i40e_mem_asq_buf,

						 iavf_mem_asq_buf,

						 hw->aq.asq_buf_size,

						 IAVF_ADMINQ_DESC_ALIGNMENT);

		if (ret_code)
@@ -522,7 +522,7 @@ enum iavf_status iavf_init_adminq(struct iavf_hw *hw) 
	iavf_adminq_init_regs(hw);



	/* setup ASQ command write back timeout */

	hw->aq.asq_cmd_timeout = I40E_ASQ_CMD_TIMEOUT;

	hw->aq.asq_cmd_timeout = IAVF_ASQ_CMD_TIMEOUT;



	/* allocate the ASQ */

	ret_code = i40e_init_asq(hw);
@@ -571,13 +571,13 @@ enum iavf_status iavf_shutdown_adminq(struct iavf_hw *hw) 
static u16 i40e_clean_asq(struct iavf_hw *hw)

{

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

	struct i40e_asq_cmd_details *details;

	struct iavf_asq_cmd_details *details;

	u16 ntc = asq->next_to_clean;

	struct i40e_aq_desc desc_cb;

	struct i40e_aq_desc *desc;

	struct iavf_aq_desc desc_cb;

	struct iavf_aq_desc *desc;



	desc = IAVF_ADMINQ_DESC(*asq, ntc);

	details = I40E_ADMINQ_DETAILS(*asq, ntc);

	details = IAVF_ADMINQ_DETAILS(*asq, ntc);

	while (rd32(hw, hw->aq.asq.head) != ntc) {

		iavf_debug(hw, IAVF_DEBUG_AQ_MESSAGE,

			   "ntc %d head %d.\n", ntc, rd32(hw, hw->aq.asq.head));
@@ -588,14 +588,14 @@ static u16 i40e_clean_asq(struct iavf_hw *hw) 
			desc_cb = *desc;

			cb_func(hw, &desc_cb);

		}

		memset((void *)desc, 0, sizeof(struct i40e_aq_desc));

		memset((void *)desc, 0, sizeof(struct iavf_aq_desc));

		memset((void *)details, 0,

		       sizeof(struct i40e_asq_cmd_details));

		       sizeof(struct iavf_asq_cmd_details));

		ntc++;

		if (ntc == asq->count)

			ntc = 0;

		desc = IAVF_ADMINQ_DESC(*asq, ntc);

		details = I40E_ADMINQ_DETAILS(*asq, ntc);

		details = IAVF_ADMINQ_DETAILS(*asq, ntc);

	}



	asq->next_to_clean = ntc;
@@ -630,14 +630,14 @@ bool iavf_asq_done(struct iavf_hw *hw) 
 *  queue.  It runs the queue, cleans the queue, etc

 **/

enum iavf_status iavf_asq_send_command(struct iavf_hw *hw,

				       struct i40e_aq_desc *desc,

				       struct iavf_aq_desc *desc,

				       void *buff, /* can be NULL */

				       u16  buff_size,

				       struct i40e_asq_cmd_details *cmd_details)

				       struct iavf_asq_cmd_details *cmd_details)

{

	struct iavf_dma_mem *dma_buff = NULL;

	struct i40e_asq_cmd_details *details;

	struct i40e_aq_desc *desc_on_ring;

	struct iavf_asq_cmd_details *details;

	struct iavf_aq_desc *desc_on_ring;

	bool cmd_completed = false;

	enum iavf_status status = 0;

	u16  retval = 0;
@@ -652,7 +652,7 @@ enum iavf_status iavf_asq_send_command(struct iavf_hw *hw, 
		goto asq_send_command_error;

	}



	hw->aq.asq_last_status = I40E_AQ_RC_OK;

	hw->aq.asq_last_status = IAVF_AQ_RC_OK;



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

	if (val >= hw->aq.num_asq_entries) {
@@ -662,7 +662,7 @@ enum iavf_status iavf_asq_send_command(struct iavf_hw *hw, 
		goto asq_send_command_error;

	}



	details = I40E_ADMINQ_DETAILS(hw->aq.asq, hw->aq.asq.next_to_use);

	details = IAVF_ADMINQ_DETAILS(hw->aq.asq, hw->aq.asq.next_to_use);

	if (cmd_details) {

		*details = *cmd_details;
@@ -677,7 +677,7 @@ enum iavf_status iavf_asq_send_command(struct iavf_hw *hw, 
				cpu_to_le32(lower_32_bits(details->cookie));

		}

	} else {

		memset(details, 0, sizeof(struct i40e_asq_cmd_details));

		memset(details, 0, sizeof(struct iavf_asq_cmd_details));

	}



	/* clear requested flags and then set additional flags if defined */
@@ -781,13 +781,13 @@ enum iavf_status iavf_asq_send_command(struct iavf_hw *hw, 
			retval &= 0xff;

		}

		cmd_completed = true;

		if ((enum i40e_admin_queue_err)retval == I40E_AQ_RC_OK)

		if ((enum iavf_admin_queue_err)retval == IAVF_AQ_RC_OK)

			status = 0;

		else if ((enum i40e_admin_queue_err)retval == I40E_AQ_RC_EBUSY)

		else if ((enum iavf_admin_queue_err)retval == IAVF_AQ_RC_EBUSY)

			status = I40E_ERR_NOT_READY;

		else

			status = I40E_ERR_ADMIN_QUEUE_ERROR;

		hw->aq.asq_last_status = (enum i40e_admin_queue_err)retval;

		hw->aq.asq_last_status = (enum iavf_admin_queue_err)retval;

	}



	iavf_debug(hw, IAVF_DEBUG_AQ_MESSAGE,
@@ -824,12 +824,12 @@ enum iavf_status iavf_asq_send_command(struct iavf_hw *hw, 
 *

 *  Fill the desc with default values

 **/

void iavf_fill_default_direct_cmd_desc(struct i40e_aq_desc *desc, u16 opcode)

void iavf_fill_default_direct_cmd_desc(struct iavf_aq_desc *desc, u16 opcode)

{

	/* zero out the desc */

	memset((void *)desc, 0, sizeof(struct i40e_aq_desc));

	memset((void *)desc, 0, sizeof(struct iavf_aq_desc));

	desc->opcode = cpu_to_le16(opcode);

	desc->flags = cpu_to_le16(I40E_AQ_FLAG_SI);

	desc->flags = cpu_to_le16(IAVF_AQ_FLAG_SI);

}



/**
@@ -843,11 +843,11 @@ void iavf_fill_default_direct_cmd_desc(struct i40e_aq_desc *desc, u16 opcode) 
 *  left to process through 'pending'

 **/

enum iavf_status iavf_clean_arq_element(struct iavf_hw *hw,

					struct i40e_arq_event_info *e,

					struct iavf_arq_event_info *e,

					u16 *pending)

{

	u16 ntc = hw->aq.arq.next_to_clean;

	struct i40e_aq_desc *desc;

	struct iavf_aq_desc *desc;

	enum iavf_status ret_code = 0;

	struct iavf_dma_mem *bi;

	u16 desc_idx;
@@ -881,9 +881,9 @@ enum iavf_status iavf_clean_arq_element(struct iavf_hw *hw, 
	desc_idx = ntc;



	hw->aq.arq_last_status =

		(enum i40e_admin_queue_err)le16_to_cpu(desc->retval);

		(enum iavf_admin_queue_err)le16_to_cpu(desc->retval);

	flags = le16_to_cpu(desc->flags);

	if (flags & I40E_AQ_FLAG_ERR) {

	if (flags & IAVF_AQ_FLAG_ERR) {

		ret_code = I40E_ERR_ADMIN_QUEUE_ERROR;

		iavf_debug(hw,

			   IAVF_DEBUG_AQ_MESSAGE,
@@ -907,11 +907,11 @@ enum iavf_status iavf_clean_arq_element(struct iavf_hw *hw, 
	 * size

	 */

	bi = &hw->aq.arq.r.arq_bi[ntc];

	memset((void *)desc, 0, sizeof(struct i40e_aq_desc));

	memset((void *)desc, 0, sizeof(struct iavf_aq_desc));



	desc->flags = cpu_to_le16(I40E_AQ_FLAG_BUF);

	if (hw->aq.arq_buf_size > I40E_AQ_LARGE_BUF)

		desc->flags |= cpu_to_le16(I40E_AQ_FLAG_LB);

	desc->flags = cpu_to_le16(IAVF_AQ_FLAG_BUF);

	if (hw->aq.arq_buf_size > IAVF_AQ_LARGE_BUF)

		desc->flags |= cpu_to_le16(IAVF_AQ_FLAG_LB);

	desc->datalen = cpu_to_le16((u16)bi->size);

	desc->params.external.addr_high = cpu_to_le32(upper_32_bits(bi->pa));

	desc->params.external.addr_low = cpu_to_le32(lower_32_bits(bi->pa));

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

+36 −36
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include "iavf_adminq_cmd.h"



#define IAVF_ADMINQ_DESC(R, i)   \

	(&(((struct i40e_aq_desc *)((R).desc_buf.va))[i]))

	(&(((struct iavf_aq_desc *)((R).desc_buf.va))[i]))



#define IAVF_ADMINQ_DESC_ALIGNMENT 4096
@@ -39,22 +39,22 @@ struct iavf_adminq_ring { 
};



/* ASQ transaction details */

struct i40e_asq_cmd_details {

	void *callback; /* cast from type I40E_ADMINQ_CALLBACK */

struct iavf_asq_cmd_details {

	void *callback; /* cast from type IAVF_ADMINQ_CALLBACK */

	u64 cookie;

	u16 flags_ena;

	u16 flags_dis;

	bool async;

	bool postpone;

	struct i40e_aq_desc *wb_desc;

	struct iavf_aq_desc *wb_desc;

};



#define I40E_ADMINQ_DETAILS(R, i)   \

	(&(((struct i40e_asq_cmd_details *)((R).cmd_buf.va))[i]))

#define IAVF_ADMINQ_DETAILS(R, i)   \

	(&(((struct iavf_asq_cmd_details *)((R).cmd_buf.va))[i]))



/* ARQ event information */

struct i40e_arq_event_info {

	struct i40e_aq_desc desc;

struct iavf_arq_event_info {

	struct iavf_aq_desc desc;

	u16 msg_len;

	u16 buf_len;

	u8 *msg_buf;
@@ -79,8 +79,8 @@ struct iavf_adminq_info { 
	struct mutex arq_mutex; /* Receive queue lock */



	/* last status values on send and receive queues */

	enum i40e_admin_queue_err asq_last_status;

	enum i40e_admin_queue_err arq_last_status;

	enum iavf_admin_queue_err asq_last_status;

	enum iavf_admin_queue_err arq_last_status;

};



/**
@@ -91,29 +91,29 @@ struct iavf_adminq_info { 
static inline int i40e_aq_rc_to_posix(int aq_ret, int aq_rc)

{

	int aq_to_posix[] = {

		0,           /* I40E_AQ_RC_OK */

		-EPERM,      /* I40E_AQ_RC_EPERM */

		-ENOENT,     /* I40E_AQ_RC_ENOENT */

		-ESRCH,      /* I40E_AQ_RC_ESRCH */

		-EINTR,      /* I40E_AQ_RC_EINTR */

		-EIO,        /* I40E_AQ_RC_EIO */

		-ENXIO,      /* I40E_AQ_RC_ENXIO */

		-E2BIG,      /* I40E_AQ_RC_E2BIG */

		-EAGAIN,     /* I40E_AQ_RC_EAGAIN */

		-ENOMEM,     /* I40E_AQ_RC_ENOMEM */

		-EACCES,     /* I40E_AQ_RC_EACCES */

		-EFAULT,     /* I40E_AQ_RC_EFAULT */

		-EBUSY,      /* I40E_AQ_RC_EBUSY */

		-EEXIST,     /* I40E_AQ_RC_EEXIST */

		-EINVAL,     /* I40E_AQ_RC_EINVAL */

		-ENOTTY,     /* I40E_AQ_RC_ENOTTY */

		-ENOSPC,     /* I40E_AQ_RC_ENOSPC */

		-ENOSYS,     /* I40E_AQ_RC_ENOSYS */

		-ERANGE,     /* I40E_AQ_RC_ERANGE */

		-EPIPE,      /* I40E_AQ_RC_EFLUSHED */

		-ESPIPE,     /* I40E_AQ_RC_BAD_ADDR */

		-EROFS,      /* I40E_AQ_RC_EMODE */

		-EFBIG,      /* I40E_AQ_RC_EFBIG */

		0,           /* IAVF_AQ_RC_OK */

		-EPERM,      /* IAVF_AQ_RC_EPERM */

		-ENOENT,     /* IAVF_AQ_RC_ENOENT */

		-ESRCH,      /* IAVF_AQ_RC_ESRCH */

		-EINTR,      /* IAVF_AQ_RC_EINTR */

		-EIO,        /* IAVF_AQ_RC_EIO */

		-ENXIO,      /* IAVF_AQ_RC_ENXIO */

		-E2BIG,      /* IAVF_AQ_RC_E2BIG */

		-EAGAIN,     /* IAVF_AQ_RC_EAGAIN */

		-ENOMEM,     /* IAVF_AQ_RC_ENOMEM */

		-EACCES,     /* IAVF_AQ_RC_EACCES */

		-EFAULT,     /* IAVF_AQ_RC_EFAULT */

		-EBUSY,      /* IAVF_AQ_RC_EBUSY */

		-EEXIST,     /* IAVF_AQ_RC_EEXIST */

		-EINVAL,     /* IAVF_AQ_RC_EINVAL */

		-ENOTTY,     /* IAVF_AQ_RC_ENOTTY */

		-ENOSPC,     /* IAVF_AQ_RC_ENOSPC */

		-ENOSYS,     /* IAVF_AQ_RC_ENOSYS */

		-ERANGE,     /* IAVF_AQ_RC_ERANGE */

		-EPIPE,      /* IAVF_AQ_RC_EFLUSHED */

		-ESPIPE,     /* IAVF_AQ_RC_BAD_ADDR */

		-EROFS,      /* IAVF_AQ_RC_EMODE */

		-EFBIG,      /* IAVF_AQ_RC_EFBIG */

	};



	/* aq_rc is invalid if AQ timed out */
@@ -127,9 +127,9 @@ static inline int i40e_aq_rc_to_posix(int aq_ret, int aq_rc) 
}



/* general information */

#define I40E_AQ_LARGE_BUF	512

#define I40E_ASQ_CMD_TIMEOUT	250000  /* usecs */

#define IAVF_AQ_LARGE_BUF	512

#define IAVF_ASQ_CMD_TIMEOUT	250000  /* usecs */



void iavf_fill_default_direct_cmd_desc(struct i40e_aq_desc *desc, u16 opcode);

void iavf_fill_default_direct_cmd_desc(struct iavf_aq_desc *desc, u16 opcode);



#endif /* _IAVF_ADMINQ_H_ */

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

+327 −329

File changed.

Preview size limit exceeded, changes collapsed.

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

+91 −91
Original line number Diff line number Diff line
@@ -44,55 +44,55 @@ enum iavf_status iavf_set_mac_type(struct iavf_hw *hw) 
 * @hw: pointer to the HW structure

 * @aq_err: the AQ error code to convert

 **/

const char *iavf_aq_str(struct iavf_hw *hw, enum i40e_admin_queue_err aq_err)

const char *iavf_aq_str(struct iavf_hw *hw, enum iavf_admin_queue_err aq_err)

{

	switch (aq_err) {

	case I40E_AQ_RC_OK:

	case IAVF_AQ_RC_OK:

		return "OK";

	case I40E_AQ_RC_EPERM:

		return "I40E_AQ_RC_EPERM";

	case I40E_AQ_RC_ENOENT:

		return "I40E_AQ_RC_ENOENT";

	case I40E_AQ_RC_ESRCH:

		return "I40E_AQ_RC_ESRCH";

	case I40E_AQ_RC_EINTR:

		return "I40E_AQ_RC_EINTR";

	case I40E_AQ_RC_EIO:

		return "I40E_AQ_RC_EIO";

	case I40E_AQ_RC_ENXIO:

		return "I40E_AQ_RC_ENXIO";

	case I40E_AQ_RC_E2BIG:

		return "I40E_AQ_RC_E2BIG";

	case I40E_AQ_RC_EAGAIN:

		return "I40E_AQ_RC_EAGAIN";

	case I40E_AQ_RC_ENOMEM:

		return "I40E_AQ_RC_ENOMEM";

	case I40E_AQ_RC_EACCES:

		return "I40E_AQ_RC_EACCES";

	case I40E_AQ_RC_EFAULT:

		return "I40E_AQ_RC_EFAULT";

	case I40E_AQ_RC_EBUSY:

		return "I40E_AQ_RC_EBUSY";

	case I40E_AQ_RC_EEXIST:

		return "I40E_AQ_RC_EEXIST";

	case I40E_AQ_RC_EINVAL:

		return "I40E_AQ_RC_EINVAL";

	case I40E_AQ_RC_ENOTTY:

		return "I40E_AQ_RC_ENOTTY";

	case I40E_AQ_RC_ENOSPC:

		return "I40E_AQ_RC_ENOSPC";

	case I40E_AQ_RC_ENOSYS:

		return "I40E_AQ_RC_ENOSYS";

	case I40E_AQ_RC_ERANGE:

		return "I40E_AQ_RC_ERANGE";

	case I40E_AQ_RC_EFLUSHED:

		return "I40E_AQ_RC_EFLUSHED";

	case I40E_AQ_RC_BAD_ADDR:

		return "I40E_AQ_RC_BAD_ADDR";

	case I40E_AQ_RC_EMODE:

		return "I40E_AQ_RC_EMODE";

	case I40E_AQ_RC_EFBIG:

		return "I40E_AQ_RC_EFBIG";

	case IAVF_AQ_RC_EPERM:

		return "IAVF_AQ_RC_EPERM";

	case IAVF_AQ_RC_ENOENT:

		return "IAVF_AQ_RC_ENOENT";

	case IAVF_AQ_RC_ESRCH:

		return "IAVF_AQ_RC_ESRCH";

	case IAVF_AQ_RC_EINTR:

		return "IAVF_AQ_RC_EINTR";

	case IAVF_AQ_RC_EIO:

		return "IAVF_AQ_RC_EIO";

	case IAVF_AQ_RC_ENXIO:

		return "IAVF_AQ_RC_ENXIO";

	case IAVF_AQ_RC_E2BIG:

		return "IAVF_AQ_RC_E2BIG";

	case IAVF_AQ_RC_EAGAIN:

		return "IAVF_AQ_RC_EAGAIN";

	case IAVF_AQ_RC_ENOMEM:

		return "IAVF_AQ_RC_ENOMEM";

	case IAVF_AQ_RC_EACCES:

		return "IAVF_AQ_RC_EACCES";

	case IAVF_AQ_RC_EFAULT:

		return "IAVF_AQ_RC_EFAULT";

	case IAVF_AQ_RC_EBUSY:

		return "IAVF_AQ_RC_EBUSY";

	case IAVF_AQ_RC_EEXIST:

		return "IAVF_AQ_RC_EEXIST";

	case IAVF_AQ_RC_EINVAL:

		return "IAVF_AQ_RC_EINVAL";

	case IAVF_AQ_RC_ENOTTY:

		return "IAVF_AQ_RC_ENOTTY";

	case IAVF_AQ_RC_ENOSPC:

		return "IAVF_AQ_RC_ENOSPC";

	case IAVF_AQ_RC_ENOSYS:

		return "IAVF_AQ_RC_ENOSYS";

	case IAVF_AQ_RC_ERANGE:

		return "IAVF_AQ_RC_ERANGE";

	case IAVF_AQ_RC_EFLUSHED:

		return "IAVF_AQ_RC_EFLUSHED";

	case IAVF_AQ_RC_BAD_ADDR:

		return "IAVF_AQ_RC_BAD_ADDR";

	case IAVF_AQ_RC_EMODE:

		return "IAVF_AQ_RC_EMODE";

	case IAVF_AQ_RC_EFBIG:

		return "IAVF_AQ_RC_EFBIG";

	}



	snprintf(hw->err_str, sizeof(hw->err_str), "%d", aq_err);
@@ -260,7 +260,7 @@ const char *iavf_stat_str(struct iavf_hw *hw, enum iavf_status stat_err) 
void iavf_debug_aq(struct iavf_hw *hw, enum iavf_debug_mask mask, void *desc,

		   void *buffer, u16 buf_len)

{

	struct i40e_aq_desc *aq_desc = (struct i40e_aq_desc *)desc;

	struct iavf_aq_desc *aq_desc = (struct iavf_aq_desc *)desc;

	u8 *buf = (u8 *)buffer;



	if ((!(mask & hw->debug_mask)) || !desc)
@@ -329,15 +329,15 @@ bool iavf_check_asq_alive(struct iavf_hw *hw) 
 **/

enum iavf_status iavf_aq_queue_shutdown(struct iavf_hw *hw, bool unloading)

{

	struct i40e_aq_desc desc;

	struct i40e_aqc_queue_shutdown *cmd =

		(struct i40e_aqc_queue_shutdown *)&desc.params.raw;

	struct iavf_aq_desc desc;

	struct iavf_aqc_queue_shutdown *cmd =

		(struct iavf_aqc_queue_shutdown *)&desc.params.raw;

	enum iavf_status status;



	iavf_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_queue_shutdown);

	iavf_fill_default_direct_cmd_desc(&desc, iavf_aqc_opc_queue_shutdown);



	if (unloading)

		cmd->driver_unloading = cpu_to_le32(I40E_AQ_DRIVER_UNLOADING);

		cmd->driver_unloading = cpu_to_le32(IAVF_AQ_DRIVER_UNLOADING);

	status = iavf_asq_send_command(hw, &desc, NULL, 0, NULL);



	return status;
@@ -360,37 +360,37 @@ static enum iavf_status iavf_aq_get_set_rss_lut(struct iavf_hw *hw, 
						bool set)

{

	enum iavf_status status;

	struct i40e_aq_desc desc;

	struct i40e_aqc_get_set_rss_lut *cmd_resp =

		   (struct i40e_aqc_get_set_rss_lut *)&desc.params.raw;

	struct iavf_aq_desc desc;

	struct iavf_aqc_get_set_rss_lut *cmd_resp =

		   (struct iavf_aqc_get_set_rss_lut *)&desc.params.raw;



	if (set)

		iavf_fill_default_direct_cmd_desc(&desc,

						  i40e_aqc_opc_set_rss_lut);

						  iavf_aqc_opc_set_rss_lut);

	else

		iavf_fill_default_direct_cmd_desc(&desc,

						  i40e_aqc_opc_get_rss_lut);

						  iavf_aqc_opc_get_rss_lut);



	/* Indirect command */

	desc.flags |= cpu_to_le16((u16)I40E_AQ_FLAG_BUF);

	desc.flags |= cpu_to_le16((u16)I40E_AQ_FLAG_RD);

	desc.flags |= cpu_to_le16((u16)IAVF_AQ_FLAG_BUF);

	desc.flags |= cpu_to_le16((u16)IAVF_AQ_FLAG_RD);



	cmd_resp->vsi_id =

			cpu_to_le16((u16)((vsi_id <<

					  I40E_AQC_SET_RSS_LUT_VSI_ID_SHIFT) &

					  I40E_AQC_SET_RSS_LUT_VSI_ID_MASK));

	cmd_resp->vsi_id |= cpu_to_le16((u16)I40E_AQC_SET_RSS_LUT_VSI_VALID);

					  IAVF_AQC_SET_RSS_LUT_VSI_ID_SHIFT) &

					  IAVF_AQC_SET_RSS_LUT_VSI_ID_MASK));

	cmd_resp->vsi_id |= cpu_to_le16((u16)IAVF_AQC_SET_RSS_LUT_VSI_VALID);



	if (pf_lut)

		cmd_resp->flags |= cpu_to_le16((u16)

					((I40E_AQC_SET_RSS_LUT_TABLE_TYPE_PF <<

					I40E_AQC_SET_RSS_LUT_TABLE_TYPE_SHIFT) &

					I40E_AQC_SET_RSS_LUT_TABLE_TYPE_MASK));

					((IAVF_AQC_SET_RSS_LUT_TABLE_TYPE_PF <<

					IAVF_AQC_SET_RSS_LUT_TABLE_TYPE_SHIFT) &

					IAVF_AQC_SET_RSS_LUT_TABLE_TYPE_MASK));

	else

		cmd_resp->flags |= cpu_to_le16((u16)

					((I40E_AQC_SET_RSS_LUT_TABLE_TYPE_VSI <<

					I40E_AQC_SET_RSS_LUT_TABLE_TYPE_SHIFT) &

					I40E_AQC_SET_RSS_LUT_TABLE_TYPE_MASK));

					((IAVF_AQC_SET_RSS_LUT_TABLE_TYPE_VSI <<

					IAVF_AQC_SET_RSS_LUT_TABLE_TYPE_SHIFT) &

					IAVF_AQC_SET_RSS_LUT_TABLE_TYPE_MASK));



	status = iavf_asq_send_command(hw, &desc, lut, lut_size, NULL);
@@ -441,31 +441,31 @@ enum iavf_status iavf_aq_set_rss_lut(struct iavf_hw *hw, u16 vsi_id, 
 **/

static enum

iavf_status iavf_aq_get_set_rss_key(struct iavf_hw *hw, u16 vsi_id,

				    struct i40e_aqc_get_set_rss_key_data *key,

				    struct iavf_aqc_get_set_rss_key_data *key,

				    bool set)

{

	enum iavf_status status;

	struct i40e_aq_desc desc;

	struct i40e_aqc_get_set_rss_key *cmd_resp =

			(struct i40e_aqc_get_set_rss_key *)&desc.params.raw;

	u16 key_size = sizeof(struct i40e_aqc_get_set_rss_key_data);

	struct iavf_aq_desc desc;

	struct iavf_aqc_get_set_rss_key *cmd_resp =

			(struct iavf_aqc_get_set_rss_key *)&desc.params.raw;

	u16 key_size = sizeof(struct iavf_aqc_get_set_rss_key_data);



	if (set)

		iavf_fill_default_direct_cmd_desc(&desc,

						  i40e_aqc_opc_set_rss_key);

						  iavf_aqc_opc_set_rss_key);

	else

		iavf_fill_default_direct_cmd_desc(&desc,

						  i40e_aqc_opc_get_rss_key);

						  iavf_aqc_opc_get_rss_key);



	/* Indirect command */

	desc.flags |= cpu_to_le16((u16)I40E_AQ_FLAG_BUF);

	desc.flags |= cpu_to_le16((u16)I40E_AQ_FLAG_RD);

	desc.flags |= cpu_to_le16((u16)IAVF_AQ_FLAG_BUF);

	desc.flags |= cpu_to_le16((u16)IAVF_AQ_FLAG_RD);



	cmd_resp->vsi_id =

			cpu_to_le16((u16)((vsi_id <<

					  I40E_AQC_SET_RSS_KEY_VSI_ID_SHIFT) &

					  I40E_AQC_SET_RSS_KEY_VSI_ID_MASK));

	cmd_resp->vsi_id |= cpu_to_le16((u16)I40E_AQC_SET_RSS_KEY_VSI_VALID);

					  IAVF_AQC_SET_RSS_KEY_VSI_ID_SHIFT) &

					  IAVF_AQC_SET_RSS_KEY_VSI_ID_MASK));

	cmd_resp->vsi_id |= cpu_to_le16((u16)IAVF_AQC_SET_RSS_KEY_VSI_VALID);



	status = iavf_asq_send_command(hw, &desc, key, key_size, NULL);
@@ -480,7 +480,7 @@ iavf_status iavf_aq_get_set_rss_key(struct iavf_hw *hw, u16 vsi_id, 
 *

 **/

enum iavf_status iavf_aq_get_rss_key(struct iavf_hw *hw, u16 vsi_id,

				     struct i40e_aqc_get_set_rss_key_data *key)

				     struct iavf_aqc_get_set_rss_key_data *key)

{

	return iavf_aq_get_set_rss_key(hw, vsi_id, key, false);

}
@@ -494,7 +494,7 @@ enum iavf_status iavf_aq_get_rss_key(struct iavf_hw *hw, u16 vsi_id, 
 * set the RSS key per VSI

 **/

enum iavf_status iavf_aq_set_rss_key(struct iavf_hw *hw, u16 vsi_id,

				     struct i40e_aqc_get_set_rss_key_data *key)

				     struct iavf_aqc_get_set_rss_key_data *key)

{

	return iavf_aq_get_set_rss_key(hw, vsi_id, key, true);

}
@@ -881,21 +881,21 @@ enum iavf_status iavf_aq_send_msg_to_pf(struct iavf_hw *hw, 
					enum virtchnl_ops v_opcode,

					enum iavf_status v_retval,

					u8 *msg, u16 msglen,

					struct i40e_asq_cmd_details *cmd_details)

					struct iavf_asq_cmd_details *cmd_details)

{

	struct i40e_asq_cmd_details details;

	struct i40e_aq_desc desc;

	struct iavf_asq_cmd_details details;

	struct iavf_aq_desc desc;

	enum iavf_status status;



	iavf_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_send_msg_to_pf);

	desc.flags |= cpu_to_le16((u16)I40E_AQ_FLAG_SI);

	iavf_fill_default_direct_cmd_desc(&desc, iavf_aqc_opc_send_msg_to_pf);

	desc.flags |= cpu_to_le16((u16)IAVF_AQ_FLAG_SI);

	desc.cookie_high = cpu_to_le32(v_opcode);

	desc.cookie_low = cpu_to_le32(v_retval);

	if (msglen) {

		desc.flags |= cpu_to_le16((u16)(I40E_AQ_FLAG_BUF

						| I40E_AQ_FLAG_RD));

		if (msglen > I40E_AQ_LARGE_BUF)

			desc.flags |= cpu_to_le16((u16)I40E_AQ_FLAG_LB);

		desc.flags |= cpu_to_le16((u16)(IAVF_AQ_FLAG_BUF

						| IAVF_AQ_FLAG_RD));

		if (msglen > IAVF_AQ_LARGE_BUF)

			desc.flags |= cpu_to_le16((u16)IAVF_AQ_FLAG_LB);

		desc.datalen = cpu_to_le16(msglen);

	}

	if (!cmd_details) {

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

+6 −6
Original line number Diff line number Diff line
@@ -280,10 +280,10 @@ static int iavf_get_link_ksettings(struct net_device *netdev, 
	cmd->base.port = PORT_NONE;

	/* Set speed and duplex */

	switch (adapter->link_speed) {

	case I40E_LINK_SPEED_40GB:

	case IAVF_LINK_SPEED_40GB:

		cmd->base.speed = SPEED_40000;

		break;

	case I40E_LINK_SPEED_25GB:

	case IAVF_LINK_SPEED_25GB:

#ifdef SPEED_25000

		cmd->base.speed = SPEED_25000;

#else
@@ -291,16 +291,16 @@ static int iavf_get_link_ksettings(struct net_device *netdev, 
			    "Speed is 25G, display not supported by this version of ethtool.\n");

#endif

		break;

	case I40E_LINK_SPEED_20GB:

	case IAVF_LINK_SPEED_20GB:

		cmd->base.speed = SPEED_20000;

		break;

	case I40E_LINK_SPEED_10GB:

	case IAVF_LINK_SPEED_10GB:

		cmd->base.speed = SPEED_10000;

		break;

	case I40E_LINK_SPEED_1GB:

	case IAVF_LINK_SPEED_1GB:

		cmd->base.speed = SPEED_1000;

		break;

	case I40E_LINK_SPEED_100MB:

	case IAVF_LINK_SPEED_100MB:

		cmd->base.speed = SPEED_100;

		break;

	default: