Commit 27aa6228 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 2020-02-15

This series contains updates to ice driver only.

Brett adds support for "Queue in Queue" (QinQ) support, by supporting
S-tag & C-tag VLAN traffic by disabling pruning when there are no 0x8100
VLAN interfaces currently on top of the PF.  Also refactored the port
VLAN configuration to re-use the common code for enabling and disabling
a port VLAN in single function.  Added a helper function to determine if
the VF link is up.  Fixed how the port VLAN configures the priority bits
for a VF interface.  Fixed the port VLAN to only see its own broadcast
and multicast traffic.  Added support to enable and disable all receive
queues, by refactoring adding a new function to do the necessary steps
to enable/disable a queue with the necessary read flush.  Fixed how we
set the mapping mode for transmit and receive queues.  Added support for
VF queues to handle LAN overflow events.  Fixed and refactored how
receive queues get disabled for VFs, which was being handled one queue
at at time, so improve it to handle when the VF is requesting more than
one queue to be disabled.  Fixed how the virtchnl_queue_select bitmap is
validated.

Finally a patch not authored by Brett, Bruce cleans up "fallthrough"
comments which are unnecessary.  Also replaces the "fallthough" comments
with the GCC reserved word fallthrough, along with other GCC compiler
fixes.  Add missing function header comment regarding a function
argument that was missing.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2bd5662d fb0c5b05

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

+11 −0
Original line number Diff line number Diff line
@@ -1661,6 +1661,13 @@ struct ice_aqc_get_pkg_info_resp { 
	struct ice_aqc_get_pkg_info pkg_info[1];

};



/* Lan Queue Overflow Event (direct, 0x1001) */

struct ice_aqc_event_lan_overflow {

	__le32 prtdcb_ruptq;

	__le32 qtx_ctl;

	u8 reserved[8];

};



/**

 * struct ice_aq_desc - Admin Queue (AQ) descriptor

 * @flags: ICE_AQ_FLAG_* flags
@@ -1730,6 +1737,7 @@ struct ice_aq_desc { 
		struct ice_aqc_alloc_free_res_cmd sw_res_ctrl;

		struct ice_aqc_set_event_mask set_event_mask;

		struct ice_aqc_get_link_status get_link_status;

		struct ice_aqc_event_lan_overflow lan_overflow;

	} params;

};
@@ -1860,6 +1868,9 @@ enum ice_adminq_opc { 
	ice_aqc_opc_update_pkg				= 0x0C42,

	ice_aqc_opc_get_pkg_info_list			= 0x0C43,



	/* Standalone Commands/Events */

	ice_aqc_opc_event_lan_overflow			= 0x1001,



	/* debug commands */

	ice_aqc_opc_fw_logging				= 0xFF09,

	ice_aqc_opc_fw_logging_info			= 0xFF10,

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

+31 −12
Original line number Diff line number Diff line
@@ -247,7 +247,6 @@ ice_setup_tx_ctx(struct ice_ring *ring, struct ice_tlan_ctx *tlan_ctx, u16 pf_q) 
	 */

	switch (vsi->type) {

	case ICE_VSI_LB:

		/* fall through */

	case ICE_VSI_PF:

		tlan_ctx->vmvf_type = ICE_TLAN_CTX_VMVF_TYPE_PF;

		break;
@@ -459,17 +458,20 @@ int __ice_vsi_get_qs(struct ice_qs_cfg *qs_cfg) 
}



/**

 * ice_vsi_ctrl_rx_ring - Start or stop a VSI's Rx ring

 * ice_vsi_ctrl_one_rx_ring - start/stop VSI's Rx ring with no busy wait

 * @vsi: the VSI being configured

 * @ena: start or stop the Rx rings

 * @rxq_idx: Rx queue index

 * @ena: start or stop the Rx ring

 * @rxq_idx: 0-based Rx queue index for the VSI passed in

 * @wait: wait or don't wait for configuration to finish in hardware

 *

 * Return 0 on success and negative on error.

 */

int ice_vsi_ctrl_rx_ring(struct ice_vsi *vsi, bool ena, u16 rxq_idx)

int

ice_vsi_ctrl_one_rx_ring(struct ice_vsi *vsi, bool ena, u16 rxq_idx, bool wait)

{

	int pf_q = vsi->rxq_map[rxq_idx];

	struct ice_pf *pf = vsi->back;

	struct ice_hw *hw = &pf->hw;

	int ret = 0;

	u32 rx_reg;



	rx_reg = rd32(hw, QRX_CTRL(pf_q));
@@ -485,13 +487,30 @@ int ice_vsi_ctrl_rx_ring(struct ice_vsi *vsi, bool ena, u16 rxq_idx) 
		rx_reg &= ~QRX_CTRL_QENA_REQ_M;

	wr32(hw, QRX_CTRL(pf_q), rx_reg);



	/* wait for the change to finish */

	ret = ice_pf_rxq_wait(pf, pf_q, ena);

	if (ret)

		dev_err(ice_pf_to_dev(pf), "VSI idx %d Rx ring %d %sable timeout\n",

			vsi->idx, pf_q, (ena ? "en" : "dis"));

	if (!wait)

		return 0;



	ice_flush(hw);

	return ice_pf_rxq_wait(pf, pf_q, ena);

}



	return ret;

