Commit 23ccae5c authored by Dave Ertman's avatar Dave Ertman Committed by Tony Nguyen
Browse files

ice: changes to the interface with the HW and FW for SRIOV_VF+LAG 



Add defines needed for interaction with the FW admin queue interface
in relation to supporting LAG and SRIOV VFs interacting.

Add code, or make non-static previously static functions, to access
the new and changed admin queue calls for LAG.

Reviewed-by: default avatarDaniel Machon <daniel.machon@microchip.com>
Signed-off-by: default avatarDave Ertman <david.m.ertman@intel.com>
Tested-by: default avatarSujai Buvaneswaran <sujai.buvaneswaran@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent bb52f42a

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

+49 −1
Original line number Diff line number Diff line
@@ -235,6 +235,8 @@ struct ice_aqc_set_port_params { 
#define ICE_AQC_SET_P_PARAMS_DOUBLE_VLAN_ENA	BIT(2)

	__le16 bad_frame_vsi;

	__le16 swid;

#define ICE_AQC_PORT_SWID_VALID			BIT(15)

#define ICE_AQC_PORT_SWID_M			0xFF

	u8 reserved[10];

};
@@ -244,10 +246,12 @@ struct ice_aqc_set_port_params { 
 * Allocate Resources command (indirect 0x0208)

 * Free Resources command (indirect 0x0209)

 * Get Allocated Resource Descriptors Command (indirect 0x020A)

 * Share Resource command (indirect 0x020B)

 */

#define ICE_AQC_RES_TYPE_VSI_LIST_REP			0x03

#define ICE_AQC_RES_TYPE_VSI_LIST_PRUNE			0x04

#define ICE_AQC_RES_TYPE_RECIPE				0x05

#define ICE_AQC_RES_TYPE_SWID				0x07

#define ICE_AQC_RES_TYPE_FDIR_COUNTER_BLOCK		0x21

#define ICE_AQC_RES_TYPE_FDIR_GUARANTEED_ENTRIES	0x22

#define ICE_AQC_RES_TYPE_FDIR_SHARED_ENTRIES		0x23
@@ -267,6 +271,7 @@ struct ice_aqc_set_port_params { 


/* Allocate Resources command (indirect 0x0208)

 * Free Resources command (indirect 0x0209)

 * Share Resource command (indirect 0x020B)

 */

struct ice_aqc_alloc_free_res_cmd {

	__le16 num_entries; /* Number of Resource entries */
@@ -821,7 +826,11 @@ struct ice_aqc_txsched_move_grp_info_hdr { 
	__le32 src_parent_teid;

	__le32 dest_parent_teid;

	__le16 num_elems;

	__le16 reserved;

	u8 mode;

#define ICE_AQC_MOVE_ELEM_MODE_SAME_PF		0x0

#define ICE_AQC_MOVE_ELEM_MODE_GIVE_OWN		0x1

#define ICE_AQC_MOVE_ELEM_MODE_KEEP_OWN		0x2

	u8 reserved;

};



struct ice_aqc_move_elem {
@@ -1926,6 +1935,42 @@ struct ice_aqc_dis_txq_item { 
	__le16 q_id[];

} __packed;



/* Move/Reconfigure Tx queue (indirect 0x0C32) */

struct ice_aqc_cfg_txqs {

	u8 cmd_type;

#define ICE_AQC_Q_CFG_MOVE_NODE		0x1

#define ICE_AQC_Q_CFG_TC_CHNG		0x2

#define ICE_AQC_Q_CFG_MOVE_TC_CHNG	0x3

#define ICE_AQC_Q_CFG_SUBSEQ_CALL	BIT(2)

#define ICE_AQC_Q_CFG_FLUSH		BIT(3)

	u8 num_qs;

	u8 port_num_chng;

#define ICE_AQC_Q_CFG_SRC_PRT_M		0x7

#define ICE_AQC_Q_CFG_DST_PRT_S		3

#define ICE_AQC_Q_CFG_DST_PRT_M		(0x7 << ICE_AQC_Q_CFG_DST_PRT_S)

	u8 time_out;

#define ICE_AQC_Q_CFG_TIMEOUT_S		2

#define ICE_AQC_Q_CFG_TIMEOUT_M		(0x1F << ICE_AQC_Q_CFG_TIMEOUT_S)

	__le32 blocked_cgds;

	__le32 addr_high;

	__le32 addr_low;

};



/* Per Q struct for Move/Reconfigure Tx LAN Queues (indirect 0x0C32) */

struct ice_aqc_cfg_txq_perq {

	__le16 q_handle;

	u8 tc;

	u8 rsvd;

	__le32 q_teid;

};



/* The buffer for Move/Reconfigure Tx LAN Queues (indirect 0x0C32) */

struct ice_aqc_cfg_txqs_buf {

	__le32 src_parent_teid;

	__le32 dst_parent_teid;

	struct ice_aqc_cfg_txq_perq queue_info[];

};



/* Add Tx RDMA Queue Set (indirect 0x0C33) */

struct ice_aqc_add_rdma_qset {

	u8 num_qset_grps;
@@ -2184,6 +2229,7 @@ struct ice_aq_desc { 
		struct ice_aqc_neigh_dev_req neigh_dev;

		struct ice_aqc_add_txqs add_txqs;

		struct ice_aqc_dis_txqs dis_txqs;

		struct ice_aqc_cfg_txqs cfg_txqs;

		struct ice_aqc_add_rdma_qset add_rdma_qset;

		struct ice_aqc_add_get_update_free_vsi vsi_cmd;

		struct ice_aqc_add_update_free_vsi_resp add_update_free_vsi_res;
@@ -2266,6 +2312,7 @@ enum ice_adminq_opc { 
	/* Alloc/Free/Get Resources */

	ice_aqc_opc_alloc_res				= 0x0208,

	ice_aqc_opc_free_res				= 0x0209,

	ice_aqc_opc_share_res				= 0x020B,

	ice_aqc_opc_set_vlan_mode_parameters		= 0x020C,

	ice_aqc_opc_get_vlan_mode_parameters		= 0x020D,
@@ -2359,6 +2406,7 @@ enum ice_adminq_opc { 
	/* Tx queue handling commands/events */

	ice_aqc_opc_add_txqs				= 0x0C30,

	ice_aqc_opc_dis_txqs				= 0x0C31,

	ice_aqc_opc_cfg_txqs				= 0x0C32,

	ice_aqc_opc_add_rdma_qset			= 0x0C33,



	/* package commands */

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

+47 −0
Original line number Diff line number Diff line
@@ -4229,6 +4229,53 @@ ice_aq_dis_lan_txq(struct ice_hw *hw, u8 num_qgrps, 
	return status;

}



/**

 * ice_aq_cfg_lan_txq

 * @hw: pointer to the hardware structure

 * @buf: buffer for command

 * @buf_size: size of buffer in bytes

 * @num_qs: number of queues being configured

 * @oldport: origination lport

 * @newport: destination lport

 * @cd: pointer to command details structure or NULL

 *

 * Move/Configure LAN Tx queue (0x0C32)

 *

 * There is a better AQ command to use for moving nodes, so only coding

 * this one for configuring the node.

 */

int

ice_aq_cfg_lan_txq(struct ice_hw *hw, struct ice_aqc_cfg_txqs_buf *buf,

		   u16 buf_size, u16 num_qs, u8 oldport, u8 newport,

		   struct ice_sq_cd *cd)

{

	struct ice_aqc_cfg_txqs *cmd;

	struct ice_aq_desc desc;

	int status;



	cmd = &desc.params.cfg_txqs;

	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_cfg_txqs);

	desc.flags |= cpu_to_le16(ICE_AQ_FLAG_RD);



	if (!buf)

		return -EINVAL;



	cmd->cmd_type = ICE_AQC_Q_CFG_TC_CHNG;

	cmd->num_qs = num_qs;

	cmd->port_num_chng = (oldport & ICE_AQC_Q_CFG_SRC_PRT_M);

	cmd->port_num_chng |= (newport << ICE_AQC_Q_CFG_DST_PRT_S) &

			      ICE_AQC_Q_CFG_DST_PRT_M;

	cmd->time_out = (5 << ICE_AQC_Q_CFG_TIMEOUT_S) &

			ICE_AQC_Q_CFG_TIMEOUT_M;

	cmd->blocked_cgds = 0;



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

	if (status)

		ice_debug(hw, ICE_DBG_SCHED, "Failed to reconfigure nodes %d\n",

			  hw->adminq.sq_last_status);

	return status;

}



/**

 * ice_aq_add_rdma_qsets

 * @hw: pointer to the hardware structure

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

+4 −0
Original line number Diff line number Diff line
@@ -186,6 +186,10 @@ int 
ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u16 q_handle,

		u8 num_qgrps, struct ice_aqc_add_tx_qgrp *buf, u16 buf_size,

		struct ice_sq_cd *cd);

int

ice_aq_cfg_lan_txq(struct ice_hw *hw, struct ice_aqc_cfg_txqs_buf *buf,

		   u16 buf_size, u16 num_qs, u8 oldport, u8 newport,

		   struct ice_sq_cd *cd);

int ice_replay_vsi(struct ice_hw *hw, u16 vsi_handle);

void ice_replay_post(struct ice_hw *hw);

void ice_output_fw_log(struct ice_hw *hw, struct ice_aq_desc *desc, void *buf);

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

+7 −7
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ ice_aq_cfg_sched_elems(struct ice_hw *hw, u16 elems_req, 
 *

 * Move scheduling elements (0x0408)

 */

static int

int

ice_aq_move_sched_elems(struct ice_hw *hw, u16 grps_req,

			struct ice_aqc_move_elem *buf, u16 buf_size,

			u16 *grps_movd, struct ice_sq_cd *cd)
@@ -526,7 +526,7 @@ ice_aq_query_sched_res(struct ice_hw *hw, u16 buf_size, 
 *

 * This function suspends or resumes HW nodes

 */

static int

int

ice_sched_suspend_resume_elems(struct ice_hw *hw, u8 num_nodes, u32 *node_teids,

			       bool suspend)

{
@@ -1057,7 +1057,7 @@ ice_sched_add_nodes_to_hw_layer(struct ice_port_info *pi, 
 *

 * This function add nodes to a given layer.

 */

static int

int

ice_sched_add_nodes_to_layer(struct ice_port_info *pi,

			     struct ice_sched_node *tc_node,

			     struct ice_sched_node *parent, u8 layer,
@@ -1132,7 +1132,7 @@ static u8 ice_sched_get_qgrp_layer(struct ice_hw *hw) 
 *

 * This function returns the current VSI layer number

 */

static u8 ice_sched_get_vsi_layer(struct ice_hw *hw)

u8 ice_sched_get_vsi_layer(struct ice_hw *hw)

{

	/* Num Layers       VSI layer

	 *     9               6
@@ -1155,7 +1155,7 @@ static u8 ice_sched_get_vsi_layer(struct ice_hw *hw) 
 *

 * This function returns the current aggregator layer number

 */

static u8 ice_sched_get_agg_layer(struct ice_hw *hw)

u8 ice_sched_get_agg_layer(struct ice_hw *hw)

{

	/* Num Layers       aggregator layer

	 *     9               4
@@ -1590,7 +1590,7 @@ ice_sched_get_vsi_node(struct ice_port_info *pi, struct ice_sched_node *tc_node, 
 * This function retrieves an aggregator node for a given aggregator ID from

 * a given TC branch

 */

static struct ice_sched_node *

struct ice_sched_node *

ice_sched_get_agg_node(struct ice_port_info *pi, struct ice_sched_node *tc_node,

		       u32 agg_id)

{
@@ -2152,7 +2152,7 @@ ice_get_agg_info(struct ice_hw *hw, u32 agg_id) 
 * This function walks through the aggregator subtree to find a free parent

 * node

 */

static struct ice_sched_node *

struct ice_sched_node *

ice_sched_get_free_vsi_parent(struct ice_hw *hw, struct ice_sched_node *node,

			      u16 *num_nodes)

{

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

+21 −0
Original line number Diff line number Diff line
@@ -146,8 +146,29 @@ ice_sched_set_node_bw_lmt_per_tc(struct ice_port_info *pi, u32 id, 
				 enum ice_agg_type agg_type, u8 tc,

				 enum ice_rl_type rl_type, u32 bw);

int ice_cfg_rl_burst_size(struct ice_hw *hw, u32 bytes);

int

ice_sched_suspend_resume_elems(struct ice_hw *hw, u8 num_nodes, u32 *node_teids,

			       bool suspend);

struct ice_sched_node *

ice_sched_get_agg_node(struct ice_port_info *pi, struct ice_sched_node *tc_node,

		       u32 agg_id);

u8 ice_sched_get_agg_layer(struct ice_hw *hw);

u8 ice_sched_get_vsi_layer(struct ice_hw *hw);

struct ice_sched_node *

ice_sched_get_free_vsi_parent(struct ice_hw *hw, struct ice_sched_node *node,

			      u16 *num_nodes);

int

ice_sched_add_nodes_to_layer(struct ice_port_info *pi,

			     struct ice_sched_node *tc_node,

			     struct ice_sched_node *parent, u8 layer,

			     u16 num_nodes, u32 *first_node_teid,

			     u16 *num_nodes_added);

void ice_sched_replay_agg_vsi_preinit(struct ice_hw *hw);

void ice_sched_replay_agg(struct ice_hw *hw);

int

ice_aq_move_sched_elems(struct ice_hw *hw, u16 grps_req,

			struct ice_aqc_move_elem *buf, u16 buf_size,

			u16 *grps_movd, struct ice_sq_cd *cd);

int ice_replay_vsi_agg(struct ice_hw *hw, u16 vsi_handle);

int ice_sched_replay_q_bw(struct ice_port_info *pi, struct ice_q_ctx *q_ctx);

#endif /* _ICE_SCHED_H_ */