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

Commit 18af9626 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-05-02

This series contains updates to the ice driver only.

Anirudh introduces the framework to store queue specific information in
the VSI queue contexts.  This will allow future changes to update the
structure to hold queue specific information.

Akeem adds additional check so that if there is no queue to disable when
attempting to disable a queue, return a configuration error without
acquiring the lock.  Fixed an issue with non-trusted VFs being able to
add more than the permitted number of VLANs.

Bruce removes unreachable code and updated the function to return void
since it would never return anything but success.

Brett provides most of the changes in the series, starting with reducing
the scope of the error variable used and improved the debug message if
we fail to configure the receive queue.  Updates the driver to use a
macro instead of using the same 'for' loop throughout the driver which
helps with readability.  Fixed an issue where users were led to believe
they could set rx-usecs-high value, yet the changes to this value would
not stick because it was not yet implemented to allow changes to this
value, so implement the missing code to change the value.  Found we had
unnecessary wait when disabling queues, so remove it.  I,proved a
wasteful addition operation in our hot path by adding a member to the
ice_q_vector structure and the necessary changes to use the member which
stores the calculated vector hardware index.  Refactored the link event
flow to make it cleaner and more clear.

Maciej updates the array index when stopping transmit rings, so that
process every ring the VSI, not just the rings in a given transmit
class.

Paul adds support for setting 52 byte RSS hash keys.

Md Fahad cleaned up a runtime change to the PFINT_OICR_ENA register,
since the interrupt handlers will handle resetting the bit, if
necessary.

Tony adds a missing PHY type, which was causing warning message about an
unrecognized PHY.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 70bb13a5 20ce2a1a

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

