Commit 69e36298 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/net-queue 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2018-11-07

This series contains fixes to igb, i40e and ice drivers.

Anirudh fixes an issue during rebuild of the ice driver, where we need
to set the carrier state, as well as start or stop the queues all based
on the link status.  Removed functions that were duplicating current
functionality in the VSI rebuild/replay framework.

Dave fixes a potential resource collision during the remove path, so add
a check to see if we are in the middle of a reset.  Fixed the remove
path to ensure we call netif_napi_del() to free vectors before we set
vsi->netdev to NULL.

Akeem fixes an issue when the receive or transmit pause parameter is
set, results in link loss on the interface.  Fixed the spelling of
"Enabling" in error message.

Victor fixes potential memory leak by also freeing the related VSI
contexts in the unload path.

Md Fahad fixes a flag during port VLAN insertion, which was not being
set properly.

Brett fixes a transmit timeout during stress due to the hardware tail
and software tail were incorrectly out of sync.

Miroslav Lichvar fixes the igb PHC timecounter update interval to be
sure the timecounter is updated in time.

Chinh fixes the req_speeds variable to be u16 instead of u8 so that it
can handle all the link speeds.

Jake fixes i40e to add back the missing feature flags, which was causing
IP-in-IP offloads to be reported as not supported.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 042cb564 d5596fd4

drivers/net/ethernet/intel/i40e/i40e_main.c

+5 −3
Original line number Diff line number Diff line
@@ -12249,6 +12249,8 @@ static int i40e_config_netdev(struct i40e_vsi *vsi) 
			  NETIF_F_GSO_GRE		|

			  NETIF_F_GSO_GRE_CSUM		|

			  NETIF_F_GSO_PARTIAL		|

			  NETIF_F_GSO_IPXIP4		|

			  NETIF_F_GSO_IPXIP6		|

			  NETIF_F_GSO_UDP_TUNNEL	|

			  NETIF_F_GSO_UDP_TUNNEL_CSUM	|

			  NETIF_F_SCTP_CRC		|
@@ -12266,13 +12268,13 @@ static int i40e_config_netdev(struct i40e_vsi *vsi) 
	/* record features VLANs can make use of */

	netdev->vlan_features |= hw_enc_features | NETIF_F_TSO_MANGLEID;



	if (!(pf->flags & I40E_FLAG_MFP_ENABLED))

		netdev->hw_features |= NETIF_F_NTUPLE | NETIF_F_HW_TC;



	hw_features = hw_enc_features		|

		      NETIF_F_HW_VLAN_CTAG_TX	|

		      NETIF_F_HW_VLAN_CTAG_RX;



	if (!(pf->flags & I40E_FLAG_MFP_ENABLED))

		hw_features |= NETIF_F_NTUPLE | NETIF_F_HW_TC;



	netdev->hw_features |= hw_features;



	netdev->features |= hw_features | NETIF_F_HW_VLAN_CTAG_FILTER;

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

+3 −1
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ extern const char ice_drv_ver[]; 
#define ICE_MIN_INTR_PER_VF		(ICE_MIN_QS_PER_VF + 1)

#define ICE_DFLT_INTR_PER_VF		(ICE_DFLT_QS_PER_VF + 1)



#define ICE_MAX_RESET_WAIT		20



#define ICE_VSIQF_HKEY_ARRAY_SIZE	((VSIQF_HKEY_MAX_INDEX + 1) *	4)



#define ICE_DFLT_NETIF_M (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_LINK)
@@ -189,7 +191,6 @@ struct ice_vsi { 
	u64 tx_linearize;

	DECLARE_BITMAP(state, __ICE_STATE_NBITS);

	DECLARE_BITMAP(flags, ICE_VSI_FLAG_NBITS);

	unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];

	unsigned int current_netdev_flags;

	u32 tx_restart;

	u32 tx_busy;
@@ -369,5 +370,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);

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_napi_del(struct ice_vsi *vsi);



#endif /* _ICE_H_ */

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

+3 −0
Original line number Diff line number Diff line
@@ -811,6 +811,9 @@ void ice_deinit_hw(struct ice_hw *hw) 
	/* Attempt to disable FW logging before shutting down control queues */

	ice_cfg_fw_log(hw, false);

	ice_shutdown_all_ctrlq(hw);



	/* Clear VSI contexts if not already cleared */

	ice_clear_all_vsi_ctx(hw);

}



/**

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

+6 −1
Original line number Diff line number Diff line
@@ -1517,10 +1517,15 @@ ice_set_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *pause) 
	}



	if (!test_bit(__ICE_DOWN, pf->state)) {

		/* Give it a little more time to try to come back */

		/* Give it a little more time to try to come back. If still

		 * down, restart autoneg link or reinitialize the interface.

		 */

		msleep(75);

		if (!test_bit(__ICE_DOWN, pf->state))

			return ice_nway_reset(netdev);



		ice_down(vsi);

		ice_up(vsi);

	}



	return err;

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

+2 −0
Original line number Diff line number Diff line
@@ -242,6 +242,8 @@ 
#define GLNVM_ULD				0x000B6008

#define GLNVM_ULD_CORER_DONE_M			BIT(3)

#define GLNVM_ULD_GLOBR_DONE_M			BIT(4)

#define GLPCI_CNF2				0x000BE004

#define GLPCI_CNF2_CACHELINE_SIZE_M		BIT(1)

#define PF_FUNC_RID				0x0009E880

#define PF_FUNC_RID_FUNC_NUM_S			0

#define PF_FUNC_RID_FUNC_NUM_M			ICE_M(0x7, 0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE