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

Commit f9867df6 authored by Anirudh Venkataramanan's avatar Anirudh Venkataramanan Committed by Jeff Kirsher
Browse files

ice: Fix incorrect use of abbreviations 



Capitalize abbreviations and spell out some that aren't obvious.

Reviewed-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 94c4441b

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

+5 −5
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ struct ice_tc_info { 


struct ice_tc_cfg {

	u8 numtc; /* Total number of enabled TCs */

	u8 ena_tc; /* TX map */

	u8 ena_tc; /* Tx map */

	struct ice_tc_info tc_info[ICE_MAX_TRAFFIC_CLASS];

};
@@ -360,8 +360,8 @@ struct ice_pf { 
	u32 hw_oicr_idx;	/* Other interrupt cause vector HW index */

	u32 num_avail_hw_msix;	/* remaining HW MSIX vectors left unclaimed */

	u32 num_lan_msix;	/* Total MSIX vectors for base driver */

	u16 num_lan_tx;		/* num lan Tx queues setup */

	u16 num_lan_rx;		/* num lan Rx queues setup */

	u16 num_lan_tx;		/* num LAN Tx queues setup */

	u16 num_lan_rx;		/* num LAN Rx queues setup */

	u16 q_left_tx;		/* remaining num Tx queues left unclaimed */

	u16 q_left_rx;		/* remaining num Rx queues left unclaimed */

	u16 next_vsi;		/* Next free slot in pf->vsi[] - 0-based! */
@@ -387,8 +387,8 @@ struct ice_netdev_priv { 


/**

 * ice_irq_dynamic_ena - Enable default interrupt generation settings

 * @hw: pointer to hw struct

 * @vsi: pointer to vsi struct, can be NULL

 * @hw: pointer to HW struct

 * @vsi: pointer to VSI struct, can be NULL

 * @q_vector: pointer to q_vector, can be NULL

 */

static inline void

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

+10 −10
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ struct ice_aqc_req_res { 
#define ICE_AQ_RES_NVM_WRITE_DFLT_TIMEOUT_MS	180000

#define ICE_AQ_RES_CHNG_LOCK_DFLT_TIMEOUT_MS	1000

#define ICE_AQ_RES_GLBL_LOCK_DFLT_TIMEOUT_MS	3000

	/* For SDP: pin id of the SDP */

	/* For SDP: pin ID of the SDP */

	__le32 res_number;

	/* Status is only used for ICE_AQC_RES_ID_GLBL_LOCK */

	__le16 status;
@@ -1024,7 +1024,7 @@ struct ice_aqc_get_link_status_data { 
	u8 ext_info;

#define ICE_AQ_LINK_PHY_TEMP_ALARM	BIT(0)

#define ICE_AQ_LINK_EXCESSIVE_ERRORS	BIT(1)	/* Excessive Link Errors */

	/* Port TX Suspended */

	/* Port Tx Suspended */

#define ICE_AQ_LINK_TX_S		2

#define ICE_AQ_LINK_TX_M		(0x03 << ICE_AQ_LINK_TX_S)

#define ICE_AQ_LINK_TX_ACTIVE		0
@@ -1120,9 +1120,9 @@ struct ice_aqc_nvm { 
};



/**

 * Send to PF command (indirect 0x0801) id is only used by PF

 * Send to PF command (indirect 0x0801) ID is only used by PF

 *

 * Send to VF command (indirect 0x0802) id is only used by PF

 * Send to VF command (indirect 0x0802) ID is only used by PF

 *

 */

struct ice_aqc_pf_vf_msg {
@@ -1186,7 +1186,7 @@ struct ice_aqc_get_set_rss_lut { 
	__le32 addr_low;

};



/* Add TX LAN Queues (indirect 0x0C30) */

/* Add Tx LAN Queues (indirect 0x0C30) */

struct ice_aqc_add_txqs {

	u8 num_qgrps;

	u8 reserved[3];
@@ -1195,7 +1195,7 @@ struct ice_aqc_add_txqs { 
	__le32 addr_low;

};



/* This is the descriptor of each queue entry for the Add TX LAN Queues

/* This is the descriptor of each queue entry for the Add Tx LAN Queues

 * command (0x0C30). Only used within struct ice_aqc_add_tx_qgrp.

 */

struct ice_aqc_add_txqs_perq {
@@ -1207,7 +1207,7 @@ struct ice_aqc_add_txqs_perq { 
	struct ice_aqc_txsched_elem info;

};



/* The format of the command buffer for Add TX LAN Queues (0x0C30)

/* The format of the command buffer for Add Tx LAN Queues (0x0C30)

 * is an array of the following structs. Please note that the length of

 * each struct ice_aqc_add_tx_qgrp is variable due

 * to the variable number of queues in each group!
@@ -1219,7 +1219,7 @@ struct ice_aqc_add_tx_qgrp { 
	struct ice_aqc_add_txqs_perq txqs[1];

};



/* Disable TX LAN Queues (indirect 0x0C31) */

/* Disable Tx LAN Queues (indirect 0x0C31) */

struct ice_aqc_dis_txqs {

	u8 cmd_type;

#define ICE_AQC_Q_DIS_CMD_S		0
@@ -1241,7 +1241,7 @@ struct ice_aqc_dis_txqs { 
	__le32 addr_low;

};



/* The buffer for Disable TX LAN Queues (indirect 0x0C31)

/* The buffer for Disable Tx LAN Queues (indirect 0x0C31)

 * contains the following structures, arrayed one after the

 * other.

 * Note: Since the q_id is 16 bits wide, if the
@@ -1498,7 +1498,7 @@ enum ice_adminq_opc { 
	ice_aqc_opc_get_rss_key				= 0x0B04,

	ice_aqc_opc_get_rss_lut				= 0x0B05,



	/* TX queue handling commands/events */

	/* Tx queue handling commands/events */

	ice_aqc_opc_add_txqs				= 0x0C30,

	ice_aqc_opc_dis_txqs				= 0x0C31,

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

+47 −47
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
 * @hw: pointer to the HW structure

 *

 * This function sets the MAC type of the adapter based on the

 * vendor ID and device ID stored in the hw structure.

 * vendor ID and device ID stored in the HW structure.

 */

static enum ice_status ice_set_mac_type(struct ice_hw *hw)

{
@@ -77,7 +77,7 @@ enum ice_status ice_clear_pf_cfg(struct ice_hw *hw) 


/**

 * ice_aq_manage_mac_read - manage MAC address read command

 * @hw: pointer to the hw struct

 * @hw: pointer to the HW struct

 * @buf: a virtual buffer to hold the manage MAC read response

 * @buf_size: Size of the virtual buffer

 * @cd: pointer to command details structure or NULL
@@ -418,7 +418,7 @@ static void ice_init_flex_flds(struct ice_hw *hw, enum ice_rxdid prof_id) 


/**

 * ice_init_fltr_mgmt_struct - initializes filter management list and locks

 * @hw: pointer to the hw struct

 * @hw: pointer to the HW struct

 */

static enum ice_status ice_init_fltr_mgmt_struct(struct ice_hw *hw)

{
@@ -438,7 +438,7 @@ static enum ice_status ice_init_fltr_mgmt_struct(struct ice_hw *hw) 


/**

 * ice_cleanup_fltr_mgmt_struct - cleanup filter management list and locks

 * @hw: pointer to the hw struct

 * @hw: pointer to the HW struct

 */

static void ice_cleanup_fltr_mgmt_struct(struct ice_hw *hw)

{
@@ -477,7 +477,7 @@ static void ice_cleanup_fltr_mgmt_struct(struct ice_hw *hw) 


/**

 * ice_cfg_fw_log - configure FW logging

 * @hw: pointer to the hw struct

 * @hw: pointer to the HW struct

 * @enable: enable certain FW logging events if true, disable all if false

 *

 * This function enables/disables the FW logging via Rx CQ events and a UART
@@ -626,7 +626,7 @@ static enum ice_status ice_cfg_fw_log(struct ice_hw *hw, bool enable) 


/**

 * ice_output_fw_log

 * @hw: pointer to the hw struct

 * @hw: pointer to the HW struct

 * @desc: pointer to the AQ message descriptor

 * @buf: pointer to the buffer accompanying the AQ message

 *
@@ -642,7 +642,7 @@ void ice_output_fw_log(struct ice_hw *hw, struct ice_aq_desc *desc, void *buf) 


/**

 * ice_get_itr_intrl_gran - determine int/intrl granularity

 * @hw: pointer to the hw struct

 * @hw: pointer to the HW struct

 *

 * Determines the itr/intrl granularities based on the maximum aggregate

 * bandwidth according to the device's configuration during power-on.
@@ -731,7 +731,7 @@ enum ice_status ice_init_hw(struct ice_hw *hw) 
		goto err_unroll_cqinit;

	}



	/* set the back pointer to hw */

	/* set the back pointer to HW */

	hw->port_info->hw = hw;



	/* Initialize port_info struct with switch configuration data */
@@ -988,7 +988,7 @@ enum ice_status ice_reset(struct ice_hw *hw, enum ice_reset_req req) 
 * @ice_rxq_ctx: pointer to the rxq context

 * @rxq_index: the index of the Rx queue

 *

 * Copies rxq context from dense structure to hw register space

 * Copies rxq context from dense structure to HW register space

 */

static enum ice_status

ice_copy_rxq_ctx_to_hw(struct ice_hw *hw, u8 *ice_rxq_ctx, u32 rxq_index)
@@ -1001,7 +1001,7 @@ ice_copy_rxq_ctx_to_hw(struct ice_hw *hw, u8 *ice_rxq_ctx, u32 rxq_index) 
	if (rxq_index > QRX_CTRL_MAX_INDEX)

		return ICE_ERR_PARAM;



	/* Copy each dword separately to hw */

	/* Copy each dword separately to HW */

	for (i = 0; i < ICE_RXQ_CTX_SIZE_DWORDS; i++) {

		wr32(hw, QRX_CONTEXT(i, rxq_index),

		     *((u32 *)(ice_rxq_ctx + (i * sizeof(u32)))));
@@ -1045,7 +1045,7 @@ static const struct ice_ctx_ele ice_rlan_ctx_info[] = { 
 * @rxq_index: the index of the Rx queue

 *

 * Converts rxq context from sparse to dense structure and then writes

 * it to hw register space

 * it to HW register space

 */

enum ice_status

ice_write_rxq_ctx(struct ice_hw *hw, struct ice_rlan_ctx *rlan_ctx,
@@ -1144,7 +1144,7 @@ ice_debug_cq(struct ice_hw *hw, u32 __maybe_unused mask, void *desc, void *buf, 


/**

 * ice_aq_send_cmd - send FW Admin Queue command to FW Admin Queue

 * @hw: pointer to the hw struct

 * @hw: pointer to the HW struct

 * @desc: descriptor describing the command

 * @buf: buffer to use for indirect commands (NULL for direct commands)

 * @buf_size: size of buffer for indirect commands (0 for direct commands)
@@ -1161,7 +1161,7 @@ ice_aq_send_cmd(struct ice_hw *hw, struct ice_aq_desc *desc, void *buf, 


/**

 * ice_aq_get_fw_ver

 * @hw: pointer to the hw struct

 * @hw: pointer to the HW struct

 * @cd: pointer to command details structure or NULL

 *

 * Get the firmware version (0x0001) from the admin queue commands
@@ -1195,7 +1195,7 @@ enum ice_status ice_aq_get_fw_ver(struct ice_hw *hw, struct ice_sq_cd *cd) 


/**

 * ice_aq_q_shutdown

 * @hw: pointer to the hw struct

 * @hw: pointer to the HW struct

 * @unloading: is the driver unloading itself

 *

 * Tell the Firmware that we're shutting down the AdminQ and whether
@@ -1218,8 +1218,8 @@ enum ice_status ice_aq_q_shutdown(struct ice_hw *hw, bool unloading) 


/**

 * ice_aq_req_res

 * @hw: pointer to the hw struct

 * @res: resource id

 * @hw: pointer to the HW struct

 * @res: resource ID

 * @access: access type

 * @sdp_number: resource number

 * @timeout: the maximum time in ms that the driver may hold the resource
@@ -1304,8 +1304,8 @@ ice_aq_req_res(struct ice_hw *hw, enum ice_aq_res_ids res, 


/**

 * ice_aq_release_res

 * @hw: pointer to the hw struct

 * @res: resource id

 * @hw: pointer to the HW struct

 * @res: resource ID

 * @sdp_number: resource number

 * @cd: pointer to command details structure or NULL

 *
@@ -1331,7 +1331,7 @@ ice_aq_release_res(struct ice_hw *hw, enum ice_aq_res_ids res, u8 sdp_number, 
/**

 * ice_acquire_res

 * @hw: pointer to the HW structure

 * @res: resource id

 * @res: resource ID

 * @access: access type (read or write)

 * @timeout: timeout in milliseconds

 *
@@ -1393,7 +1393,7 @@ ice_acquire_res(struct ice_hw *hw, enum ice_aq_res_ids res, 
/**

 * ice_release_res

 * @hw: pointer to the HW structure

 * @res: resource id

 * @res: resource ID

 *

 * This function will release a resource using the proper Admin Command.

 */
@@ -1405,7 +1405,7 @@ void ice_release_res(struct ice_hw *hw, enum ice_aq_res_ids res) 
	status = ice_aq_release_res(hw, res, 0, NULL);



	/* there are some rare cases when trying to release the resource

	 * results in an admin Q timeout, so handle them correctly

	 * results in an admin queue timeout, so handle them correctly

	 */

	while ((status == ICE_ERR_AQ_TIMEOUT) &&

	       (total_delay < hw->adminq.sq_cmd_timeout)) {
@@ -1417,7 +1417,7 @@ void ice_release_res(struct ice_hw *hw, enum ice_aq_res_ids res) 


/**

 * ice_get_num_per_func - determine number of resources per PF

 * @hw: pointer to the hw structure

 * @hw: pointer to the HW structure

 * @max: value to be evenly split between each PF

 *

 * Determine the number of valid functions by going through the bitmap returned
@@ -1440,7 +1440,7 @@ static u32 ice_get_num_per_func(struct ice_hw *hw, u32 max) 


/**

 * ice_parse_caps - parse function/device capabilities

 * @hw: pointer to the hw struct

 * @hw: pointer to the HW struct

 * @buf: pointer to a buffer containing function/device capability records

 * @cap_count: number of capability records in the list

 * @opc: type of capabilities list to parse
@@ -1582,7 +1582,7 @@ ice_parse_caps(struct ice_hw *hw, void *buf, u32 cap_count, 


/**

 * ice_aq_discover_caps - query function/device capabilities

 * @hw: pointer to the hw struct

 * @hw: pointer to the HW struct

 * @buf: a virtual buffer to hold the capabilities

 * @buf_size: Size of the virtual buffer

 * @cap_count: cap count needed if AQ err==ENOMEM
@@ -1681,7 +1681,7 @@ enum ice_status ice_get_caps(struct ice_hw *hw) 


/**

 * ice_aq_manage_mac_write - manage MAC address write command

 * @hw: pointer to the hw struct

 * @hw: pointer to the HW struct

 * @mac_addr: MAC address to be written as LAA/LAA+WoL/Port address

 * @flags: flags to control write behavior

 * @cd: pointer to command details structure or NULL
@@ -1709,7 +1709,7 @@ ice_aq_manage_mac_write(struct ice_hw *hw, const u8 *mac_addr, u8 flags, 


/**

 * ice_aq_clear_pxe_mode

 * @hw: pointer to the hw struct

 * @hw: pointer to the HW struct

 *

 * Tell the firmware that the driver is taking over from PXE (0x0110).

 */
@@ -1725,7 +1725,7 @@ static enum ice_status ice_aq_clear_pxe_mode(struct ice_hw *hw) 


/**

 * ice_clear_pxe_mode - clear pxe operations mode

 * @hw: pointer to the hw struct

 * @hw: pointer to the HW struct

 *

 * Make sure all PXE mode settings are cleared, including things

 * like descriptor fetch/write-back mode.
@@ -1741,10 +1741,10 @@ void ice_clear_pxe_mode(struct ice_hw *hw) 
 * @phy_type_low: lower part of phy_type

 * @phy_type_high: higher part of phy_type

 *

 * This helper function will convert an entry in phy type structure

 * This helper function will convert an entry in PHY type structure

 * [phy_type_low, phy_type_high] to its corresponding link speed.

 * Note: In the structure of [phy_type_low, phy_type_high], there should

 * be one bit set, as this function will convert one phy type to its

 * be one bit set, as this function will convert one PHY type to its

 * speed.

 * If no bit gets set, ICE_LINK_SPEED_UNKNOWN will be returned

 * If more than one bit gets set, ICE_LINK_SPEED_UNKNOWN will be returned
@@ -1914,7 +1914,7 @@ ice_update_phy_type(u64 *phy_type_low, u64 *phy_type_high, 


/**

 * ice_aq_set_phy_cfg

 * @hw: pointer to the hw struct

 * @hw: pointer to the HW struct

 * @lport: logical port number

 * @cfg: structure with PHY configuration data to be set

 * @cd: pointer to command details structure or NULL
@@ -2029,7 +2029,7 @@ ice_set_fc(struct ice_port_info *pi, u8 *aq_failures, bool ena_auto_link_update) 
	if (!pcaps)

		return ICE_ERR_NO_MEMORY;



	/* Get the current phy config */

	/* Get the current PHY config */

	status = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_SW_CFG, pcaps,

				     NULL);

	if (status) {
@@ -2338,7 +2338,7 @@ ice_aq_set_rss_lut(struct ice_hw *hw, u16 vsi_handle, u8 lut_type, 


/**

 * __ice_aq_get_set_rss_key

 * @hw: pointer to the hw struct

 * @hw: pointer to the HW struct

 * @vsi_id: VSI FW index

 * @key: pointer to key info struct

 * @set: set true to set the key, false to get the key
@@ -2373,7 +2373,7 @@ ice_status __ice_aq_get_set_rss_key(struct ice_hw *hw, u16 vsi_id, 


/**

 * ice_aq_get_rss_key

 * @hw: pointer to the hw struct

 * @hw: pointer to the HW struct

 * @vsi_handle: software VSI handle

 * @key: pointer to key info struct

 *
@@ -2392,7 +2392,7 @@ ice_aq_get_rss_key(struct ice_hw *hw, u16 vsi_handle, 


/**

 * ice_aq_set_rss_key

 * @hw: pointer to the hw struct

 * @hw: pointer to the HW struct

 * @vsi_handle: software VSI handle

 * @keys: pointer to key info struct

 *
@@ -2517,7 +2517,7 @@ ice_aq_dis_lan_txq(struct ice_hw *hw, u8 num_qgrps, 
		break;

	case ICE_VF_RESET:

		cmd->cmd_type = ICE_AQC_Q_DIS_CMD_VF_RESET;

		/* In this case, FW expects vmvf_num to be absolute VF id */

		/* In this case, FW expects vmvf_num to be absolute VF ID */

		cmd->vmvf_and_timeout |=

			cpu_to_le16((vmvf_num + hw->func_caps.vf_base_id) &

				    ICE_AQC_Q_DIS_VMVF_NUM_M);
@@ -2794,13 +2794,13 @@ ice_set_ctx(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info) 
 * ice_ena_vsi_txq

 * @pi: port information structure

 * @vsi_handle: software VSI handle

 * @tc: tc number

 * @tc: TC number

 * @num_qgrps: Number of added queue groups

 * @buf: list of queue groups to be added

 * @buf_size: size of buffer for indirect command

 * @cd: pointer to command details structure or NULL

 *

 * This function adds one lan q

 * This function adds one LAN queue

 */

enum ice_status

ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps,
@@ -2844,11 +2844,11 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps, 
	 * Bit 5-6.

	 * - Bit 7 is reserved.

	 * Without setting the generic section as valid in valid_sections, the

	 * Admin Q command will fail with error code ICE_AQ_RC_EINVAL.

	 * Admin queue command will fail with error code ICE_AQ_RC_EINVAL.

	 */

	buf->txqs[0].info.valid_sections = ICE_AQC_ELEM_VALID_GENERIC;



	/* add the lan q */

	/* add the LAN queue */

	status = ice_aq_add_lan_txq(hw, num_qgrps, buf, buf_size, cd);

	if (status) {

		ice_debug(hw, ICE_DBG_SCHED, "enable Q %d failed %d\n",
@@ -2860,7 +2860,7 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps, 
	node.node_teid = buf->txqs[0].q_teid;

	node.data.elem_type = ICE_AQC_ELEM_TYPE_LEAF;



	/* add a leaf node into schduler tree q layer */

	/* add a leaf node into schduler tree queue layer */

	status = ice_sched_add_node(pi, hw->num_tx_sched_layers - 1, &node);



ena_txq_exit:
@@ -2930,7 +2930,7 @@ ice_dis_vsi_txq(struct ice_port_info *pi, u8 num_queues, u16 *q_ids, 
 * @vsi_handle: software VSI handle

 * @tc_bitmap: TC bitmap

 * @maxqs: max queues array per TC

 * @owner: lan or rdma

 * @owner: LAN or RDMA

 *

 * This function adds/updates the VSI queues per TC.

 */
@@ -2965,13 +2965,13 @@ ice_cfg_vsi_qs(struct ice_port_info *pi, u16 vsi_handle, u8 tc_bitmap, 
}



/**

 * ice_cfg_vsi_lan - configure VSI lan queues

 * ice_cfg_vsi_lan - configure VSI LAN queues

 * @pi: port information structure

 * @vsi_handle: software VSI handle

 * @tc_bitmap: TC bitmap

 * @max_lanqs: max lan queues array per TC

 * @max_lanqs: max LAN queues array per TC

 *

 * This function adds/updates the VSI lan queues per TC.

 * This function adds/updates the VSI LAN queues per TC.

 */

enum ice_status

ice_cfg_vsi_lan(struct ice_port_info *pi, u16 vsi_handle, u8 tc_bitmap,
@@ -2983,7 +2983,7 @@ ice_cfg_vsi_lan(struct ice_port_info *pi, u16 vsi_handle, u8 tc_bitmap, 


/**

 * ice_replay_pre_init - replay pre initialization

 * @hw: pointer to the hw struct

 * @hw: pointer to the HW struct

 *

 * Initializes required config data for VSI, FD, ACL, and RSS before replay.

 */
@@ -3007,7 +3007,7 @@ static enum ice_status ice_replay_pre_init(struct ice_hw *hw) 


/**

 * ice_replay_vsi - replay VSI configuration

 * @hw: pointer to the hw struct

 * @hw: pointer to the HW struct

 * @vsi_handle: driver VSI handle

 *

 * Restore all VSI configuration after reset. It is required to call this
@@ -3034,7 +3034,7 @@ enum ice_status ice_replay_vsi(struct ice_hw *hw, u16 vsi_handle) 


/**

 * ice_replay_post - post replay configuration cleanup

 * @hw: pointer to the hw struct

 * @hw: pointer to the HW struct

 *

 * Post replay cleanup.

 */

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

+5 −5
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static void ice_mailbox_init_regs(struct ice_hw *hw) 


/**

 * ice_check_sq_alive

 * @hw: pointer to the hw struct

 * @hw: pointer to the HW struct

 * @cq: pointer to the specific Control queue

 *

 * Returns true if Queue is enabled else false.
@@ -287,7 +287,7 @@ ice_cfg_sq_regs(struct ice_hw *hw, struct ice_ctl_q_info *cq) 
 * @hw: pointer to the hardware structure

 * @cq: pointer to the specific Control queue

 *

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

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

 */

static enum ice_status

ice_cfg_rq_regs(struct ice_hw *hw, struct ice_ctl_q_info *cq)
@@ -751,7 +751,7 @@ static u16 ice_clean_sq(struct ice_hw *hw, struct ice_ctl_q_info *cq) 


/**

 * ice_sq_done - check if FW has processed the Admin Send Queue (ATQ)

 * @hw: pointer to the hw struct

 * @hw: pointer to the HW struct

 * @cq: pointer to the specific Control queue

 *

 * Returns true if the firmware has processed all descriptors on the
@@ -767,7 +767,7 @@ static bool ice_sq_done(struct ice_hw *hw, struct ice_ctl_q_info *cq) 


/**

 * ice_sq_send_cmd - send command to Control Queue (ATQ)

 * @hw: pointer to the hw struct

 * @hw: pointer to the HW struct

 * @cq: pointer to the specific Control queue

 * @desc: prefilled descriptor describing the command (non DMA mem)

 * @buf: buffer to use for indirect commands (or NULL for direct commands)
@@ -962,7 +962,7 @@ void ice_fill_dflt_direct_cmd_desc(struct ice_aq_desc *desc, u16 opcode) 


/**

 * ice_clean_rq_elem

 * @hw: pointer to the hw struct

 * @hw: pointer to the HW struct

 * @cq: pointer to the specific Control queue

 * @e: event info from the receive descriptor, includes any buffers

 * @pending: number of events that could be left to process

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

+10 −10
Original line number Diff line number Diff line
@@ -811,7 +811,7 @@ ice_get_settings_link_up(struct ethtool_link_ksettings *ks, 


	link_info = &vsi->port_info->phy.link_info;



	/* Initialize supported and advertised settings based on phy settings */

	/* Initialize supported and advertised settings based on PHY settings */

	switch (link_info->phy_type_low) {

	case ICE_PHY_TYPE_LOW_100BASE_TX:

		ethtool_link_ksettings_add_link_mode(ks, supported, Autoneg);
@@ -1140,7 +1140,7 @@ ice_get_settings_link_down(struct ethtool_link_ksettings *ks, 
			   struct net_device __always_unused *netdev)

{

	/* link is down and the driver needs to fall back on

	 * supported phy types to figure out what info to display

	 * supported PHY types to figure out what info to display

	 */

	ice_phy_type_to_ethtool(netdev, ks);
@@ -1350,7 +1350,7 @@ ice_setup_autoneg(struct ice_port_info *p, struct ethtool_link_ksettings *ks, 
	} else {

		/* If autoneg is currently enabled */

		if (p->phy.link_info.an_info & ICE_AQ_AN_COMPLETED) {

			/* If autoneg is supported 10GBASE_T is the only phy

			/* If autoneg is supported 10GBASE_T is the only PHY

			 * that can disable it, so otherwise return error

			 */

			if (ethtool_link_ksettings_test_link_mode(ks,
@@ -1400,7 +1400,7 @@ ice_set_link_ksettings(struct net_device *netdev, 
	if (!p)

		return -EOPNOTSUPP;



	/* Check if this is lan vsi */

	/* Check if this is LAN VSI */

	ice_for_each_vsi(pf, idx)

		if (pf->vsi[idx]->type == ICE_VSI_PF) {

			if (np->vsi != pf->vsi[idx])
@@ -1464,7 +1464,7 @@ ice_set_link_ksettings(struct net_device *netdev, 
	if (!abilities)

		return -ENOMEM;



	/* Get the current phy config */

	/* Get the current PHY config */

	status = ice_aq_get_phy_caps(p, false, ICE_AQC_REPORT_SW_CFG, abilities,

				     NULL);

	if (status) {
@@ -1559,7 +1559,7 @@ ice_set_link_ksettings(struct net_device *netdev, 
}



/**

 * ice_get_rxnfc - command to get RX flow classification rules

 * ice_get_rxnfc - command to get Rx flow classification rules

 * @netdev: network interface device structure

 * @cmd: ethtool rxnfc command

 * @rule_locs: buffer to rturn Rx flow classification rules
@@ -1833,7 +1833,7 @@ ice_get_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *pause) 
	if (!pcaps)

		return;



	/* Get current phy config */

	/* Get current PHY config */

	status = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_SW_CFG, pcaps,

				     NULL);

	if (status)
@@ -2022,7 +2022,7 @@ ice_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key, u8 *hfunc) 
 * @key: hash key

 * @hfunc: hash function

 *

 * Returns -EINVAL if the table specifies an invalid queue id, otherwise

 * Returns -EINVAL if the table specifies an invalid queue ID, otherwise

 * returns 0 after programming the table.

 */

static int
@@ -2089,7 +2089,7 @@ enum ice_container_type { 
/**

 * ice_get_rc_coalesce - get ITR values for specific ring container

 * @ec: ethtool structure to fill with driver's coalesce settings

 * @c_type: container type, RX or TX

 * @c_type: container type, Rx or Tx

 * @rc: ring container that the ITR values will come from

 *

 * Query the device for ice_ring_container specific ITR values. This is
@@ -2191,7 +2191,7 @@ ice_get_per_q_coalesce(struct net_device *netdev, u32 q_num, 


/**

 * ice_set_rc_coalesce - set ITR values for specific ring container

 * @c_type: container type, RX or TX

 * @c_type: container type, Rx or Tx

 * @ec: ethtool structure from user to update ITR settings

 * @rc: ring container that the ITR values will come from

 * @vsi: VSI associated to the ring container