+22 −1
Original line number Diff line number Diff line
@@ -297,6 +297,7 @@ struct ice_q_vector { 
	struct ice_vsi *vsi;



	u16 v_idx;			/* index in the vsi->q_vector array. */

	u16 reg_idx;

	u8 num_ring_rx;			/* total number of Rx rings in vector */

	u8 num_ring_tx;			/* total number of Tx rings in vector */

	u8 itr_countdown;		/* when 0 should adjust adaptive ITR */
@@ -403,7 +404,7 @@ static inline void 
ice_irq_dynamic_ena(struct ice_hw *hw, struct ice_vsi *vsi,

		    struct ice_q_vector *q_vector)

{

	u32 vector = (vsi && q_vector) ? vsi->hw_base_vector + q_vector->v_idx :

	u32 vector = (vsi && q_vector) ? q_vector->reg_idx :

				((struct ice_pf *)hw->back)->hw_oicr_idx;

	int itr = ICE_ITR_NONE;

	u32 val;
@@ -419,6 +420,26 @@ ice_irq_dynamic_ena(struct ice_hw *hw, struct ice_vsi *vsi, 
	wr32(hw, GLINT_DYN_CTL(vector), val);

}



/**

 * ice_find_vsi_by_type - Find and return VSI of a given type

 * @pf: PF to search for VSI

 * @type: Value indicating type of VSI we are looking for

 */

static inline struct ice_vsi *

ice_find_vsi_by_type(struct ice_pf *pf, enum ice_vsi_type type)

{

	int i;



	for (i = 0; i < pf->num_alloc_vsi; i++) {

		struct ice_vsi *vsi = pf->vsi[i];



		if (vsi && vsi->type == type)

			return vsi;

	}



	return NULL;

}



void ice_set_ethtool_ops(struct net_device *netdev);

int ice_up(struct ice_vsi *vsi);

int ice_down(struct ice_vsi *vsi);

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

+3 −0
Original line number Diff line number Diff line
@@ -1291,6 +1291,9 @@ struct ice_aqc_get_set_rss_key { 


#define ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE	0x28

#define ICE_AQC_GET_SET_RSS_KEY_DATA_HASH_KEY_SIZE	0xC

#define ICE_GET_SET_RSS_KEY_EXTEND_KEY_SIZE \

				(ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE + \

				 ICE_AQC_GET_SET_RSS_KEY_DATA_HASH_KEY_SIZE)



struct ice_aqc_get_set_rss_keys {

	u8 standard_rss_key[ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE];

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

+69 −22
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ void ice_output_fw_log(struct ice_hw *hw, struct ice_aq_desc *desc, void *buf) 
 * Determines the itr/intrl granularities based on the maximum aggregate

 * bandwidth according to the device's configuration during power-on.

 */

static enum ice_status ice_get_itr_intrl_gran(struct ice_hw *hw)

static void ice_get_itr_intrl_gran(struct ice_hw *hw)

{

	u8 max_agg_bw = (rd32(hw, GL_PWR_MODE_CTL) &

			 GL_PWR_MODE_CTL_CAR_MAX_BW_M) >>
@@ -664,13 +664,7 @@ static enum ice_status ice_get_itr_intrl_gran(struct ice_hw *hw) 
		hw->itr_gran = ICE_ITR_GRAN_MAX_25;

		hw->intrl_gran = ICE_INTRL_GRAN_MAX_25;

		break;

	default:

		ice_debug(hw, ICE_DBG_INIT,

			  "Failed to determine itr/intrl granularity\n");

		return ICE_ERR_CFG;

	}



	return 0;

}



/**
@@ -697,9 +691,7 @@ enum ice_status ice_init_hw(struct ice_hw *hw) 
	if (status)

		return status;



	status = ice_get_itr_intrl_gran(hw);

	if (status)

		return status;

	ice_get_itr_intrl_gran(hw);



	status = ice_init_all_ctrlq(hw);

	if (status)
@@ -2790,11 +2782,36 @@ ice_set_ctx(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info) 
	return 0;

}



/**

 * ice_get_lan_q_ctx - get the LAN queue context for the given VSI and TC

 * @hw: pointer to the HW struct

 * @vsi_handle: software VSI handle

 * @tc: TC number

 * @q_handle: software queue handle

 */

static struct ice_q_ctx *

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

{

	struct ice_vsi_ctx *vsi;

	struct ice_q_ctx *q_ctx;



	vsi = ice_get_vsi_ctx(hw, vsi_handle);

	if (!vsi)

		return NULL;

	if (q_handle >= vsi->num_lan_q_entries[tc])

		return NULL;

	if (!vsi->lan_q_ctx[tc])

		return NULL;

	q_ctx = vsi->lan_q_ctx[tc];

	return &q_ctx[q_handle];

}



/**

 * ice_ena_vsi_txq

 * @pi: port information structure

 * @vsi_handle: software VSI handle

 * @tc: TC number

 * @q_handle: software queue handle

 * @num_qgrps: Number of added queue groups

 * @buf: list of queue groups to be added

 * @buf_size: size of buffer for indirect command
@@ -2803,12 +2820,13 @@ ice_set_ctx(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info) 
 * 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,

		struct ice_aqc_add_tx_qgrp *buf, u16 buf_size,

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)

{

	struct ice_aqc_txsched_elem_data node = { 0 };

	struct ice_sched_node *parent;

	struct ice_q_ctx *q_ctx;

	enum ice_status status;

	struct ice_hw *hw;
@@ -2825,6 +2843,14 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps, 


	mutex_lock(&pi->sched_lock);



	q_ctx = ice_get_lan_q_ctx(hw, vsi_handle, tc, q_handle);

	if (!q_ctx) {

		ice_debug(hw, ICE_DBG_SCHED, "Enaq: invalid queue handle %d\n",

			  q_handle);

		status = ICE_ERR_PARAM;

		goto ena_txq_exit;

	}



	/* find a parent node */

	parent = ice_sched_get_free_qparent(pi, vsi_handle, tc,

					    ICE_SCHED_NODE_OWNER_LAN);
@@ -2851,7 +2877,7 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps, 
	/* 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",

		ice_debug(hw, ICE_DBG_SCHED, "enable queue %d failed %d\n",

			  le16_to_cpu(buf->txqs[0].txq_id),

			  hw->adminq.sq_last_status);

		goto ena_txq_exit;
@@ -2859,6 +2885,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;

	q_ctx->q_handle = q_handle;



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

	status = ice_sched_add_node(pi, hw->num_tx_sched_layers - 1, &node);
@@ -2871,7 +2898,10 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps, 
/**

 * ice_dis_vsi_txq

 * @pi: port information structure

 * @vsi_handle: software VSI handle

 * @tc: TC number

 * @num_queues: number of queues

 * @q_handles: pointer to software queue handle array

 * @q_ids: pointer to the q_id array

 * @q_teids: pointer to queue node teids

 * @rst_src: if called due to reset, specifies the reset source
@@ -2881,25 +2911,30 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps, 
 * This function removes queues and their corresponding nodes in SW DB

 */

enum ice_status

ice_dis_vsi_txq(struct ice_port_info *pi, u8 num_queues, u16 *q_ids,

		u32 *q_teids, enum ice_disq_rst_src rst_src, u16 vmvf_num,

ice_dis_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_queues,

		u16 *q_handles, u16 *q_ids, u32 *q_teids,

		enum ice_disq_rst_src rst_src, u16 vmvf_num,

		struct ice_sq_cd *cd)

{

	enum ice_status status = ICE_ERR_DOES_NOT_EXIST;

	struct ice_aqc_dis_txq_item qg_list;

	struct ice_q_ctx *q_ctx;

	u16 i;



	if (!pi || pi->port_state != ICE_SCHED_PORT_STATE_READY)

		return ICE_ERR_CFG;



	/* if queue is disabled already yet the disable queue command has to be

	 * sent to complete the VF reset, then call ice_aq_dis_lan_txq without

	 * any queue information

	 */



	if (!num_queues && rst_src)

		return ice_aq_dis_lan_txq(pi->hw, 0, NULL, 0, rst_src, vmvf_num,

					  NULL);

	if (!num_queues) {

		/* if queue is disabled already yet the disable queue command

		 * has to be sent to complete the VF reset, then call

		 * ice_aq_dis_lan_txq without any queue information

		 */

		if (rst_src)

			return ice_aq_dis_lan_txq(pi->hw, 0, NULL, 0, rst_src,

						  vmvf_num, NULL);

		return ICE_ERR_CFG;

	}



	mutex_lock(&pi->sched_lock);
@@ -2909,6 +2944,17 @@ ice_dis_vsi_txq(struct ice_port_info *pi, u8 num_queues, u16 *q_ids, 
		node = ice_sched_find_node_by_teid(pi->root, q_teids[i]);

		if (!node)

			continue;

		q_ctx = ice_get_lan_q_ctx(pi->hw, vsi_handle, tc, q_handles[i]);

		if (!q_ctx) {

			ice_debug(pi->hw, ICE_DBG_SCHED, "invalid queue handle%d\n",

				  q_handles[i]);

			continue;

		}

		if (q_ctx->q_handle != q_handles[i]) {

			ice_debug(pi->hw, ICE_DBG_SCHED, "Err:handles %d %d\n",

				  q_ctx->q_handle, q_handles[i]);

			continue;

		}

		qg_list.parent_teid = node->info.parent_teid;

		qg_list.num_qs = 1;

		qg_list.q_id[0] = cpu_to_le16(q_ids[i]);
@@ -2919,6 +2965,7 @@ ice_dis_vsi_txq(struct ice_port_info *pi, u8 num_queues, u16 *q_ids, 
		if (status)

			break;

		ice_free_sched_node(pi, node);

		q_ctx->q_handle = ICE_INVAL_Q_HANDLE;

	}

	mutex_unlock(&pi->sched_lock);

	return status;

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

+6 −5
Original line number Diff line number Diff line
@@ -99,15 +99,16 @@ ice_aq_set_port_id_led(struct ice_port_info *pi, bool is_orig_mode, 
		       struct ice_sq_cd *cd);



enum ice_status

ice_dis_vsi_txq(struct ice_port_info *pi, u8 num_queues, u16 *q_ids,

		u32 *q_teids, enum ice_disq_rst_src rst_src, u16 vmvf_num,

		struct ice_sq_cd *cmd_details);

ice_dis_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_queues,

		u16 *q_handle, u16 *q_ids, u32 *q_teids,

		enum ice_disq_rst_src rst_src, u16 vmvf_num,

		struct ice_sq_cd *cd);

enum ice_status

ice_cfg_vsi_lan(struct ice_port_info *pi, u16 vsi_handle, u8 tc_bitmap,

		u16 *max_lanqs);

enum ice_status

ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps,

		struct ice_aqc_add_tx_qgrp *buf, u16 buf_size,

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);

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

void ice_replay_post(struct ice_hw *hw);

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

+31 −1
Original line number Diff line number Diff line
@@ -1034,6 +1034,7 @@ ice_get_settings_link_up(struct ethtool_link_ksettings *ks, 
						     25000baseCR_Full);

		break;

	case ICE_PHY_TYPE_LOW_25G_AUI_AOC_ACC:

	case ICE_PHY_TYPE_LOW_25G_AUI_C2C:

		ethtool_link_ksettings_add_link_mode(ks, supported,

						     25000baseCR_Full);

		break;
@@ -2228,12 +2229,18 @@ static int 
ice_get_rc_coalesce(struct ethtool_coalesce *ec, enum ice_container_type c_type,

		    struct ice_ring_container *rc)

{

	struct ice_pf *pf = rc->ring->vsi->back;

	struct ice_pf *pf;



	if (!rc->ring)

		return -EINVAL;



	pf = rc->ring->vsi->back;



	switch (c_type) {

	case ICE_RX_CONTAINER:

		ec->use_adaptive_rx_coalesce = ITR_IS_DYNAMIC(rc->itr_setting);

		ec->rx_coalesce_usecs = rc->itr_setting & ~ICE_ITR_DYNAMIC;

		ec->rx_coalesce_usecs_high = rc->ring->q_vector->intrl;

		break;

	case ICE_TX_CONTAINER:

		ec->use_adaptive_tx_coalesce = ITR_IS_DYNAMIC(rc->itr_setting);
@@ -2342,6 +2349,23 @@ ice_set_rc_coalesce(enum ice_container_type c_type, struct ethtool_coalesce *ec, 


	switch (c_type) {

	case ICE_RX_CONTAINER:

		if (ec->rx_coalesce_usecs_high > ICE_MAX_INTRL ||

		    (ec->rx_coalesce_usecs_high &&

		     ec->rx_coalesce_usecs_high < pf->hw.intrl_gran)) {

			netdev_info(vsi->netdev,

				    "Invalid value, rx-usecs-high valid values are 0 (disabled), %d-%d\n",

				    pf->hw.intrl_gran, ICE_MAX_INTRL);

			return -EINVAL;

		}



		if (ec->rx_coalesce_usecs_high != rc->ring->q_vector->intrl) {

			rc->ring->q_vector->intrl = ec->rx_coalesce_usecs_high;

			wr32(&pf->hw, GLINT_RATE(vsi->hw_base_vector +

						 rc->ring->q_vector->v_idx),

			     ice_intrl_usec_to_reg(ec->rx_coalesce_usecs_high,

						   pf->hw.intrl_gran));

		}



		if (ec->rx_coalesce_usecs != itr_setting &&

		    ec->use_adaptive_rx_coalesce) {

			netdev_info(vsi->netdev,
@@ -2364,6 +2388,12 @@ ice_set_rc_coalesce(enum ice_container_type c_type, struct ethtool_coalesce *ec, 
		}

		break;

	case ICE_TX_CONTAINER:

		if (ec->tx_coalesce_usecs_high) {

			netdev_info(vsi->netdev,

				    "setting tx-usecs-high is not supported\n");

			return -EINVAL;

		}



		if (ec->tx_coalesce_usecs != itr_setting &&

		    ec->use_adaptive_tx_coalesce) {

			netdev_info(vsi->netdev,