Commit f1ff4e80 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-11-08

Another series that contains updates to the ice driver only.

Anirudh cleans up the code of kernel config of ifdef wrappers by moving
code that is needed by DCB to disable and enable the PF VSI for
configuration.  Implements ice_vsi_type_str() to convert an VSI type
enum value to its string equivalent to help identify VSI types from
module print statements.

Usha and Tarun add support for setting the maximum per-queue bit rate
for transmit queues.

Dave implements dcb_nl set functions and supporting software DCB
functions to support the callbacks defined in the dcbnl_rtnl_ops
structure.

Henry adds a check to ensure we are not resetting the device when trying
to configure it, and to return -EBUSY during a reset.

Usha fixes a call trace caused by the receive/transmit descriptor size
change request via ethtool when DCB is configured by using the number of
enabled queues and not the total number of allocated queues.

Paul cleans up and refactors the software LLDP configuration to handle
when firmware DCBX is disabled.

Akeem adds checks to ensure the VF or PF is not disabled before honoring
mailbox messages to configure the VF.

Brett corrects the check to make sure the vector_id passed down from
iavf is less than the max allowed interrupts per VF.  Updates a flag bit
to align with the current specification.

Bruce updates a switch statement to use the correct status of the
Download Package AQ command.  Does some housekeeping by cleaning up a
conditional check that is not needed.

Mitch shortens up the delay for SQ responses to resolve issues with VF
resets failing.

Jake cleans up the code reducing namespace pollution and to simplify
ice_debug_cq() since it always uses the same mask, not need to pass it
in.  Improve debugging by adding the command opcode in the debug
messages that print an error code.

v2: fixed reverse christmas tree issue in patch 3 of the series.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents bbab7ef2 fb0254b2

drivers/net/ethernet/intel/ice/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,5 +20,5 @@ ice-y := ice_main.o \ 
	 ice_flex_pipe.o	\

	 ice_flex_pipe.o	\

	 ice_ethtool.o

	 ice_ethtool.o

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

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

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

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

ice-$(CONFIG_XDP_SOCKETS) += ice_xsk.o
 
ice-$(CONFIG_XDP_SOCKETS) += ice_xsk.o

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

+2 −4
Original line number Original line Diff line number Diff line
@@ -180,6 +180,7 @@ enum ice_state { 
	__ICE_NEEDS_RESTART,

	__ICE_NEEDS_RESTART,

	__ICE_PREPARED_FOR_RESET,	/* set by driver when prepared */

	__ICE_PREPARED_FOR_RESET,	/* set by driver when prepared */

	__ICE_RESET_OICR_RECV,		/* set by driver after rcv reset OICR */

	__ICE_RESET_OICR_RECV,		/* set by driver after rcv reset OICR */

	__ICE_DCBNL_DEVRESET,		/* set by dcbnl devreset */

	__ICE_PFR_REQ,			/* set by driver and peers */

	__ICE_PFR_REQ,			/* set by driver and peers */

	__ICE_CORER_REQ,		/* set by driver and peers */

	__ICE_CORER_REQ,		/* set by driver and peers */

	__ICE_GLOBR_REQ,		/* set by driver and peers */

	__ICE_GLOBR_REQ,		/* set by driver and peers */
@@ -365,6 +366,7 @@ struct ice_pf { 
	struct work_struct serv_task;

	struct work_struct serv_task;

	struct mutex avail_q_mutex;	/* protects access to avail_[rx|tx]qs */

	struct mutex avail_q_mutex;	/* protects access to avail_[rx|tx]qs */

	struct mutex sw_mutex;		/* lock for protecting VSI alloc flow */

	struct mutex sw_mutex;		/* lock for protecting VSI alloc flow */

	struct mutex tc_mutex;		/* lock to protect TC changes */

	u32 msg_enable;

	u32 msg_enable;

	u32 hw_csum_rx_error;

	u32 hw_csum_rx_error;

	u32 oicr_idx;		/* Other interrupt cause MSIX vector index */

	u32 oicr_idx;		/* Other interrupt cause MSIX vector index */
@@ -502,10 +504,6 @@ int ice_set_rss(struct ice_vsi *vsi, u8 *seed, u8 *lut, u16 lut_size); 
int ice_get_rss(struct ice_vsi *vsi, u8 *seed, u8 *lut, u16 lut_size);

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_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_print_link_msg(struct ice_vsi *vsi, bool isup);

#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 */

int ice_open(struct net_device *netdev);

int ice_open(struct net_device *netdev);

int ice_stop(struct net_device *netdev);

int ice_stop(struct net_device *netdev);

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

+46 −0
Original line number Original line Diff line number Diff line
@@ -742,6 +742,10 @@ struct ice_aqc_add_elem { 
	struct ice_aqc_txsched_elem_data generic[1];

	struct ice_aqc_txsched_elem_data generic[1];

};

};





struct ice_aqc_conf_elem {

	struct ice_aqc_txsched_elem_data generic[1];

};



struct ice_aqc_get_elem {

struct ice_aqc_get_elem {

	struct ice_aqc_txsched_elem_data generic[1];

	struct ice_aqc_txsched_elem_data generic[1];

};

};
@@ -783,6 +787,44 @@ struct ice_aqc_port_ets_elem { 
	__le32 tc_node_teid[8]; /* Used for response, reserved in command */

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

};

};





