Skip to content

L
linux
Commit 129cf89e authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Kirsher
Browse files
Options

iavf: rename functions and structs to new name 

This basically begins the internal portion of the rename of i40evf to iavf,
by renaming many of the functions, structs, variables and defines.

Most of the changes were made mechanically, which introduces some
alignment issues.
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent ee61022a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1665 additions and 1691 deletions
drivers/net/ethernet/intel/iavf/i40e_adminq.c
View file @ 129cf89e
...@@ -495,7 +495,7 @@ static i40e_status i40e_shutdown_arq(struct i40e_hw *hw) ...@@ -495,7 +495,7 @@ static i40e_status i40e_shutdown_arq(struct i40e_hw *hw)
} }
/** /**
* i40evf_init_adminq - main initialization routine for Admin Queue * iavf_init_adminq - main initialization routine for Admin Queue
* @hw: pointer to the hardware structure * @hw: pointer to the hardware structure
* *
* Prior to calling this function, drivers *MUST* set the following fields * Prior to calling this function, drivers *MUST* set the following fields
...@@ -505,7 +505,7 @@ static i40e_status i40e_shutdown_arq(struct i40e_hw *hw) ...@@ -505,7 +505,7 @@ static i40e_status i40e_shutdown_arq(struct i40e_hw *hw)
* - hw->aq.arq_buf_size * - hw->aq.arq_buf_size
* - hw->aq.asq_buf_size * - hw->aq.asq_buf_size
**/ **/
i40e_status i40evf_init_adminq(struct i40e_hw *hw) i40e_status iavf_init_adminq(struct i40e_hw *hw)
{ {
i40e_status ret_code; i40e_status ret_code;
...@@ -546,15 +546,15 @@ i40e_status i40evf_init_adminq(struct i40e_hw *hw) ...@@ -546,15 +546,15 @@ i40e_status i40evf_init_adminq(struct i40e_hw *hw)
} }
/** /**
* i40evf_shutdown_adminq - shutdown routine for the Admin Queue * iavf_shutdown_adminq - shutdown routine for the Admin Queue
* @hw: pointer to the hardware structure * @hw: pointer to the hardware structure
**/ **/
i40e_status i40evf_shutdown_adminq(struct i40e_hw *hw) i40e_status iavf_shutdown_adminq(struct i40e_hw *hw)
{ {
i40e_status ret_code = 0; i40e_status ret_code = 0;
if (i40evf_check_asq_alive(hw)) if (iavf_check_asq_alive(hw))
i40evf_aq_queue_shutdown(hw, true); iavf_aq_queue_shutdown(hw, true);
i40e_shutdown_asq(hw); i40e_shutdown_asq(hw);
i40e_shutdown_arq(hw); i40e_shutdown_arq(hw);
...@@ -604,13 +604,13 @@ static u16 i40e_clean_asq(struct i40e_hw *hw) ...@@ -604,13 +604,13 @@ static u16 i40e_clean_asq(struct i40e_hw *hw)
} }
/** /**
* i40evf_asq_done - check if FW has processed the Admin Send Queue * iavf_asq_done - check if FW has processed the Admin Send Queue
* @hw: pointer to the hw struct * @hw: pointer to the hw struct
* *
* Returns true if the firmware has processed all descriptors on the * Returns true if the firmware has processed all descriptors on the
* admin send queue. Returns false if there are still requests pending. * admin send queue. Returns false if there are still requests pending.
**/ **/
bool i40evf_asq_done(struct i40e_hw *hw) bool iavf_asq_done(struct i40e_hw *hw)
{ {
/* AQ designers suggest use of head for better /* AQ designers suggest use of head for better
* timing reliability than DD bit * timing reliability than DD bit
...@@ -620,7 +620,7 @@ bool i40evf_asq_done(struct i40e_hw *hw) ...@@ -620,7 +620,7 @@ bool i40evf_asq_done(struct i40e_hw *hw)
} }
/** /**
* i40evf_asq_send_command - send command to Admin Queue * iavf_asq_send_command - send command to Admin Queue
* @hw: pointer to the hw struct * @hw: pointer to the hw struct
* @desc: prefilled descriptor describing the command (non DMA mem) * @desc: prefilled descriptor describing the command (non DMA mem)
* @buff: buffer to use for indirect commands * @buff: buffer to use for indirect commands
...@@ -630,11 +630,11 @@ bool i40evf_asq_done(struct i40e_hw *hw) ...@@ -630,11 +630,11 @@ bool i40evf_asq_done(struct i40e_hw *hw)
* This is the main send command driver routine for the Admin Queue send * This is the main send command driver routine for the Admin Queue send
* queue. It runs the queue, cleans the queue, etc * queue. It runs the queue, cleans the queue, etc
**/ **/
i40e_status i40evf_asq_send_command(struct i40e_hw *hw, i40e_status iavf_asq_send_command(struct i40e_hw *hw,
struct i40e_aq_desc *desc, struct i40e_aq_desc *desc,
void *buff, /* can be NULL */ void *buff, /* can be NULL */
u16 buff_size, u16 buff_size,
struct i40e_asq_cmd_details *cmd_details) struct i40e_asq_cmd_details *cmd_details)
{ {
i40e_status status = 0; i40e_status status = 0;
struct i40e_dma_mem *dma_buff = NULL; struct i40e_dma_mem *dma_buff = NULL;
...@@ -741,8 +741,8 @@ i40e_status i40evf_asq_send_command(struct i40e_hw *hw, ...@@ -741,8 +741,8 @@ i40e_status i40evf_asq_send_command(struct i40e_hw *hw,
/* bump the tail */ /* bump the tail */
i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE, "AQTX: desc and buffer:\n"); i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE, "AQTX: desc and buffer:\n");
i40evf_debug_aq(hw, I40E_DEBUG_AQ_COMMAND, (void *)desc_on_ring, iavf_debug_aq(hw, I40E_DEBUG_AQ_COMMAND, (void *)desc_on_ring,
buff, buff_size); buff, buff_size);
(hw->aq.asq.next_to_use)++; (hw->aq.asq.next_to_use)++;
if (hw->aq.asq.next_to_use == hw->aq.asq.count) if (hw->aq.asq.next_to_use == hw->aq.asq.count)
hw->aq.asq.next_to_use = 0; hw->aq.asq.next_to_use = 0;
...@@ -759,7 +759,7 @@ i40e_status i40evf_asq_send_command(struct i40e_hw *hw, ...@@ -759,7 +759,7 @@ i40e_status i40evf_asq_send_command(struct i40e_hw *hw,
/* AQ designers suggest use of head for better /* AQ designers suggest use of head for better
* timing reliability than DD bit * timing reliability than DD bit
*/ */
if (i40evf_asq_done(hw)) if (iavf_asq_done(hw))
break; break;
udelay(50); udelay(50);
total_delay += 50; total_delay += 50;
...@@ -767,7 +767,7 @@ i40e_status i40evf_asq_send_command(struct i40e_hw *hw, ...@@ -767,7 +767,7 @@ i40e_status i40evf_asq_send_command(struct i40e_hw *hw,
} }
/* if ready, copy the desc back to temp */ /* if ready, copy the desc back to temp */
if (i40evf_asq_done(hw)) { if (iavf_asq_done(hw)) {
*desc = *desc_on_ring; *desc = *desc_on_ring;
if (buff != NULL) if (buff != NULL)
memcpy(buff, dma_buff->va, buff_size); memcpy(buff, dma_buff->va, buff_size);
...@@ -793,8 +793,8 @@ i40e_status i40evf_asq_send_command(struct i40e_hw *hw, ...@@ -793,8 +793,8 @@ i40e_status i40evf_asq_send_command(struct i40e_hw *hw,
i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE, i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE,
"AQTX: desc and buffer writeback:\n"); "AQTX: desc and buffer writeback:\n");
i40evf_debug_aq(hw, I40E_DEBUG_AQ_COMMAND, (void *)desc, buff, iavf_debug_aq(hw, I40E_DEBUG_AQ_COMMAND, (void *)desc, buff,
buff_size); buff_size);
/* save writeback aq if requested */ /* save writeback aq if requested */
if (details->wb_desc) if (details->wb_desc)
...@@ -820,13 +820,13 @@ i40e_status i40evf_asq_send_command(struct i40e_hw *hw, ...@@ -820,13 +820,13 @@ i40e_status i40evf_asq_send_command(struct i40e_hw *hw,
} }
/** /**
* i40evf_fill_default_direct_cmd_desc - AQ descriptor helper function * iavf_fill_default_direct_cmd_desc - AQ descriptor helper function
* @desc: pointer to the temp descriptor (non DMA mem) * @desc: pointer to the temp descriptor (non DMA mem)
* @opcode: the opcode can be used to decide which flags to turn off or on * @opcode: the opcode can be used to decide which flags to turn off or on
* *
* Fill the desc with default values * Fill the desc with default values
**/ **/
void i40evf_fill_default_direct_cmd_desc(struct i40e_aq_desc *desc, void iavf_fill_default_direct_cmd_desc(struct i40e_aq_desc *desc,
u16 opcode) u16 opcode)
{ {
/* zero out the desc */ /* zero out the desc */
...@@ -836,7 +836,7 @@ void i40evf_fill_default_direct_cmd_desc(struct i40e_aq_desc *desc, ...@@ -836,7 +836,7 @@ void i40evf_fill_default_direct_cmd_desc(struct i40e_aq_desc *desc,
} }
/** /**
* i40evf_clean_arq_element * iavf_clean_arq_element
* @hw: pointer to the hw struct * @hw: pointer to the hw struct
* @e: event info from the receive descriptor, includes any buffers * @e: event info from the receive descriptor, includes any buffers
* @pending: number of events that could be left to process * @pending: number of events that could be left to process
...@@ -845,9 +845,9 @@ void i40evf_fill_default_direct_cmd_desc(struct i40e_aq_desc *desc, ...@@ -845,9 +845,9 @@ void i40evf_fill_default_direct_cmd_desc(struct i40e_aq_desc *desc,
* the contents through e. It can also return how many events are * the contents through e. It can also return how many events are
* left to process through 'pending' * left to process through 'pending'
**/ **/
i40e_status i40evf_clean_arq_element(struct i40e_hw *hw, i40e_status iavf_clean_arq_element(struct i40e_hw *hw,
struct i40e_arq_event_info *e, struct i40e_arq_event_info *e,
u16 *pending) u16 *pending)
{ {
i40e_status ret_code = 0; i40e_status ret_code = 0;
u16 ntc = hw->aq.arq.next_to_clean; u16 ntc = hw->aq.arq.next_to_clean;
...@@ -902,8 +902,8 @@ i40e_status i40evf_clean_arq_element(struct i40e_hw *hw, ...@@ -902,8 +902,8 @@ i40e_status i40evf_clean_arq_element(struct i40e_hw *hw,
e->msg_len); e->msg_len);
i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE, "AQRX: desc and buffer:\n"); i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE, "AQRX: desc and buffer:\n");
i40evf_debug_aq(hw, I40E_DEBUG_AQ_COMMAND, (void *)desc, e->msg_buf, iavf_debug_aq(hw, I40E_DEBUG_AQ_COMMAND, (void *)desc, e->msg_buf,
hw->aq.arq_buf_size); hw->aq.arq_buf_size);
/* Restore the original datalen and buffer address in the desc, /* Restore the original datalen and buffer address in the desc,
* FW updates datalen to indicate the event message * FW updates datalen to indicate the event message
......
drivers/net/ethernet/intel/iavf/i40e_adminq.h
View file @ 129cf89e
...@@ -130,7 +130,6 @@ static inline int i40e_aq_rc_to_posix(int aq_ret, int aq_rc) ...@@ -130,7 +130,6 @@ static inline int i40e_aq_rc_to_posix(int aq_ret, int aq_rc)
#define I40E_AQ_LARGE_BUF 512 #define I40E_AQ_LARGE_BUF 512
#define I40E_ASQ_CMD_TIMEOUT 250000 /* usecs */ #define I40E_ASQ_CMD_TIMEOUT 250000 /* usecs */
void i40evf_fill_default_direct_cmd_desc(struct i40e_aq_desc *desc, void iavf_fill_default_direct_cmd_desc(struct i40e_aq_desc *desc, u16 opcode);
u16 opcode);
#endif /* _I40E_ADMINQ_H_ */ #endif /* _I40E_ADMINQ_H_ */
drivers/net/ethernet/intel/iavf/i40e_osdep.h
View file @ 129cf89e
...@@ -34,18 +34,18 @@ struct i40e_dma_mem { ...@@ -34,18 +34,18 @@ struct i40e_dma_mem {
}; };
#define i40e_allocate_dma_mem(h, m, unused, s, a) \ #define i40e_allocate_dma_mem(h, m, unused, s, a) \
i40evf_allocate_dma_mem_d(h, m, s, a) iavf_allocate_dma_mem_d(h, m, s, a)
#define i40e_free_dma_mem(h, m) i40evf_free_dma_mem_d(h, m) #define i40e_free_dma_mem(h, m) iavf_free_dma_mem_d(h, m)
struct i40e_virt_mem { struct i40e_virt_mem {
void *va; void *va;
u32 size; u32 size;
}; };
#define i40e_allocate_virt_mem(h, m, s) i40evf_allocate_virt_mem_d(h, m, s) #define i40e_allocate_virt_mem(h, m, s) iavf_allocate_virt_mem_d(h, m, s)
#define i40e_free_virt_mem(h, m) i40evf_free_virt_mem_d(h, m) #define i40e_free_virt_mem(h, m) iavf_free_virt_mem_d(h, m)
#define i40e_debug(h, m, s, ...) i40evf_debug_d(h, m, s, ##__VA_ARGS__) #define i40e_debug(h, m, s, ...) iavf_debug_d(h, m, s, ##__VA_ARGS__)
extern void i40evf_debug_d(void *hw, u32 mask, char *fmt_str, ...) extern void iavf_debug_d(void *hw, u32 mask, char *fmt_str, ...)
__attribute__ ((format(gnu_printf, 3, 4))); __attribute__ ((format(gnu_printf, 3, 4)));
typedef enum i40e_status_code i40e_status; typedef enum i40e_status_code i40e_status;
......
drivers/net/ethernet/intel/iavf/i40e_prototype.h
View file @ 129cf89e
...@@ -16,55 +16,53 @@ ...@@ -16,55 +16,53 @@
*/ */
/* adminq functions */ /* adminq functions */
i40e_status i40evf_init_adminq(struct i40e_hw *hw); i40e_status iavf_init_adminq(struct i40e_hw *hw);
i40e_status i40evf_shutdown_adminq(struct i40e_hw *hw); i40e_status iavf_shutdown_adminq(struct i40e_hw *hw);
void i40e_adminq_init_ring_data(struct i40e_hw *hw); void i40e_adminq_init_ring_data(struct i40e_hw *hw);
i40e_status i40evf_clean_arq_element(struct i40e_hw *hw, i40e_status iavf_clean_arq_element(struct i40e_hw *hw,
struct i40e_arq_event_info *e, struct i40e_arq_event_info *e,
u16 *events_pending); u16 *events_pending);
i40e_status i40evf_asq_send_command(struct i40e_hw *hw, i40e_status iavf_asq_send_command(struct i40e_hw *hw,
struct i40e_aq_desc *desc, struct i40e_aq_desc *desc,
void *buff, /* can be NULL */ void *buff, /* can be NULL */
u16 buff_size, u16 buff_size,
struct i40e_asq_cmd_details *cmd_details); struct i40e_asq_cmd_details *cmd_details);
bool i40evf_asq_done(struct i40e_hw *hw); bool iavf_asq_done(struct i40e_hw *hw);
/* debug function for adminq */ /* debug function for adminq */
void i40evf_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void iavf_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask,
void *desc, void *buffer, u16 buf_len); void *desc, void *buffer, u16 buf_len);
void i40e_idle_aq(struct i40e_hw *hw); void i40e_idle_aq(struct i40e_hw *hw);
void i40evf_resume_aq(struct i40e_hw *hw); void iavf_resume_aq(struct i40e_hw *hw);
bool i40evf_check_asq_alive(struct i40e_hw *hw); bool iavf_check_asq_alive(struct i40e_hw *hw);
i40e_status i40evf_aq_queue_shutdown(struct i40e_hw *hw, bool unloading); i40e_status iavf_aq_queue_shutdown(struct i40e_hw *hw, bool unloading);
const char *i40evf_aq_str(struct i40e_hw *hw, enum i40e_admin_queue_err aq_err); const char *iavf_aq_str(struct i40e_hw *hw, enum i40e_admin_queue_err aq_err);
const char *i40evf_stat_str(struct i40e_hw *hw, i40e_status stat_err); const char *iavf_stat_str(struct i40e_hw *hw, i40e_status stat_err);
i40e_status i40evf_aq_get_rss_lut(struct i40e_hw *hw, u16 seid, i40e_status iavf_aq_get_rss_lut(struct i40e_hw *hw, u16 seid,
bool pf_lut, u8 *lut, u16 lut_size); bool pf_lut, u8 *lut, u16 lut_size);
i40e_status i40evf_aq_set_rss_lut(struct i40e_hw *hw, u16 seid, i40e_status iavf_aq_set_rss_lut(struct i40e_hw *hw, u16 seid,
bool pf_lut, u8 *lut, u16 lut_size); bool pf_lut, u8 *lut, u16 lut_size);
i40e_status i40evf_aq_get_rss_key(struct i40e_hw *hw, i40e_status iavf_aq_get_rss_key(struct i40e_hw *hw, u16 seid,
u16 seid, struct i40e_aqc_get_set_rss_key_data *key);
struct i40e_aqc_get_set_rss_key_data *key); i40e_status iavf_aq_set_rss_key(struct i40e_hw *hw, u16 seid,
i40e_status i40evf_aq_set_rss_key(struct i40e_hw *hw, struct i40e_aqc_get_set_rss_key_data *key);
u16 seid,
struct i40e_aqc_get_set_rss_key_data *key);
i40e_status i40e_set_mac_type(struct i40e_hw *hw); i40e_status i40e_set_mac_type(struct i40e_hw *hw);
extern struct i40e_rx_ptype_decoded i40evf_ptype_lookup[]; extern struct i40e_rx_ptype_decoded iavf_ptype_lookup[];
static inline struct i40e_rx_ptype_decoded decode_rx_desc_ptype(u8 ptype) static inline struct i40e_rx_ptype_decoded decode_rx_desc_ptype(u8 ptype)
{ {
return i40evf_ptype_lookup[ptype]; return iavf_ptype_lookup[ptype];
} }
/* i40e_common for VF drivers*/ /* i40e_common for VF drivers*/
void i40e_vf_parse_hw_config(struct i40e_hw *hw, void iavf_vf_parse_hw_config(struct i40e_hw *hw,
struct virtchnl_vf_resource *msg); struct virtchnl_vf_resource *msg);
i40e_status i40e_vf_reset(struct i40e_hw *hw); i40e_status iavf_vf_reset(struct i40e_hw *hw);
i40e_status i40e_aq_send_msg_to_pf(struct i40e_hw *hw, i40e_status iavf_aq_send_msg_to_pf(struct i40e_hw *hw,
enum virtchnl_ops v_opcode, enum virtchnl_ops v_opcode,
i40e_status v_retval, u8 *msg, u16 msglen, i40e_status v_retval, u8 *msg, u16 msglen,
struct i40e_asq_cmd_details *cmd_details); struct i40e_asq_cmd_details *cmd_details);
......
drivers/net/ethernet/intel/iavf/i40e_trace.h
View file @ 129cf89e
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
/* Modeled on trace-events-sample.h */ /* Modeled on trace-events-sample.h */
/* The trace subsystem name for i40evf will be "i40evf". /* The trace subsystem name for iavf will be "iavf".
* *
* This file is named i40e_trace.h. * This file is named i40e_trace.h.
* *
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
* of this file. * of this file.
*/ */
#undef TRACE_SYSTEM #undef TRACE_SYSTEM
#define TRACE_SYSTEM i40evf #define TRACE_SYSTEM iavf
/* See trace-events-sample.h for a detailed description of why this /* See trace-events-sample.h for a detailed description of why this
* guard clause is different from most normal include files. * guard clause is different from most normal include files.
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
* Similarly, i40e_trace_enabled(trace_name) wraps references to * Similarly, i40e_trace_enabled(trace_name) wraps references to
* trace_i40e{,vf}_<trace_name>_enabled() functions. * trace_i40e{,vf}_<trace_name>_enabled() functions.
*/ */
#define _I40E_TRACE_NAME(trace_name) (trace_ ## i40evf ## _ ## trace_name) #define _I40E_TRACE_NAME(trace_name) (trace_ ## iavf ## _ ## trace_name)
#define I40E_TRACE_NAME(trace_name) _I40E_TRACE_NAME(trace_name) #define I40E_TRACE_NAME(trace_name) _I40E_TRACE_NAME(trace_name)
#define i40e_trace(trace_name, args...) I40E_TRACE_NAME(trace_name)(args) #define i40e_trace(trace_name, args...) I40E_TRACE_NAME(trace_name)(args)
...@@ -50,14 +50,14 @@ ...@@ -50,14 +50,14 @@
#define i40e_trace_enabled(trace_name) I40E_TRACE_NAME(trace_name##_enabled)() #define i40e_trace_enabled(trace_name) I40E_TRACE_NAME(trace_name##_enabled)()
/* Events common to PF and VF. Corresponding versions will be defined /* Events common to PF and VF. Corresponding versions will be defined
* for both, named trace_i40e_* and trace_i40evf_*. The i40e_trace() * for both, named trace_i40e_* and trace_iavf_*. The i40e_trace()
* macro above will select the right trace point name for the driver * macro above will select the right trace point name for the driver
* being built from shared code. * being built from shared code.
*/ */
/* Events related to a vsi & ring */ /* Events related to a vsi & ring */
DECLARE_EVENT_CLASS( DECLARE_EVENT_CLASS(
i40evf_tx_template, iavf_tx_template,
TP_PROTO(struct i40e_ring *ring, TP_PROTO(struct i40e_ring *ring,
struct i40e_tx_desc *desc, struct i40e_tx_desc *desc,
...@@ -93,7 +93,7 @@ DECLARE_EVENT_CLASS( ...@@ -93,7 +93,7 @@ DECLARE_EVENT_CLASS(
); );
DEFINE_EVENT( DEFINE_EVENT(
i40evf_tx_template, i40evf_clean_tx_irq, iavf_tx_template, iavf_clean_tx_irq,
TP_PROTO(struct i40e_ring *ring, TP_PROTO(struct i40e_ring *ring,
struct i40e_tx_desc *desc, struct i40e_tx_desc *desc,
struct i40e_tx_buffer *buf), struct i40e_tx_buffer *buf),
...@@ -101,7 +101,7 @@ DEFINE_EVENT( ...@@ -101,7 +101,7 @@ DEFINE_EVENT(
TP_ARGS(ring, desc, buf)); TP_ARGS(ring, desc, buf));
DEFINE_EVENT( DEFINE_EVENT(
i40evf_tx_template, i40evf_clean_tx_irq_unmap, iavf_tx_template, iavf_clean_tx_irq_unmap,
TP_PROTO(struct i40e_ring *ring, TP_PROTO(struct i40e_ring *ring,
struct i40e_tx_desc *desc, struct i40e_tx_desc *desc,
struct i40e_tx_buffer *buf), struct i40e_tx_buffer *buf),
...@@ -109,7 +109,7 @@ DEFINE_EVENT( ...@@ -109,7 +109,7 @@ DEFINE_EVENT(
TP_ARGS(ring, desc, buf)); TP_ARGS(ring, desc, buf));
DECLARE_EVENT_CLASS( DECLARE_EVENT_CLASS(
i40evf_rx_template, iavf_rx_template,
TP_PROTO(struct i40e_ring *ring, TP_PROTO(struct i40e_ring *ring,
union i40e_32byte_rx_desc *desc, union i40e_32byte_rx_desc *desc,
...@@ -138,7 +138,7 @@ DECLARE_EVENT_CLASS( ...@@ -138,7 +138,7 @@ DECLARE_EVENT_CLASS(
); );
DEFINE_EVENT( DEFINE_EVENT(
i40evf_rx_template, i40evf_clean_rx_irq, iavf_rx_template, iavf_clean_rx_irq,
TP_PROTO(struct i40e_ring *ring, TP_PROTO(struct i40e_ring *ring,
union i40e_32byte_rx_desc *desc, union i40e_32byte_rx_desc *desc,
struct sk_buff *skb), struct sk_buff *skb),
...@@ -146,7 +146,7 @@ DEFINE_EVENT( ...@@ -146,7 +146,7 @@ DEFINE_EVENT(
TP_ARGS(ring, desc, skb)); TP_ARGS(ring, desc, skb));
DEFINE_EVENT( DEFINE_EVENT(
i40evf_rx_template, i40evf_clean_rx_irq_rx, iavf_rx_template, iavf_clean_rx_irq_rx,
TP_PROTO(struct i40e_ring *ring, TP_PROTO(struct i40e_ring *ring,
union i40e_32byte_rx_desc *desc, union i40e_32byte_rx_desc *desc,
struct sk_buff *skb), struct sk_buff *skb),
...@@ -154,7 +154,7 @@ DEFINE_EVENT( ...@@ -154,7 +154,7 @@ DEFINE_EVENT(
TP_ARGS(ring, desc, skb)); TP_ARGS(ring, desc, skb));
DECLARE_EVENT_CLASS( DECLARE_EVENT_CLASS(
i40evf_xmit_template, iavf_xmit_template,
TP_PROTO(struct sk_buff *skb, TP_PROTO(struct sk_buff *skb,
struct i40e_ring *ring), struct i40e_ring *ring),
...@@ -180,14 +180,14 @@ DECLARE_EVENT_CLASS( ...@@ -180,14 +180,14 @@ DECLARE_EVENT_CLASS(
); );
DEFINE_EVENT( DEFINE_EVENT(
i40evf_xmit_template, i40evf_xmit_frame_ring, iavf_xmit_template, iavf_xmit_frame_ring,
TP_PROTO(struct sk_buff *skb, TP_PROTO(struct sk_buff *skb,
struct i40e_ring *ring), struct i40e_ring *ring),
TP_ARGS(skb, ring)); TP_ARGS(skb, ring));
DEFINE_EVENT( DEFINE_EVENT(
i40evf_xmit_template, i40evf_xmit_frame_ring_drop, iavf_xmit_template, iavf_xmit_frame_ring_drop,
TP_PROTO(struct sk_buff *skb, TP_PROTO(struct sk_buff *skb,
struct i40e_ring *ring), struct i40e_ring *ring),
......
drivers/net/ethernet/intel/iavf/i40e_txrx.c
View file @ 129cf89e
This diff is collapsed.
drivers/net/ethernet/intel/iavf/i40e_txrx.h
View file @ 129cf89e
...@@ -380,12 +380,12 @@ struct i40e_ring { ...@@ -380,12 +380,12 @@ struct i40e_ring {
struct rcu_head rcu; /* to avoid race on free */ struct rcu_head rcu; /* to avoid race on free */
u16 next_to_alloc; u16 next_to_alloc;
struct sk_buff *skb; /* When i40evf_clean_rx_ring_irq() must struct sk_buff *skb; /* When iavf_clean_rx_ring_irq() must
* return before it sees the EOP for * return before it sees the EOP for
* the current packet, we save that skb * the current packet, we save that skb
* here and resume receiving this * here and resume receiving this
* packet the next time * packet the next time
* i40evf_clean_rx_ring_irq() is called * iavf_clean_rx_ring_irq() is called
* for this ring. * for this ring.
*/ */
} ____cacheline_internodealigned_in_smp; } ____cacheline_internodealigned_in_smp;
...@@ -437,20 +437,20 @@ static inline unsigned int i40e_rx_pg_order(struct i40e_ring *ring) ...@@ -437,20 +437,20 @@ static inline unsigned int i40e_rx_pg_order(struct i40e_ring *ring)
#define i40e_rx_pg_size(_ring) (PAGE_SIZE << i40e_rx_pg_order(_ring)) #define i40e_rx_pg_size(_ring) (PAGE_SIZE << i40e_rx_pg_order(_ring))
bool i40evf_alloc_rx_buffers(struct i40e_ring *rxr, u16 cleaned_count); bool iavf_alloc_rx_buffers(struct i40e_ring *rxr, u16 cleaned_count);
netdev_tx_t i40evf_xmit_frame(struct sk_buff *skb, struct net_device *netdev); netdev_tx_t iavf_xmit_frame(struct sk_buff *skb, struct net_device *netdev);
void i40evf_clean_tx_ring(struct i40e_ring *tx_ring); void iavf_clean_tx_ring(struct i40e_ring *tx_ring);
void i40evf_clean_rx_ring(struct i40e_ring *rx_ring); void iavf_clean_rx_ring(struct i40e_ring *rx_ring);
int i40evf_setup_tx_descriptors(struct i40e_ring *tx_ring); int iavf_setup_tx_descriptors(struct i40e_ring *tx_ring);
int i40evf_setup_rx_descriptors(struct i40e_ring *rx_ring); int iavf_setup_rx_descriptors(struct i40e_ring *rx_ring);
void i40evf_free_tx_resources(struct i40e_ring *tx_ring); void iavf_free_tx_resources(struct i40e_ring *tx_ring);
void i40evf_free_rx_resources(struct i40e_ring *rx_ring); void iavf_free_rx_resources(struct i40e_ring *rx_ring);
int i40evf_napi_poll(struct napi_struct *napi, int budget); int iavf_napi_poll(struct napi_struct *napi, int budget);
void i40evf_force_wb(struct i40e_vsi *vsi, struct i40e_q_vector *q_vector); void iavf_force_wb(struct i40e_vsi *vsi, struct i40e_q_vector *q_vector);
u32 i40evf_get_tx_pending(struct i40e_ring *ring, bool in_sw); u32 iavf_get_tx_pending(struct i40e_ring *ring, bool in_sw);
void i40evf_detect_recover_hung(struct i40e_vsi *vsi); void iavf_detect_recover_hung(struct i40e_vsi *vsi);
int __i40evf_maybe_stop_tx(struct i40e_ring *tx_ring, int size); int __iavf_maybe_stop_tx(struct i40e_ring *tx_ring, int size);
bool __i40evf_chk_linearize(struct sk_buff *skb); bool __iavf_chk_linearize(struct sk_buff *skb);
/** /**
* i40e_xmit_descriptor_count - calculate number of Tx descriptors needed * i40e_xmit_descriptor_count - calculate number of Tx descriptors needed
...@@ -490,7 +490,7 @@ static inline int i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size) ...@@ -490,7 +490,7 @@ static inline int i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size)
{ {
if (likely(I40E_DESC_UNUSED(tx_ring) >= size)) if (likely(I40E_DESC_UNUSED(tx_ring) >= size))
return 0; return 0;
return __i40evf_maybe_stop_tx(tx_ring, size); return __iavf_maybe_stop_tx(tx_ring, size);
} }
/** /**
...@@ -509,7 +509,7 @@ static inline bool i40e_chk_linearize(struct sk_buff *skb, int count) ...@@ -509,7 +509,7 @@ static inline bool i40e_chk_linearize(struct sk_buff *skb, int count)
return false; return false;
if (skb_is_gso(skb)) if (skb_is_gso(skb))
return __i40evf_chk_linearize(skb); return __iavf_chk_linearize(skb);
/* we can support up to 8 data buffers for a single send */ /* we can support up to 8 data buffers for a single send */
return count != I40E_MAX_BUFFER_TXD; return count != I40E_MAX_BUFFER_TXD;
......
drivers/net/ethernet/intel/iavf/i40evf.h
View file @ 129cf89e
This diff is collapsed.
drivers/net/ethernet/intel/iavf/i40evf_client.h
View file @ 129cf89e
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright(c) 2013 - 2018 Intel Corporation. */ /* Copyright(c) 2013 - 2018 Intel Corporation. */
#ifndef _I40EVF_CLIENT_H_ #ifndef _IAVF_CLIENT_H_
#define _I40EVF_CLIENT_H_ #define _IAVF_CLIENT_H_
#define I40EVF_CLIENT_STR_LENGTH 10 #define IAVF_CLIENT_STR_LENGTH 10
/* Client interface version should be updated anytime there is a change in the /* Client interface version should be updated anytime there is a change in the
* existing APIs or data structures. * existing APIs or data structures.
*/ */
#define I40EVF_CLIENT_VERSION_MAJOR 0 #define IAVF_CLIENT_VERSION_MAJOR 0
#define I40EVF_CLIENT_VERSION_MINOR 01 #define IAVF_CLIENT_VERSION_MINOR 01
#define I40EVF_CLIENT_VERSION_BUILD 00 #define IAVF_CLIENT_VERSION_BUILD 00
#define I40EVF_CLIENT_VERSION_STR \ #define IAVF_CLIENT_VERSION_STR \
__stringify(I40EVF_CLIENT_VERSION_MAJOR) "." \ __stringify(IAVF_CLIENT_VERSION_MAJOR) "." \
__stringify(I40EVF_CLIENT_VERSION_MINOR) "." \ __stringify(IAVF_CLIENT_VERSION_MINOR) "." \
__stringify(I40EVF_CLIENT_VERSION_BUILD) __stringify(IAVF_CLIENT_VERSION_BUILD)
struct i40e_client_version { struct i40e_client_version {
u8 major; u8 major;
...@@ -90,7 +90,7 @@ struct i40e_info { ...@@ -90,7 +90,7 @@ struct i40e_info {
#define I40E_CLIENT_FTYPE_PF 0 #define I40E_CLIENT_FTYPE_PF 0
#define I40E_CLIENT_FTYPE_VF 1 #define I40E_CLIENT_FTYPE_VF 1
u8 ftype; /* function type, PF or VF */ u8 ftype; /* function type, PF or VF */
void *vf; /* cast to i40evf_adapter */ void *vf; /* cast to iavf_adapter */
/* All L2 params that could change during the life span of the device /* All L2 params that could change during the life span of the device
* and needs to be communicated to the client when they change * and needs to be communicated to the client when they change
...@@ -151,7 +151,7 @@ struct i40e_client_instance { ...@@ -151,7 +151,7 @@ struct i40e_client_instance {
struct i40e_client { struct i40e_client {
struct list_head list; /* list of registered clients */ struct list_head list; /* list of registered clients */
char name[I40EVF_CLIENT_STR_LENGTH]; char name[IAVF_CLIENT_STR_LENGTH];
struct i40e_client_version version; struct i40e_client_version version;
unsigned long state; /* client state */ unsigned long state; /* client state */
atomic_t ref_cnt; /* Count of all the client devices of this kind */ atomic_t ref_cnt; /* Count of all the client devices of this kind */
...@@ -164,6 +164,6 @@ struct i40e_client { ...@@ -164,6 +164,6 @@ struct i40e_client {
}; };
/* used by clients */ /* used by clients */
int i40evf_register_client(struct i40e_client *client); int iavf_register_client(struct i40e_client *client);
int i40evf_unregister_client(struct i40e_client *client); int iavf_unregister_client(struct i40e_client *client);
#endif /* _I40EVF_CLIENT_H_ */ #endif /* _IAVF_CLIENT_H_ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7