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

Commit 16111991 authored by David S. Miller's avatar David S. Miller
Browse files

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



Jeff Kirsher says:

====================
100GbE Intel Wired LAN Driver Updates 2019-04-18

This series contains updates to the ice driver only.

Anirudh fixes up code comments which had typos.  Added support for DCB
into the ice driver, which required a bit of refactoring of the existing
code.  Also fixed a potential race condition between closing and opening
the VSI for a MIB change event, so resolved this by grabbing the
rtnl_lock prior to closing.  Added support to process LLDP MIB change
notifications.  Added support for reporting DCB stats via ethtool.

Brett updates the calculation to increment ITR to use a direct
calculation instead of using estimations.  This provides a more accurate
value.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f9a904ef 711987bb

drivers/net/ethernet/intel/ice/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -17,3 +17,4 @@ ice-y := ice_main.o \ 
	 ice_txrx.o	\

	 ice_ethtool.o

ice-$(CONFIG_PCI_IOV) += ice_virtchnl_pf.o ice_sriov.o

ice-$(CONFIG_DCB) += ice_dcb.o ice_dcb_lib.o

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

+18 −12
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include "ice_devids.h"

#include "ice_type.h"

#include "ice_txrx.h"

#include "ice_dcb.h"

#include "ice_switch.h"

#include "ice_common.h"

#include "ice_sched.h"
@@ -151,7 +152,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];

};
@@ -162,7 +163,7 @@ struct ice_res_tracker { 
};



struct ice_qs_cfg {

	struct mutex *qs_mutex;  /* will be assgined to &pf->avail_q_mutex */

	struct mutex *qs_mutex;  /* will be assigned to &pf->avail_q_mutex */

	unsigned long *pf_map;

	unsigned long pf_map_size;

