Commit 75da437a authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue 

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2023-02-09 (i40e)

Jan removes i40e_status from the driver; replacing them with standard
kernel error codes.

Kees Cook replaces 0-length array with flexible array.

* '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue:
  net/i40e: Replace 0-length array with flexible array
  i40e: use ERR_PTR error print in i40e messages
  i40e: use int for i40e_status
  i40e: Remove string printing for i40e_status
  i40e: Remove unused i40e status codes
====================

Link: https://lore.kernel.org/r/20230209172536.3595838-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents f6075fee 0d5292bb

drivers/net/ethernet/intel/i40e/i40e.h

+4 −4
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ enum i40e_interrupt_policy { 


struct i40e_lump_tracking {

	u16 num_entries;

	u16 list[0];

	u16 list[];

#define I40E_PILE_VALID_BIT  0x8000

#define I40E_IWARP_IRQ_PILE_ID  (I40E_PILE_VALID_BIT - 2)

};
@@ -1288,9 +1288,9 @@ void i40e_ptp_stop(struct i40e_pf *pf); 
int i40e_ptp_alloc_pins(struct i40e_pf *pf);

int i40e_update_adq_vsi_queues(struct i40e_vsi *vsi, int vsi_offset);

int i40e_is_vsi_uplink_mode_veb(struct i40e_vsi *vsi);

i40e_status i40e_get_partition_bw_setting(struct i40e_pf *pf);

i40e_status i40e_set_partition_bw_setting(struct i40e_pf *pf);

i40e_status i40e_commit_partition_bw_setting(struct i40e_pf *pf);

int i40e_get_partition_bw_setting(struct i40e_pf *pf);

int i40e_set_partition_bw_setting(struct i40e_pf *pf);

int i40e_commit_partition_bw_setting(struct i40e_pf *pf);

void i40e_print_link_message(struct i40e_vsi *vsi, bool isup);



void i40e_set_fec_in_flags(u8 fec_cfg, u32 *flags);

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

+34 −34
Original line number Diff line number Diff line
@@ -47,9 +47,9 @@ static void i40e_adminq_init_regs(struct i40e_hw *hw) 
 *  i40e_alloc_adminq_asq_ring - Allocate Admin Queue send rings

 *  @hw: pointer to the hardware structure

 **/

static i40e_status i40e_alloc_adminq_asq_ring(struct i40e_hw *hw)

static int i40e_alloc_adminq_asq_ring(struct i40e_hw *hw)

{

	i40e_status ret_code;

	int ret_code;



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

					 i40e_mem_atq_ring,
@@ -74,9 +74,9 @@ static i40e_status i40e_alloc_adminq_asq_ring(struct i40e_hw *hw) 
 *  i40e_alloc_adminq_arq_ring - Allocate Admin Queue receive rings

 *  @hw: pointer to the hardware structure

 **/

static i40e_status i40e_alloc_adminq_arq_ring(struct i40e_hw *hw)

static int i40e_alloc_adminq_arq_ring(struct i40e_hw *hw)

{

	i40e_status ret_code;

	int ret_code;



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

					 i40e_mem_arq_ring,
@@ -115,11 +115,11 @@ static void i40e_free_adminq_arq(struct i40e_hw *hw) 
 *  i40e_alloc_arq_bufs - Allocate pre-posted buffers for the receive queue

 *  @hw: pointer to the hardware structure

 **/

static i40e_status i40e_alloc_arq_bufs(struct i40e_hw *hw)

static int i40e_alloc_arq_bufs(struct i40e_hw *hw)

{

	i40e_status ret_code;

	struct i40e_aq_desc *desc;

	struct i40e_dma_mem *bi;

	int ret_code;

	int i;



	/* We'll be allocating the buffer info memory first, then we can
@@ -182,10 +182,10 @@ static i40e_status i40e_alloc_arq_bufs(struct i40e_hw *hw) 
 *  i40e_alloc_asq_bufs - Allocate empty buffer structs for the send queue

 *  @hw: pointer to the hardware structure

 **/

static i40e_status i40e_alloc_asq_bufs(struct i40e_hw *hw)

static int i40e_alloc_asq_bufs(struct i40e_hw *hw)

{

	i40e_status ret_code;

	struct i40e_dma_mem *bi;

	int ret_code;

	int i;



	/* No mapped memory needed yet, just the buffer info structures */
@@ -266,9 +266,9 @@ static void i40e_free_asq_bufs(struct i40e_hw *hw) 
 *

 *  Configure base address and length registers for the transmit queue

 **/

static i40e_status i40e_config_asq_regs(struct i40e_hw *hw)

static int i40e_config_asq_regs(struct i40e_hw *hw)

{

	i40e_status ret_code = 0;

	int ret_code = 0;

	u32 reg = 0;



	/* Clear Head and Tail */
@@ -295,9 +295,9 @@ static i40e_status i40e_config_asq_regs(struct i40e_hw *hw) 
 *

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

 **/

static i40e_status i40e_config_arq_regs(struct i40e_hw *hw)

static int i40e_config_arq_regs(struct i40e_hw *hw)

{

	i40e_status ret_code = 0;

	int ret_code = 0;

	u32 reg = 0;



	/* Clear Head and Tail */
@@ -334,9 +334,9 @@ static i40e_status i40e_config_arq_regs(struct i40e_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 i40e_status i40e_init_asq(struct i40e_hw *hw)

static int i40e_init_asq(struct i40e_hw *hw)

{

	i40e_status ret_code = 0;

	int ret_code = 0;



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

		/* queue already initialized */
@@ -393,9 +393,9 @@ static i40e_status i40e_init_asq(struct i40e_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 i40e_status i40e_init_arq(struct i40e_hw *hw)

static int i40e_init_arq(struct i40e_hw *hw)

{

	i40e_status ret_code = 0;

	int ret_code = 0;



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

		/* queue already initialized */
@@ -445,9 +445,9 @@ static i40e_status i40e_init_arq(struct i40e_hw *hw) 
 *

 *  The main shutdown routine for the Admin Send Queue

 **/

static i40e_status i40e_shutdown_asq(struct i40e_hw *hw)

static int i40e_shutdown_asq(struct i40e_hw *hw)

{

	i40e_status ret_code = 0;

	int ret_code = 0;



	mutex_lock(&hw->aq.asq_mutex);
@@ -479,9 +479,9 @@ static i40e_status i40e_shutdown_asq(struct i40e_hw *hw) 
 *

 *  The main shutdown routine for the Admin Receive Queue

 **/

static i40e_status i40e_shutdown_arq(struct i40e_hw *hw)

static int i40e_shutdown_arq(struct i40e_hw *hw)

{

	i40e_status ret_code = 0;

	int ret_code = 0;



	mutex_lock(&hw->aq.arq_mutex);
@@ -582,12 +582,12 @@ static void i40e_set_hw_flags(struct i40e_hw *hw) 
 *     - hw->aq.arq_buf_size

 *     - hw->aq.asq_buf_size

 **/

i40e_status i40e_init_adminq(struct i40e_hw *hw)

int i40e_init_adminq(struct i40e_hw *hw)

{

	u16 cfg_ptr, oem_hi, oem_lo;

	u16 eetrack_lo, eetrack_hi;

	i40e_status ret_code;

	int retry = 0;

	int ret_code;



	/* verify input for valid configuration */

	if ((hw->aq.num_arq_entries == 0) ||
@@ -780,7 +780,7 @@ static bool i40e_asq_done(struct i40e_hw *hw) 
 *  This is the main send command driver routine for the Admin Queue send

 *  queue.  It runs the queue, cleans the queue, etc

 **/

static i40e_status

static int

i40e_asq_send_command_atomic_exec(struct i40e_hw *hw,

				  struct i40e_aq_desc *desc,

				  void *buff, /* can be NULL */
@@ -788,12 +788,12 @@ i40e_asq_send_command_atomic_exec(struct i40e_hw *hw, 
				  struct i40e_asq_cmd_details *cmd_details,

				  bool is_atomic_context)

{

	i40e_status status = 0;

	struct i40e_dma_mem *dma_buff = NULL;

	struct i40e_asq_cmd_details *details;

	struct i40e_aq_desc *desc_on_ring;

	bool cmd_completed = false;

	u16  retval = 0;

	int status = 0;

	u32  val = 0;



	if (hw->aq.asq.count == 0) {
@@ -984,7 +984,7 @@ i40e_asq_send_command_atomic_exec(struct i40e_hw *hw, 
 *  Acquires the lock and calls the main send command execution

 *  routine.

 **/

i40e_status

int

i40e_asq_send_command_atomic(struct i40e_hw *hw,

			     struct i40e_aq_desc *desc,

			     void *buff, /* can be NULL */
@@ -992,7 +992,7 @@ i40e_asq_send_command_atomic(struct i40e_hw *hw, 
			     struct i40e_asq_cmd_details *cmd_details,

			     bool is_atomic_context)

{

	i40e_status status;

	int status;



	mutex_lock(&hw->aq.asq_mutex);

	status = i40e_asq_send_command_atomic_exec(hw, desc, buff, buff_size,
@@ -1003,7 +1003,7 @@ i40e_asq_send_command_atomic(struct i40e_hw *hw, 
	return status;

}



i40e_status

int

i40e_asq_send_command(struct i40e_hw *hw, struct i40e_aq_desc *desc,

		      void *buff, /* can be NULL */ u16  buff_size,

		      struct i40e_asq_cmd_details *cmd_details)
@@ -1026,7 +1026,7 @@ i40e_asq_send_command(struct i40e_hw *hw, struct i40e_aq_desc *desc, 
 *  routine. Returns the last Admin Queue status in aq_status

 *  to avoid race conditions in access to hw->aq.asq_last_status.

 **/

i40e_status

int

i40e_asq_send_command_atomic_v2(struct i40e_hw *hw,

				struct i40e_aq_desc *desc,

				void *buff, /* can be NULL */
@@ -1035,7 +1035,7 @@ i40e_asq_send_command_atomic_v2(struct i40e_hw *hw, 
				bool is_atomic_context,

				enum i40e_admin_queue_err *aq_status)

{

	i40e_status status;

	int status;



	mutex_lock(&hw->aq.asq_mutex);

	status = i40e_asq_send_command_atomic_exec(hw, desc, buff,
@@ -1048,7 +1048,7 @@ i40e_asq_send_command_atomic_v2(struct i40e_hw *hw, 
	return status;

}



i40e_status

int

i40e_asq_send_command_v2(struct i40e_hw *hw, struct i40e_aq_desc *desc,

			 void *buff, /* can be NULL */ u16  buff_size,

			 struct i40e_asq_cmd_details *cmd_details,
@@ -1084,14 +1084,14 @@ void i40e_fill_default_direct_cmd_desc(struct i40e_aq_desc *desc, 
 *  the contents through e.  It can also return how many events are

 *  left to process through 'pending'

 **/

i40e_status i40e_clean_arq_element(struct i40e_hw *hw,

int i40e_clean_arq_element(struct i40e_hw *hw,

			   struct i40e_arq_event_info *e,

			   u16 *pending)

{

	i40e_status ret_code = 0;

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

	struct i40e_aq_desc *desc;

	struct i40e_dma_mem *bi;

	int ret_code = 0;

	u16 desc_idx;

	u16 datalen;

	u16 flags;

drivers/net/ethernet/intel/i40e/i40e_alloc.h

+11 −11
Original line number Diff line number Diff line
@@ -20,16 +20,16 @@ enum i40e_memory_type { 
};



/* prototype for functions used for dynamic memory allocation */

i40e_status i40e_allocate_dma_mem(struct i40e_hw *hw,

int i40e_allocate_dma_mem(struct i40e_hw *hw,

			  struct i40e_dma_mem *mem,

			  enum i40e_memory_type type,

			  u64 size, u32 alignment);

i40e_status i40e_free_dma_mem(struct i40e_hw *hw,

int i40e_free_dma_mem(struct i40e_hw *hw,

		      struct i40e_dma_mem *mem);

i40e_status i40e_allocate_virt_mem(struct i40e_hw *hw,

int i40e_allocate_virt_mem(struct i40e_hw *hw,

			   struct i40e_virt_mem *mem,

			   u32 size);

i40e_status i40e_free_virt_mem(struct i40e_hw *hw,

int i40e_free_virt_mem(struct i40e_hw *hw,

		       struct i40e_virt_mem *mem);



#endif /* _I40E_ALLOC_H_ */

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

+6 −6
Original line number Diff line number Diff line
@@ -541,7 +541,7 @@ static int i40e_client_virtchnl_send(struct i40e_info *ldev, 
{

	struct i40e_pf *pf = ldev->pf;

	struct i40e_hw *hw = &pf->hw;

	i40e_status err;

	int err;



	err = i40e_aq_send_msg_to_vf(hw, vf_id, VIRTCHNL_OP_RDMA,

				     0, msg, len, NULL);
@@ -674,7 +674,7 @@ static int i40e_client_update_vsi_ctxt(struct i40e_info *ldev, 
	struct i40e_vsi *vsi = pf->vsi[pf->lan_vsi];

	struct i40e_vsi_context ctxt;

	bool update = true;

	i40e_status err;

	int err;



	/* TODO: for now do not allow setting VF's VSI setting */

	if (is_vf)
@@ -686,8 +686,8 @@ static int i40e_client_update_vsi_ctxt(struct i40e_info *ldev, 
	ctxt.flags = I40E_AQ_VSI_TYPE_PF;

	if (err) {

		dev_info(&pf->pdev->dev,

			 "couldn't get PF vsi config, err %s aq_err %s\n",

			 i40e_stat_str(&pf->hw, err),

			 "couldn't get PF vsi config, err %pe aq_err %s\n",

			 ERR_PTR(err),

			 i40e_aq_str(&pf->hw,

				     pf->hw.aq.asq_last_status));

		return -ENOENT;
@@ -714,8 +714,8 @@ static int i40e_client_update_vsi_ctxt(struct i40e_info *ldev, 
		err = i40e_aq_update_vsi_params(&vsi->back->hw, &ctxt, NULL);

		if (err) {

			dev_info(&pf->pdev->dev,

				 "update VSI ctxt for PE failed, err %s aq_err %s\n",

				 i40e_stat_str(&pf->hw, err),

				 "update VSI ctxt for PE failed, err %pe aq_err %s\n",

				 ERR_PTR(err),

				 i40e_aq_str(&pf->hw,

					     pf->hw.aq.asq_last_status));

		}

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

+451 −587

File changed.

Preview size limit exceeded, changes collapsed.