Commit c6cfc6cd authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2023-08-17 (ice)

This series contains updates to ice driver only.

Jan removes unused functions and refactors code to make, possible,
functions static.

Jake rearranges some functions to be logically grouped.

Marcin removes an unnecessary call to disable VLAN stripping.

Yang Yingliang utilizes list_for_each_entry() helper for a couple list
traversals.

Przemek removes some parameters from ice_aq_alloc_free_res() which were
always the same and reworks ice_aq_wait_for_event() to reduce chance of
race.

* '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue:
  ice: split ice_aq_wait_for_event() func into two
  ice: embed &ice_rq_event_info event into struct ice_aq_task
  ice: ice_aq_check_events: fix off-by-one check when filling buffer
  ice: drop two params from ice_aq_alloc_free_res()
  ice: use list_for_each_entry() helper
  ice: Remove redundant VSI configuration in eswitch setup
  ice: move E810T functions to before device agnostic ones
  ice: refactor ice_vsi_is_vlan_pruning_ena
  ice: refactor ice_ptp_hw to make functions static
  ice: refactor ice_sched to make functions static
  ice: Utilize assign_bit() helper
  ice: refactor ice_vf_lib to make functions static
  ice: refactor ice_lib to make functions static
  ice: refactor ice_ddp to make functions static
  ice: remove unused methods
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 829b3357 fb9840c4

drivers/net/ethernet/intel/ice/ice.h

+19 −2
Original line number Diff line number Diff line
@@ -917,8 +917,25 @@ void ice_fdir_release_flows(struct ice_hw *hw); 
void ice_fdir_replay_flows(struct ice_hw *hw);

void ice_fdir_replay_fltrs(struct ice_pf *pf);

int ice_fdir_create_dflt_rules(struct ice_pf *pf);

int ice_aq_wait_for_event(struct ice_pf *pf, u16 opcode, unsigned long timeout,

			  struct ice_rq_event_info *event);



enum ice_aq_task_state {

	ICE_AQ_TASK_NOT_PREPARED,

	ICE_AQ_TASK_WAITING,

	ICE_AQ_TASK_COMPLETE,

	ICE_AQ_TASK_CANCELED,

};



struct ice_aq_task {

	struct hlist_node entry;

	struct ice_rq_event_info event;

	enum ice_aq_task_state state;

	u16 opcode;

};



void ice_aq_prep_for_event(struct ice_pf *pf, struct ice_aq_task *task,

			   u16 opcode);

int ice_aq_wait_for_event(struct ice_pf *pf, struct ice_aq_task *task,

			  unsigned long timeout);

int ice_open(struct net_device *netdev);

int ice_open_internal(struct net_device *netdev);

int ice_stop(struct net_device *netdev);

drivers/net/ethernet/intel/ice/ice_common.c

+8 −16
Original line number Diff line number Diff line
@@ -2000,37 +2000,31 @@ void ice_release_res(struct ice_hw *hw, enum ice_aq_res_ids res) 
/**

 * ice_aq_alloc_free_res - command to allocate/free resources

 * @hw: pointer to the HW struct

 * @num_entries: number of resource entries in buffer

 * @buf: Indirect buffer to hold data parameters and response

 * @buf_size: size of buffer for indirect commands

 * @opc: pass in the command opcode

 * @cd: pointer to command details structure or NULL

 *

 * Helper function to allocate/free resources using the admin queue commands

 */

int

ice_aq_alloc_free_res(struct ice_hw *hw, u16 num_entries,

int ice_aq_alloc_free_res(struct ice_hw *hw,

			  struct ice_aqc_alloc_free_res_elem *buf, u16 buf_size,

		      enum ice_adminq_opc opc, struct ice_sq_cd *cd)

			  enum ice_adminq_opc opc)

{

	struct ice_aqc_alloc_free_res_cmd *cmd;

	struct ice_aq_desc desc;



	cmd = &desc.params.sw_res_ctrl;



	if (!buf)

		return -EINVAL;



	if (buf_size < flex_array_size(buf, elem, num_entries))

	if (!buf || buf_size < flex_array_size(buf, elem, 1))

		return -EINVAL;



	ice_fill_dflt_direct_cmd_desc(&desc, opc);



	desc.flags |= cpu_to_le16(ICE_AQ_FLAG_RD);



	cmd->num_entries = cpu_to_le16(num_entries);

	cmd->num_entries = cpu_to_le16(1);



	return ice_aq_send_cmd(hw, &desc, buf, buf_size, cd);

	return ice_aq_send_cmd(hw, &desc, buf, buf_size, NULL);

}