	unsigned int q_count;
@@ -321,7 +322,11 @@ enum ice_pf_flags { 
	ICE_FLAG_RSS_ENA,

	ICE_FLAG_SRIOV_ENA,

	ICE_FLAG_SRIOV_CAPABLE,

	ICE_FLAG_DCB_CAPABLE,

	ICE_FLAG_DCB_ENA,

	ICE_FLAG_LINK_DOWN_ON_CLOSE_ENA,

	ICE_FLAG_DISABLE_FW_LLDP,

	ICE_FLAG_ETHTOOL_CTXT,		/* set when ethtool holds RTNL lock */

	ICE_PF_FLAGS_NBITS		/* must be last */

};
@@ -360,8 +365,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! */
@@ -375,6 +380,9 @@ struct ice_pf { 
	struct ice_hw_port_stats stats_prev;

	struct ice_hw hw;

	u8 stat_prev_loaded;	/* has previous stats been loaded */

#ifdef CONFIG_DCB

	u16 dcbx_cap;

#endif /* CONFIG_DCB */

	u32 tx_timeout_count;

	unsigned long tx_timeout_last_recovery;

	u32 tx_timeout_recovery_level;
@@ -387,8 +395,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
@@ -411,12 +419,6 @@ ice_irq_dynamic_ena(struct ice_hw *hw, struct ice_vsi *vsi, 
	wr32(hw, GLINT_DYN_CTL(vector), val);

}



static inline void ice_vsi_set_tc_cfg(struct ice_vsi *vsi)

{

	vsi->tc_cfg.ena_tc =  ICE_DFLT_TRAFFIC_CLASS;

	vsi->tc_cfg.numtc = 1;

}



void ice_set_ethtool_ops(struct net_device *netdev);

int ice_up(struct ice_vsi *vsi);

int ice_down(struct ice_vsi *vsi);
@@ -425,5 +427,9 @@ int ice_get_rss(struct ice_vsi *vsi, u8 *seed, u8 *lut, u16 lut_size); 
void ice_fill_rss_lut(u8 *lut, u16 rss_table_size, u16 rss_size);

void ice_print_link_msg(struct ice_vsi *vsi, bool isup);

void ice_napi_del(struct ice_vsi *vsi);

#ifdef CONFIG_DCB

int ice_pf_ena_all_vsi(struct ice_pf *pf, bool locked);

void ice_pf_dis_all_vsi(struct ice_pf *pf, bool locked);

#endif /* CONFIG_DCB */



#endif /* _ICE_H_ */

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

+174 −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;
@@ -747,6 +747,32 @@ struct ice_aqc_delete_elem { 
	__le32 teid[1];

};



/* Query Port ETS (indirect 0x040E)

 *

 * This indirect command is used to query port TC node configuration.

 */

struct ice_aqc_query_port_ets {

	__le32 port_teid;

	__le32 reserved;

	__le32 addr_high;

	__le32 addr_low;

};



struct ice_aqc_port_ets_elem {

	u8 tc_valid_bits;

	u8 reserved[3];

	/* 3 bits for UP per TC 0-7, 4th byte reserved */

	__le32 up2tc;

	u8 tc_bw_share[8];

	__le32 port_eir_prof_id;

	__le32 port_cir_prof_id;

	/* 3 bits per Node priority to TC 0-7, 4th byte reserved */

	__le32 tc_node_prio;

#define ICE_TC_NODE_PRIO_S	0x4

	u8 reserved1[4];

	__le32 tc_node_teid[8]; /* Used for response, reserved in command */

};



/* Query Scheduler Resource Allocation (indirect 0x0412)

 * This indirect command retrieves the scheduler resources allocated by

 * EMP Firmware to the given PF.
@@ -1024,7 +1050,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 +1146,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 {
@@ -1132,6 +1158,126 @@ struct ice_aqc_pf_vf_msg { 
	__le32 addr_low;

};



/* Get LLDP MIB (indirect 0x0A00)

 * Note: This is also used by the LLDP MIB Change Event (0x0A01)

 * as the format is the same.

 */

struct ice_aqc_lldp_get_mib {

	u8 type;

#define ICE_AQ_LLDP_MIB_TYPE_S			0

#define ICE_AQ_LLDP_MIB_TYPE_M			(0x3 << ICE_AQ_LLDP_MIB_TYPE_S)

#define ICE_AQ_LLDP_MIB_LOCAL			0

#define ICE_AQ_LLDP_MIB_REMOTE			1

#define ICE_AQ_LLDP_MIB_LOCAL_AND_REMOTE	2

#define ICE_AQ_LLDP_BRID_TYPE_S			2

#define ICE_AQ_LLDP_BRID_TYPE_M			(0x3 << ICE_AQ_LLDP_BRID_TYPE_S)

#define ICE_AQ_LLDP_BRID_TYPE_NEAREST_BRID	0

#define ICE_AQ_LLDP_BRID_TYPE_NON_TPMR		1

/* Tx pause flags in the 0xA01 event use ICE_AQ_LLDP_TX_* */

#define ICE_AQ_LLDP_TX_S			0x4

#define ICE_AQ_LLDP_TX_M			(0x03 << ICE_AQ_LLDP_TX_S)

#define ICE_AQ_LLDP_TX_ACTIVE			0

#define ICE_AQ_LLDP_TX_SUSPENDED		1

#define ICE_AQ_LLDP_TX_FLUSHED			3

/* The following bytes are reserved for the Get LLDP MIB command (0x0A00)

 * and in the LLDP MIB Change Event (0x0A01). They are valid for the

 * Get LLDP MIB (0x0A00) response only.

 */

	u8 reserved1;

	__le16 local_len;

	__le16 remote_len;

	u8 reserved2[2];

	__le32 addr_high;

	__le32 addr_low;

};



/* Configure LLDP MIB Change Event (direct 0x0A01) */

/* For MIB Change Event use ice_aqc_lldp_get_mib structure above */

struct ice_aqc_lldp_set_mib_change {

	u8 command;

#define ICE_AQ_LLDP_MIB_UPDATE_ENABLE		0x0

#define ICE_AQ_LLDP_MIB_UPDATE_DIS		0x1

	u8 reserved[15];

};



/* Stop LLDP (direct 0x0A05) */

struct ice_aqc_lldp_stop {

	u8 command;

#define ICE_AQ_LLDP_AGENT_STATE_MASK	BIT(0)

#define ICE_AQ_LLDP_AGENT_STOP		0x0

#define ICE_AQ_LLDP_AGENT_SHUTDOWN	ICE_AQ_LLDP_AGENT_STATE_MASK

#define ICE_AQ_LLDP_AGENT_PERSIST_DIS	BIT(1)

	u8 reserved[15];

};



/* Start LLDP (direct 0x0A06) */

struct ice_aqc_lldp_start {

	u8 command;

#define ICE_AQ_LLDP_AGENT_START		BIT(0)

#define ICE_AQ_LLDP_AGENT_PERSIST_ENA	BIT(1)

	u8 reserved[15];

};



/* Get CEE DCBX Oper Config (0x0A07)

 * The command uses the generic descriptor struct and

 * returns the struct below as an indirect response.

 */

struct ice_aqc_get_cee_dcb_cfg_resp {

	u8 oper_num_tc;

	u8 oper_prio_tc[4];

	u8 oper_tc_bw[8];

	u8 oper_pfc_en;

	__le16 oper_app_prio;

#define ICE_AQC_CEE_APP_FCOE_S		0

#define ICE_AQC_CEE_APP_FCOE_M		(0x7 << ICE_AQC_CEE_APP_FCOE_S)

#define ICE_AQC_CEE_APP_ISCSI_S		3

#define ICE_AQC_CEE_APP_ISCSI_M		(0x7 << ICE_AQC_CEE_APP_ISCSI_S)

#define ICE_AQC_CEE_APP_FIP_S		8

#define ICE_AQC_CEE_APP_FIP_M		(0x7 << ICE_AQC_CEE_APP_FIP_S)

	__le32 tlv_status;

#define ICE_AQC_CEE_PG_STATUS_S		0

#define ICE_AQC_CEE_PG_STATUS_M		(0x7 << ICE_AQC_CEE_PG_STATUS_S)

#define ICE_AQC_CEE_PFC_STATUS_S	3

#define ICE_AQC_CEE_PFC_STATUS_M	(0x7 << ICE_AQC_CEE_PFC_STATUS_S)

#define ICE_AQC_CEE_FCOE_STATUS_S	8

#define ICE_AQC_CEE_FCOE_STATUS_M	(0x7 << ICE_AQC_CEE_FCOE_STATUS_S)

#define ICE_AQC_CEE_ISCSI_STATUS_S	11

#define ICE_AQC_CEE_ISCSI_STATUS_M	(0x7 << ICE_AQC_CEE_ISCSI_STATUS_S)

#define ICE_AQC_CEE_FIP_STATUS_S	16

#define ICE_AQC_CEE_FIP_STATUS_M	(0x7 << ICE_AQC_CEE_FIP_STATUS_S)

	u8 reserved[12];

};



/* Set Local LLDP MIB (indirect 0x0A08)

 * Used to replace the local MIB of a given LLDP agent. e.g. DCBx

 */

struct ice_aqc_lldp_set_local_mib {

	u8 type;

#define SET_LOCAL_MIB_TYPE_DCBX_M		BIT(0)

#define SET_LOCAL_MIB_TYPE_LOCAL_MIB		0

#define SET_LOCAL_MIB_TYPE_CEE_M		BIT(1)

#define SET_LOCAL_MIB_TYPE_CEE_WILLING		0

#define SET_LOCAL_MIB_TYPE_CEE_NON_WILLING	SET_LOCAL_MIB_TYPE_CEE_M

	u8 reserved0;

	__le16 length;

	u8 reserved1[4];

	__le32 addr_high;

	__le32 addr_low;

};



/* Stop/Start LLDP Agent (direct 0x0A09)

 * Used for stopping/starting specific LLDP agent. e.g. DCBx.

 * The same structure is used for the response, with the command field

 * being used as the status field.

 */

struct ice_aqc_lldp_stop_start_specific_agent {

	u8 command;

#define ICE_AQC_START_STOP_AGENT_M		BIT(0)

#define ICE_AQC_START_STOP_AGENT_STOP_DCBX	0

#define ICE_AQC_START_STOP_AGENT_START_DCBX	ICE_AQC_START_STOP_AGENT_M

	u8 reserved[15];

};



/* Get/Set RSS key (indirect 0x0B04/0x0B02) */

struct ice_aqc_get_set_rss_key {

#define ICE_AQC_GSET_RSS_KEY_VSI_VALID	BIT(15)
@@ -1186,7 +1332,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 +1341,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 +1353,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 +1365,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 +1387,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
@@ -1388,8 +1534,15 @@ struct ice_aq_desc { 
		struct ice_aqc_get_topo get_topo;

		struct ice_aqc_sched_elem_cmd sched_elem_cmd;

		struct ice_aqc_query_txsched_res query_sched_res;

		struct ice_aqc_query_port_ets port_ets;

		struct ice_aqc_nvm nvm;

		struct ice_aqc_pf_vf_msg virt;

		struct ice_aqc_lldp_get_mib lldp_get_mib;

		struct ice_aqc_lldp_set_mib_change lldp_set_event;

		struct ice_aqc_lldp_stop lldp_stop;

		struct ice_aqc_lldp_start lldp_start;

		struct ice_aqc_lldp_set_local_mib lldp_set_mib;

		struct ice_aqc_lldp_stop_start_specific_agent lldp_agent_ctrl;

		struct ice_aqc_get_set_rss_lut get_set_rss_lut;

		struct ice_aqc_get_set_rss_key get_set_rss_key;

		struct ice_aqc_add_txqs add_txqs;
@@ -1422,6 +1575,8 @@ struct ice_aq_desc { 
/* error codes */

enum ice_aq_err {

	ICE_AQ_RC_OK		= 0,  /* Success */

	ICE_AQ_RC_EPERM		= 1,  /* Operation not permitted */

	ICE_AQ_RC_ENOENT	= 2,  /* No such element */

	ICE_AQ_RC_ENOMEM	= 9,  /* Out of memory */

	ICE_AQ_RC_EBUSY		= 12, /* Device or resource busy */

	ICE_AQ_RC_EEXIST	= 13, /* Object already exists */
@@ -1474,6 +1629,7 @@ enum ice_adminq_opc { 
	ice_aqc_opc_get_sched_elems			= 0x0404,

	ice_aqc_opc_suspend_sched_elems			= 0x0409,

	ice_aqc_opc_resume_sched_elems			= 0x040A,

	ice_aqc_opc_query_port_ets			= 0x040E,

	ice_aqc_opc_delete_sched_elems			= 0x040F,

	ice_aqc_opc_query_sched_res			= 0x0412,
@@ -1491,6 +1647,14 @@ enum ice_adminq_opc { 
	/* PF/VF mailbox commands */

	ice_mbx_opc_send_msg_to_pf			= 0x0801,

	ice_mbx_opc_send_msg_to_vf			= 0x0802,

	/* LLDP commands */

	ice_aqc_opc_lldp_get_mib			= 0x0A00,

	ice_aqc_opc_lldp_set_mib_change			= 0x0A01,

	ice_aqc_opc_lldp_stop				= 0x0A05,

	ice_aqc_opc_lldp_start				= 0x0A06,

	ice_aqc_opc_get_cee_dcb_cfg			= 0x0A07,

	ice_aqc_opc_lldp_set_local_mib			= 0x0A08,

	ice_aqc_opc_lldp_stop_start_specific_agent	= 0x0A09,



	/* RSS commands */

	ice_aqc_opc_set_rss_key				= 0x0B02,
@@ -1498,7 +1662,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

+75 −50
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

 *
@@ -2477,7 +2477,7 @@ ice_aq_add_lan_txq(struct ice_hw *hw, u8 num_qgrps, 
 * @num_qgrps: number of groups in the list

 * @qg_list: the list of groups to disable

 * @buf_size: the total size of the qg_list buffer in bytes

 * @rst_src: if called due to reset, specifies the RST source

 * @rst_src: if called due to reset, specifies the reset source

 * @vmvf_num: the relative VM or VF number that is undergoing the reset

 * @cd: pointer to command details structure or NULL

 *
@@ -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:
@@ -2874,7 +2874,7 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps, 
 * @num_queues: number of queues

 * @q_ids: pointer to the q_id array

 * @q_teids: pointer to queue node teids

 * @rst_src: if called due to reset, specifies the RST source

 * @rst_src: if called due to reset, specifies the reset source

 * @vmvf_num: the relative VM or VF number that is undergoing the reset

 * @cd: pointer to command details structure or NULL

 *
@@ -2925,12 +2925,12 @@ ice_dis_vsi_txq(struct ice_port_info *pi, u8 num_queues, u16 *q_ids, 
}



/**

 * ice_cfg_vsi_qs - configure the new/exisiting VSI queues

 * ice_cfg_vsi_qs - configure the new/existing VSI queues

 * @pi: port information structure

 * @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.

 */
@@ -3106,3 +3106,28 @@ ice_stat_update32(struct ice_hw *hw, u32 reg, bool prev_stat_loaded, 
		/* to manage the potential roll-over */

		*cur_stat = (new_data + BIT_ULL(32)) - *prev_stat;

}



/**

 * ice_sched_query_elem - query element information from HW

 * @hw: pointer to the HW struct

 * @node_teid: node TEID to be queried

 * @buf: buffer to element information

 *

 * This function queries HW element information

 */

enum ice_status

ice_sched_query_elem(struct ice_hw *hw, u32 node_teid,

		     struct ice_aqc_get_elem *buf)

{

	u16 buf_size, num_elem_ret = 0;

	enum ice_status status;



	buf_size = sizeof(*buf);

	memset(buf, 0, buf_size);

	buf->generic[0].node_teid = cpu_to_le32(node_teid);

	status = ice_aq_query_sched_elems(hw, 1, buf, buf_size, &num_elem_ret,

					  NULL);

	if (status || num_elem_ret != 1)

		ice_debug(hw, ICE_DBG_SCHED, "query element failed\n");

	return status;

}

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

+3 −0
Original line number Diff line number Diff line
@@ -118,4 +118,7 @@ ice_stat_update40(struct ice_hw *hw, u32 hireg, u32 loreg, 
void

ice_stat_update32(struct ice_hw *hw, u32 reg, bool prev_stat_loaded,

		  u64 *prev_stat, u64 *cur_stat);

enum ice_status

ice_sched_query_elem(struct ice_hw *hw, u32 node_teid,

		     struct ice_aqc_get_elem *buf);

#endif /* _ICE_COMMON_H_ */