/**

 * ice_vsi_wait_one_rx_ring - wait for a VSI's Rx ring to be stopped/started

 * @vsi: the VSI being configured

 * @ena: true/false to verify Rx ring has been enabled/disabled respectively

 * @rxq_idx: 0-based Rx queue index for the VSI passed in

 *

 * This routine will wait for the given Rx queue of the VSI to reach the

 * enabled or disabled state. Returns -ETIMEDOUT in case of failing to reach

 * the requested state after multiple retries; else will return 0 in case of

 * success.

 */

int ice_vsi_wait_one_rx_ring(struct ice_vsi *vsi, bool ena, u16 rxq_idx)

{

	int pf_q = vsi->rxq_map[rxq_idx];

	struct ice_pf *pf = vsi->back;



	return ice_pf_rxq_wait(pf, pf_q, ena);

}



/**

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

+3 −1
Original line number Diff line number Diff line
@@ -8,7 +8,9 @@ 


int ice_setup_rx_ctx(struct ice_ring *ring);

int __ice_vsi_get_qs(struct ice_qs_cfg *qs_cfg);

int ice_vsi_ctrl_rx_ring(struct ice_vsi *vsi, bool ena, u16 rxq_idx);

int

ice_vsi_ctrl_one_rx_ring(struct ice_vsi *vsi, bool ena, u16 rxq_idx, bool wait);

int ice_vsi_wait_one_rx_ring(struct ice_vsi *vsi, bool ena, u16 rxq_idx);

int ice_vsi_alloc_q_vectors(struct ice_vsi *vsi);

void ice_vsi_map_rings_to_vectors(struct ice_vsi *vsi);

void ice_vsi_free_q_vectors(struct ice_vsi *vsi);

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

+2 −2
Original line number Diff line number Diff line
@@ -1181,7 +1181,7 @@ ice_aq_send_cmd(struct ice_hw *hw, struct ice_aq_desc *desc, void *buf, 
	case ice_aqc_opc_release_res:

		if (le16_to_cpu(cmd->res_id) == ICE_AQC_RES_ID_GLBL_LOCK)

			break;

		/* fall-through */

		fallthrough;

	default:

		mutex_lock(&ice_global_cfg_lock_sw);

		lock_acquired = true;
@@ -2703,7 +2703,7 @@ __ice_aq_get_set_rss_lut(struct ice_hw *hw, u16 vsi_id, u8 lut_type, u8 *lut, 
				 ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_M;

			break;

		}

		/* fall-through */

		fallthrough;

	default:

		status = ICE_ERR_PARAM;

		goto ice_aq_get_set_rss_lut_exit;

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

+2 −4
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ static int ice_lbtest_prepare_rings(struct ice_vsi *vsi) 
	if (status)

		goto err_setup_rx_ring;



	status = ice_vsi_start_rx_rings(vsi);

	status = ice_vsi_start_all_rx_rings(vsi);

	if (status)

		goto err_start_rx_ring;
@@ -494,7 +494,7 @@ static int ice_lbtest_disable_rings(struct ice_vsi *vsi) 
		netdev_err(vsi->netdev, "Failed to stop Tx rings, VSI %d error %d\n",

			   vsi->vsi_num, status);



	status = ice_vsi_stop_rx_rings(vsi);

	status = ice_vsi_stop_all_rx_rings(vsi);

	if (status)

		netdev_err(vsi->netdev, "Failed to stop Rx rings, VSI %d error %d\n",

			   vsi->vsi_num, status);
@@ -1091,7 +1091,6 @@ ice_get_fecparam(struct net_device *netdev, struct ethtool_fecparam *fecparam) 
		fecparam->active_fec = ETHTOOL_FEC_BASER;

		break;

	case ICE_AQ_LINK_25G_RS_528_FEC_EN:

		/* fall through */

	case ICE_AQ_LINK_25G_RS_544_FEC_EN:

		fecparam->active_fec = ETHTOOL_FEC_RS;

		break;
@@ -1781,7 +1780,6 @@ ice_get_settings_link_up(struct ethtool_link_ksettings *ks, 
						     Asym_Pause);

		break;

	case ICE_FC_PFC:

		/* fall through */

	default:

		ethtool_link_ksettings_del_link_mode(ks, lp_advertising, Pause);

		ethtool_link_ksettings_del_link_mode(ks, lp_advertising,

CRA Git | Maintained and supported by SUSTech CRA and CCSE