/* Rate limiting profile for

 * Add RL profile (indirect 0x0410)

 * Query RL profile (indirect 0x0411)

 * Remove RL profile (indirect 0x0415)

 * These indirect commands acts on single or multiple

 * RL profiles with specified data.

 */

struct ice_aqc_rl_profile {

	__le16 num_profiles;

	__le16 num_processed; /* Only for response. Reserved in Command. */

	u8 reserved[4];

	__le32 addr_high;

	__le32 addr_low;

};



struct ice_aqc_rl_profile_elem {

	u8 level;

	u8 flags;

#define ICE_AQC_RL_PROFILE_TYPE_S	0x0

#define ICE_AQC_RL_PROFILE_TYPE_M	(0x3 << ICE_AQC_RL_PROFILE_TYPE_S)

#define ICE_AQC_RL_PROFILE_TYPE_CIR	0

#define ICE_AQC_RL_PROFILE_TYPE_EIR	1

#define ICE_AQC_RL_PROFILE_TYPE_SRL	2

/* The following flag is used for Query RL Profile Data */

#define ICE_AQC_RL_PROFILE_INVAL_S	0x7

#define ICE_AQC_RL_PROFILE_INVAL_M	(0x1 << ICE_AQC_RL_PROFILE_INVAL_S)



	__le16 profile_id;

	__le16 max_burst_size;

	__le16 rl_multiply;

	__le16 wake_up_calc;

	__le16 rl_encode;

};



struct ice_aqc_rl_profile_generic_elem {

	struct ice_aqc_rl_profile_elem generic[1];

};