/**
@@ -2060,8 +2054,7 @@ ice_alloc_hw_res(struct ice_hw *hw, u16 type, u16 num, bool btm, u16 *res) 
	if (btm)

		buf->res_type |= cpu_to_le16(ICE_AQC_RES_TYPE_FLAG_SCAN_BOTTOM);



	status = ice_aq_alloc_free_res(hw, 1, buf, buf_len,

				       ice_aqc_opc_alloc_res, NULL);

	status = ice_aq_alloc_free_res(hw, buf, buf_len, ice_aqc_opc_alloc_res);

	if (status)

		goto ice_alloc_res_exit;
@@ -2095,8 +2088,7 @@ int ice_free_hw_res(struct ice_hw *hw, u16 type, u16 num, u16 *res) 
	buf->res_type = cpu_to_le16(type);

	memcpy(buf->elem, res, sizeof(*buf->elem) * num);



	status = ice_aq_alloc_free_res(hw, num, buf, buf_len,

				       ice_aqc_opc_free_res, NULL);

	status = ice_aq_alloc_free_res(hw, buf, buf_len, ice_aqc_opc_free_res);

	if (status)

		ice_debug(hw, ICE_DBG_SW, "CQ CMD Buffer:\n");

drivers/net/ethernet/intel/ice/ice_common.h

+3 −4
Original line number Diff line number Diff line
@@ -38,10 +38,9 @@ int 
ice_alloc_hw_res(struct ice_hw *hw, u16 type, u16 num, bool btm, u16 *res);

int

ice_free_hw_res(struct ice_hw *hw, u16 type, u16 num, u16 *res);

int

ice_aq_alloc_free_res(struct ice_hw *hw, u16 num_entries,

int ice_aq_alloc_free_res(struct ice_hw *hw,

			  struct ice_aqc_alloc_free_res_elem *buf, u16 buf_size,

		      enum ice_adminq_opc opc, struct ice_sq_cd *cd);

			  enum ice_adminq_opc opc);

bool ice_is_sbq_supported(struct ice_hw *hw);

struct ice_ctl_q_info *ice_get_sbq(struct ice_hw *hw);

int

drivers/net/ethernet/intel/ice/ice_ddp.c

+61 −59
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static const struct ice_tunnel_type_scan tnls[] = { 
 * Verifies various attributes of the package file, including length, format

 * version, and the requirement of at least one segment.

 */

enum ice_ddp_state ice_verify_pkg(struct ice_pkg_hdr *pkg, u32 len)

static enum ice_ddp_state ice_verify_pkg(struct ice_pkg_hdr *pkg, u32 len)

{

	u32 seg_count;

	u32 i;
@@ -118,7 +118,7 @@ static enum ice_ddp_state ice_chk_pkg_version(struct ice_pkg_ver *pkg_ver) 
 *

 * This helper function validates a buffer's header.

 */

struct ice_buf_hdr *ice_pkg_val_buf(struct ice_buf *buf)

static struct ice_buf_hdr *ice_pkg_val_buf(struct ice_buf *buf)

{

	struct ice_buf_hdr *hdr;

	u16 section_count;
@@ -1152,6 +1152,54 @@ static void ice_release_global_cfg_lock(struct ice_hw *hw) 
	ice_release_res(hw, ICE_GLOBAL_CFG_LOCK_RES_ID);

}



/**

 * ice_aq_download_pkg

 * @hw: pointer to the hardware structure

 * @pkg_buf: the package buffer to transfer

 * @buf_size: the size of the package buffer

 * @last_buf: last buffer indicator

 * @error_offset: returns error offset

 * @error_info: returns error information

 * @cd: pointer to command details structure or NULL

 *

 * Download Package (0x0C40)

 */

static int

ice_aq_download_pkg(struct ice_hw *hw, struct ice_buf_hdr *pkg_buf,

		    u16 buf_size, bool last_buf, u32 *error_offset,

		    u32 *error_info, struct ice_sq_cd *cd)

{

	struct ice_aqc_download_pkg *cmd;

	struct ice_aq_desc desc;

	int status;



	if (error_offset)

		*error_offset = 0;

	if (error_info)

		*error_info = 0;



	cmd = &desc.params.download_pkg;

	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_download_pkg);

	desc.flags |= cpu_to_le16(ICE_AQ_FLAG_RD);



	if (last_buf)

		cmd->flags |= ICE_AQC_DOWNLOAD_PKG_LAST_BUF;



	status = ice_aq_send_cmd(hw, &desc, pkg_buf, buf_size, cd);

	if (status == -EIO) {

		/* Read error from buffer only when the FW returned an error */

		struct ice_aqc_download_pkg_resp *resp;



		resp = (struct ice_aqc_download_pkg_resp *)pkg_buf;

		if (error_offset)

			*error_offset = le32_to_cpu(resp->error_offset);

		if (error_info)

			*error_info = le32_to_cpu(resp->error_info);

	}



	return status;

}



/**

 * ice_dwnld_cfg_bufs

 * @hw: pointer to the hardware structure
@@ -1294,18 +1342,18 @@ static enum ice_ddp_state ice_download_pkg(struct ice_hw *hw, 
}



/**

 * ice_aq_download_pkg

 * ice_aq_update_pkg

 * @hw: pointer to the hardware structure

 * @pkg_buf: the package buffer to transfer

 * @buf_size: the size of the package buffer

 * @pkg_buf: the package cmd buffer

 * @buf_size: the size of the package cmd buffer

 * @last_buf: last buffer indicator

 * @error_offset: returns error offset

 * @error_info: returns error information

 * @cd: pointer to command details structure or NULL

 *

 * Download Package (0x0C40)

 * Update Package (0x0C42)

 */

