Commit ac6d1835 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 



Tony Nguyen says:

====================
100GbE Intel Wired LAN Driver Updates 2020-08-01

This series contains updates to the ice driver only.

Wei Yongjun marks power management functions with __maybe_unused.

Nick disables VLAN pruning in promiscuous mode and renames grst_delay to
grst_timeout.

Kiran modifies the check for linearization and corrects the vsi_id mask
value.

Vignesh replaces the use of flow profile locks to RSS profile locks for RSS
rule removal. Destroys flow profile lock on clearing XLT table and
clears extraction sequence entries.

Jesse adds some statistics and removes an unreported one.

Brett allows for 2 queue configuration for VFs.

Surabhi adds a check for failed allocation of an extraction sequence
table.

Tony updates the PTYPE lookup table and makes other trivial fixes.

Victor extends profile ID locks to be held until all references are
completed.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2f631133 7dbc63f0

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

+1 −0
Original line number Diff line number Diff line
@@ -256,6 +256,7 @@ struct ice_vsi { 
	u32 tx_busy;

	u32 rx_buf_failed;

	u32 rx_page_failed;

	u32 rx_gro_dropped;

	u16 num_q_vectors;

	u16 base_vector;		/* IRQ base for OS reserved vectors */

	enum ice_vsi_type type;

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

+1 −1
Original line number Diff line number Diff line
@@ -1581,7 +1581,7 @@ struct ice_aqc_get_set_rss_keys { 
struct ice_aqc_get_set_rss_lut {

#define ICE_AQC_GSET_RSS_LUT_VSI_VALID	BIT(15)

#define ICE_AQC_GSET_RSS_LUT_VSI_ID_S	0

#define ICE_AQC_GSET_RSS_LUT_VSI_ID_M	(0x1FF << ICE_AQC_GSET_RSS_LUT_VSI_ID_S)

#define ICE_AQC_GSET_RSS_LUT_VSI_ID_M	(0x3FF << ICE_AQC_GSET_RSS_LUT_VSI_ID_S)

	__le16 vsi_id;

#define ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_S	0

#define ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_M	\

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

+7 −8
Original line number Diff line number Diff line
@@ -1027,23 +1027,23 @@ void ice_deinit_hw(struct ice_hw *hw) 
 */

enum ice_status ice_check_reset(struct ice_hw *hw)

{

	u32 cnt, reg = 0, grst_delay, uld_mask;

	u32 cnt, reg = 0, grst_timeout, uld_mask;



	/* Poll for Device Active state in case a recent CORER, GLOBR,

	 * or EMPR has occurred. The grst delay value is in 100ms units.

	 * Add 1sec for outstanding AQ commands that can take a long time.

	 */

	grst_delay = ((rd32(hw, GLGEN_RSTCTL) & GLGEN_RSTCTL_GRSTDEL_M) >>

	grst_timeout = ((rd32(hw, GLGEN_RSTCTL) & GLGEN_RSTCTL_GRSTDEL_M) >>

			GLGEN_RSTCTL_GRSTDEL_S) + 10;



	for (cnt = 0; cnt < grst_delay; cnt++) {

	for (cnt = 0; cnt < grst_timeout; cnt++) {

		mdelay(100);

		reg = rd32(hw, GLGEN_RSTAT);

		if (!(reg & GLGEN_RSTAT_DEVSTATE_M))

			break;

	}



	if (cnt == grst_delay) {

	if (cnt == grst_timeout) {

		ice_debug(hw, ICE_DBG_INIT,

			  "Global reset polling failed to complete.\n");

		return ICE_ERR_RESET_FAILED;
@@ -1718,8 +1718,7 @@ ice_alloc_hw_res(struct ice_hw *hw, u16 type, u16 num, bool btm, u16 *res) 
 * @num: number of resources

 * @res: pointer to array that contains the resources to free

 */

enum ice_status

ice_free_hw_res(struct ice_hw *hw, u16 type, u16 num, u16 *res)

enum ice_status ice_free_hw_res(struct ice_hw *hw, u16 type, u16 num, u16 *res)

{

	struct ice_aqc_alloc_free_res_elem *buf;

	enum ice_status status;
@@ -2121,7 +2120,7 @@ ice_parse_fdir_dev_caps(struct ice_hw *hw, struct ice_hw_dev_caps *dev_p, 
 * @cap_count: the number of capabilities

 *

 * Helper device to parse device (0x000B) capabilities list. For

 * capabilities shared between device and device, this relies on

 * capabilities shared between device and function, this relies on

 * ice_parse_common_caps.

 *

 * Loop through the list of provided capabilities and extract the relevant

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

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ void ice_devlink_unregister(struct ice_pf *pf) 
 *

 * Create and register a devlink_port for this PF. Note that although each

 * physical function is connected to a separate devlink instance, the port

 * will still be numbered according to the physical function id.

 * will still be numbered according to the physical function ID.

 *

 * Return: zero on success or an error code on failure.

 */

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

+4 −0
Original line number Diff line number Diff line
@@ -59,8 +59,11 @@ static const struct ice_stats ice_gstrings_vsi_stats[] = { 
	ICE_VSI_STAT("rx_unknown_protocol", eth_stats.rx_unknown_protocol),

	ICE_VSI_STAT("rx_alloc_fail", rx_buf_failed),

	ICE_VSI_STAT("rx_pg_alloc_fail", rx_page_failed),

	ICE_VSI_STAT("rx_gro_dropped", rx_gro_dropped),

	ICE_VSI_STAT("tx_errors", eth_stats.tx_errors),

	ICE_VSI_STAT("tx_linearize", tx_linearize),

	ICE_VSI_STAT("tx_busy", tx_busy),

	ICE_VSI_STAT("tx_restart", tx_restart),

};



enum ice_ethtool_test_id {
@@ -100,6 +103,7 @@ static const struct ice_stats ice_gstrings_pf_stats[] = { 
	ICE_PF_STAT("rx_broadcast.nic", stats.eth.rx_broadcast),

	ICE_PF_STAT("tx_broadcast.nic", stats.eth.tx_broadcast),

	ICE_PF_STAT("tx_errors.nic", stats.eth.tx_errors),

	ICE_PF_STAT("tx_timeout.nic", tx_timeout_count),

	ICE_PF_STAT("rx_size_64.nic", stats.rx_size_64),

	ICE_PF_STAT("tx_size_64.nic", stats.tx_size_64),

	ICE_PF_STAT("rx_size_127.nic", stats.rx_size_127),