/* Query Scheduler Resource Allocation (indirect 0x0412)

/* Query Scheduler Resource Allocation (indirect 0x0412)

 * This indirect command retrieves the scheduler resources allocated by

 * This indirect command retrieves the scheduler resources allocated by

 * EMP Firmware to the given PF.

 * EMP Firmware to the given PF.
@@ -1657,6 +1699,7 @@ struct ice_aq_desc { 
		struct ice_aqc_sched_elem_cmd sched_elem_cmd;

		struct ice_aqc_sched_elem_cmd sched_elem_cmd;

		struct ice_aqc_query_txsched_res query_sched_res;

		struct ice_aqc_query_txsched_res query_sched_res;

		struct ice_aqc_query_port_ets port_ets;

		struct ice_aqc_query_port_ets port_ets;

		struct ice_aqc_rl_profile rl_profile;

		struct ice_aqc_nvm nvm;

		struct ice_aqc_nvm nvm;

		struct ice_aqc_nvm_checksum nvm_checksum;

		struct ice_aqc_nvm_checksum nvm_checksum;

		struct ice_aqc_pf_vf_msg virt;

		struct ice_aqc_pf_vf_msg virt;
@@ -1758,12 +1801,15 @@ enum ice_adminq_opc { 
	/* transmit scheduler commands */

	/* transmit scheduler commands */

	ice_aqc_opc_get_dflt_topo			= 0x0400,

	ice_aqc_opc_get_dflt_topo			= 0x0400,

	ice_aqc_opc_add_sched_elems			= 0x0401,

	ice_aqc_opc_add_sched_elems			= 0x0401,

	ice_aqc_opc_cfg_sched_elems			= 0x0403,

	ice_aqc_opc_get_sched_elems			= 0x0404,

	ice_aqc_opc_get_sched_elems			= 0x0404,

	ice_aqc_opc_suspend_sched_elems			= 0x0409,

	ice_aqc_opc_suspend_sched_elems			= 0x0409,

	ice_aqc_opc_resume_sched_elems			= 0x040A,

	ice_aqc_opc_resume_sched_elems			= 0x040A,

	ice_aqc_opc_query_port_ets			= 0x040E,

	ice_aqc_opc_query_port_ets			= 0x040E,

	ice_aqc_opc_delete_sched_elems			= 0x040F,

	ice_aqc_opc_delete_sched_elems			= 0x040F,

	ice_aqc_opc_add_rl_profiles			= 0x0410,

	ice_aqc_opc_query_sched_res			= 0x0412,

	ice_aqc_opc_query_sched_res			= 0x0412,

	ice_aqc_opc_remove_rl_profiles			= 0x0415,





	/* PHY commands */

	/* PHY commands */

	ice_aqc_opc_get_phy_caps			= 0x0600,

	ice_aqc_opc_get_phy_caps			= 0x0600,

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

+8 −52
Original line number Original line Diff line number Diff line
@@ -855,6 +855,9 @@ enum ice_status ice_init_hw(struct ice_hw *hw) 
		goto err_unroll_sched;

		goto err_unroll_sched;

	}

	}

	INIT_LIST_HEAD(&hw->agg_list);

	INIT_LIST_HEAD(&hw->agg_list);

	/* Initialize max burst size */

	if (!hw->max_burst_size)

		ice_cfg_rl_burst_size(hw, ICE_SCHED_DFLT_BURST_SIZE);





	status = ice_init_fltr_mgmt_struct(hw);

	status = ice_init_fltr_mgmt_struct(hw);

	if (status)

	if (status)
@@ -1248,56 +1251,6 @@ const struct ice_ctx_ele ice_tlan_ctx_info[] = { 
	{ 0 }

	{ 0 }

};

};





/**

 * ice_debug_cq

 * @hw: pointer to the hardware structure

 * @mask: debug mask

 * @desc: pointer to control queue descriptor

 * @buf: pointer to command buffer

 * @buf_len: max length of buf

 *

 * Dumps debug log about control command with descriptor contents.

 */

void

ice_debug_cq(struct ice_hw *hw, u32 __maybe_unused mask, void *desc, void *buf,

	     u16 buf_len)