int ice_aq_download_pkg(struct ice_hw *hw, struct ice_buf_hdr *pkg_buf,

static int ice_aq_update_pkg(struct ice_hw *hw, struct ice_buf_hdr *pkg_buf,

			     u16 buf_size, bool last_buf, u32 *error_offset,

			     u32 *error_info, struct ice_sq_cd *cd)

{
@@ -1319,7 +1367,7 @@ int ice_aq_download_pkg(struct ice_hw *hw, struct ice_buf_hdr *pkg_buf, 
		*error_info = 0;



	cmd = &desc.params.download_pkg;

	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_download_pkg);

	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_update_pkg);

	desc.flags |= cpu_to_le16(ICE_AQ_FLAG_RD);



	if (last_buf)
@@ -1360,53 +1408,6 @@ int ice_aq_upload_section(struct ice_hw *hw, struct ice_buf_hdr *pkg_buf, 
	return ice_aq_send_cmd(hw, &desc, pkg_buf, buf_size, cd);

}



/**

 * ice_aq_update_pkg

 * @hw: pointer to the hardware structure

 * @pkg_buf: the package cmd buffer

 * @buf_size: the size of the package cmd buffer

 * @last_buf: last buffer indicator

 * @error_offset: returns error offset

 * @error_info: returns error information

 * @cd: pointer to command details structure or NULL

 *

 * Update Package (0x0C42)

 */

static int ice_aq_update_pkg(struct ice_hw *hw, struct ice_buf_hdr *pkg_buf,

			     u16 buf_size, bool last_buf, u32 *error_offset,

			     u32 *error_info, struct ice_sq_cd *cd)

{

	struct ice_aqc_download_pkg *cmd;

	struct ice_aq_desc desc;

	int status;



	if (error_offset)

		*error_offset = 0;

	if (error_info)

		*error_info = 0;



	cmd = &desc.params.download_pkg;

	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_update_pkg);

	desc.flags |= cpu_to_le16(ICE_AQ_FLAG_RD);



	if (last_buf)

		cmd->flags |= ICE_AQC_DOWNLOAD_PKG_LAST_BUF;



	status = ice_aq_send_cmd(hw, &desc, pkg_buf, buf_size, cd);

	if (status == -EIO) {

		/* Read error from buffer only when the FW returned an error */

		struct ice_aqc_download_pkg_resp *resp;



		resp = (struct ice_aqc_download_pkg_resp *)pkg_buf;

		if (error_offset)

			*error_offset = le32_to_cpu(resp->error_offset);

		if (error_info)

			*error_info = le32_to_cpu(resp->error_info);

	}



	return status;

}



/**

 * ice_update_pkg_no_lock

 * @hw: pointer to the hardware structure
@@ -1470,7 +1471,8 @@ int ice_update_pkg(struct ice_hw *hw, struct ice_buf *bufs, u32 count) 
 * success it returns a pointer to the segment header, otherwise it will

 * return NULL.

 */

struct ice_generic_seg_hdr *ice_find_seg_in_pkg(struct ice_hw *hw, u32 seg_type,

static struct ice_generic_seg_hdr *

ice_find_seg_in_pkg(struct ice_hw *hw, u32 seg_type,

		    struct ice_pkg_hdr *pkg_hdr)

{

	u32 i;

drivers/net/ethernet/intel/ice/ice_ddp.h

+0 −10
Original line number Diff line number Diff line
@@ -416,21 +416,13 @@ struct ice_pkg_enum { 
	void *(*handler)(u32 sect_type, void *section, u32 index, u32 *offset);

};



int ice_aq_download_pkg(struct ice_hw *hw, struct ice_buf_hdr *pkg_buf,

			u16 buf_size, bool last_buf, u32 *error_offset,

			u32 *error_info, struct ice_sq_cd *cd);

int ice_aq_upload_section(struct ice_hw *hw, struct ice_buf_hdr *pkg_buf,

			  u16 buf_size, struct ice_sq_cd *cd);



void *ice_pkg_buf_alloc_section(struct ice_buf_build *bld, u32 type, u16 size);



enum ice_ddp_state ice_verify_pkg(struct ice_pkg_hdr *pkg, u32 len);



struct ice_buf_build *ice_pkg_buf_alloc(struct ice_hw *hw);



struct ice_generic_seg_hdr *ice_find_seg_in_pkg(struct ice_hw *hw, u32 seg_type,

						struct ice_pkg_hdr *pkg_hdr);



int ice_update_pkg_no_lock(struct ice_hw *hw, struct ice_buf *bufs, u32 count);

int ice_update_pkg(struct ice_hw *hw, struct ice_buf *bufs, u32 count);
@@ -439,6 +431,4 @@ u16 ice_pkg_buf_get_active_sections(struct ice_buf_build *bld); 
void *ice_pkg_enum_section(struct ice_seg *ice_seg, struct ice_pkg_enum *state,

			   u32 sect_type);



struct ice_buf_hdr *ice_pkg_val_buf(struct ice_buf *buf);



#endif