{

	struct ice_aq_desc *cq_desc = (struct ice_aq_desc *)desc;

	u16 len;



#ifndef CONFIG_DYNAMIC_DEBUG

	if (!(mask & hw->debug_mask))

		return;

#endif



	if (!desc)

		return;



	len = le16_to_cpu(cq_desc->datalen);



	ice_debug(hw, mask,

		  "CQ CMD: opcode 0x%04X, flags 0x%04X, datalen 0x%04X, retval 0x%04X\n",

		  le16_to_cpu(cq_desc->opcode),

		  le16_to_cpu(cq_desc->flags),

		  le16_to_cpu(cq_desc->datalen), le16_to_cpu(cq_desc->retval));

	ice_debug(hw, mask, "\tcookie (h,l) 0x%08X 0x%08X\n",

		  le32_to_cpu(cq_desc->cookie_high),

		  le32_to_cpu(cq_desc->cookie_low));

	ice_debug(hw, mask, "\tparam (0,1)  0x%08X 0x%08X\n",

		  le32_to_cpu(cq_desc->params.generic.param0),

		  le32_to_cpu(cq_desc->params.generic.param1));

	ice_debug(hw, mask, "\taddr (h,l)   0x%08X 0x%08X\n",

		  le32_to_cpu(cq_desc->params.generic.addr_high),

		  le32_to_cpu(cq_desc->params.generic.addr_low));

	if (buf && cq_desc->datalen != 0) {

		ice_debug(hw, mask, "Buffer:\n");

		if (buf_len < len)

			len = buf_len;



		ice_debug_array(hw, mask, 16, 1, (u8 *)buf, len);

	}

}



/* FW Admin Queue command wrappers */

/* FW Admin Queue command wrappers */





/* Software lock/mutex that is meant to be held while the Global Config Lock

/* Software lock/mutex that is meant to be held while the Global Config Lock
@@ -3260,7 +3213,7 @@ ice_set_ctx(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info) 
 * @tc: TC number

 * @tc: TC number

 * @q_handle: software queue handle

 * @q_handle: software queue handle

 */

 */

static struct ice_q_ctx *

struct ice_q_ctx *

ice_get_lan_q_ctx(struct ice_hw *hw, u16 vsi_handle, u8 tc, u16 q_handle)

ice_get_lan_q_ctx(struct ice_hw *hw, u16 vsi_handle, u8 tc, u16 q_handle)

{

{

	struct ice_vsi_ctx *vsi;

	struct ice_vsi_ctx *vsi;
@@ -3357,9 +3310,12 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u16 q_handle, 
	node.node_teid = buf->txqs[0].q_teid;

	node.node_teid = buf->txqs[0].q_teid;

	node.data.elem_type = ICE_AQC_ELEM_TYPE_LEAF;

	node.data.elem_type = ICE_AQC_ELEM_TYPE_LEAF;

	q_ctx->q_handle = q_handle;

	q_ctx->q_handle = q_handle;

	q_ctx->q_teid = le32_to_cpu(node.node_teid);





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

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

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

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

	if (!status)

		status = ice_sched_replay_q_bw(pi, q_ctx);





ena_txq_exit:

ena_txq_exit:

	mutex_unlock(&pi->sched_lock);

	mutex_unlock(&pi->sched_lock);

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -13,8 +13,6 @@ 




enum ice_status ice_nvm_validate_checksum(struct ice_hw *hw);

enum ice_status ice_nvm_validate_checksum(struct ice_hw *hw);





void

ice_debug_cq(struct ice_hw *hw, u32 mask, void *desc, void *buf, u16 buf_len);

enum ice_status ice_init_hw(struct ice_hw *hw);

enum ice_status ice_init_hw(struct ice_hw *hw);

void ice_deinit_hw(struct ice_hw *hw);

void ice_deinit_hw(struct ice_hw *hw);

enum ice_status

enum ice_status
@@ -141,6 +139,8 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u16 q_handle, 
enum ice_status ice_replay_vsi(struct ice_hw *hw, u16 vsi_handle);

enum ice_status ice_replay_vsi(struct ice_hw *hw, u16 vsi_handle);

void ice_replay_post(struct ice_hw *hw);

void ice_replay_post(struct ice_hw *hw);

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

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

struct ice_q_ctx *

ice_get_lan_q_ctx(struct ice_hw *hw, u16 vsi_handle, u8 tc, u16 q_handle);

void

void

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

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

		  u64 *prev_stat, u64 *cur_stat);

		  u64 *prev_stat, u64 *cur_stat);

CRA Git | Maintained and supported by SUSTech CRA and CCSE