Commit 7e18750c authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 



Jeff Kirsher says:

====================
40GbE Intel Wired LAN Driver Updates 2018-11-14

This series contains updates to i40e and virtchnl.

Lance Roy updates i40e to use lockdep_assert_held() instead of
spin_is_locked(), since it is better suited to check locking
requirements.

Jan improves the code readability in XDP by adding the use of a local
variable.  Provides protection on methods that create/modify/destroy
VF's via locking mechanism to prevent unstable behaviour and potential
kernel panics.

Krzysztof adds a hardware capability flag to indicate whether firmware
supports stopping the LLDP agent.

Patryk replaces the use of strncpy() with strlcpy() to ensure the buffer
is NULL terminated.

Mitch fixes the issue of trying to start nway on devices that do not
support auto-negotiation, by checking the autoneg state before
attempting to restart nway.

Alice updates virtchnl to keep the checks all together for ease of
readability and consistency.  Also fixed a "off by one" error in the
number of traffic classes being calculated.

Richard fixed VF port VLANs, where the priority bits were incorrectly
set because the incorrect shift and mask bits were being used.

Alan adds a bit to set and check if a timeout recovery is already
pending to prevent overlapping transmit timeout recovery.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 110e2b4b d5585b7b

drivers/net/ethernet/intel/i40e/i40e.h

+2 −1
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ enum i40e_state_t { 
	__I40E_MDD_EVENT_PENDING,

	__I40E_VFLR_EVENT_PENDING,

	__I40E_RESET_RECOVERY_PENDING,

	__I40E_TIMEOUT_RECOVERY_PENDING,

	__I40E_MISC_IRQ_REQUESTED,

	__I40E_RESET_INTR_RECEIVED,

	__I40E_REINIT_REQUESTED,
@@ -146,6 +147,7 @@ enum i40e_state_t { 
	__I40E_CLIENT_SERVICE_REQUESTED,

	__I40E_CLIENT_L2_CHANGE,

	__I40E_CLIENT_RESET,

	__I40E_VIRTCHNL_OP_PENDING,

	/* This must be last as it determines the size of the BITMAP */

	__I40E_STATE_SIZE__,

};
@@ -494,7 +496,6 @@ struct i40e_pf { 
#define I40E_HW_STOP_FW_LLDP			BIT(16)

#define I40E_HW_PORT_ID_VALID			BIT(17)

#define I40E_HW_RESTART_AUTONEG			BIT(18)

#define I40E_HW_STOPPABLE_FW_LLDP		BIT(19)



	u32 flags;

#define I40E_FLAG_RX_CSUM_ENABLED		BIT(0)

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

+6 −0
Original line number Diff line number Diff line
@@ -588,6 +588,12 @@ i40e_status i40e_init_adminq(struct i40e_hw *hw) 
	    hw->aq.api_maj_ver == I40E_FW_API_VERSION_MAJOR &&

	    hw->aq.api_min_ver >= I40E_MINOR_VER_GET_LINK_INFO_XL710) {

		hw->flags |= I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE;

		hw->flags |= I40E_HW_FLAG_FW_LLDP_STOPPABLE;

	}

	if (hw->mac.type == I40E_MAC_X722 &&

	    hw->aq.api_maj_ver == I40E_FW_API_VERSION_MAJOR &&

	    hw->aq.api_min_ver >= I40E_MINOR_VER_FW_LLDP_STOPPABLE_X722) {

		hw->flags |= I40E_HW_FLAG_FW_LLDP_STOPPABLE;

	}



	/* Newer versions of firmware require lock when reading the NVM */

drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h

+3 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
 */



#define I40E_FW_API_VERSION_MAJOR	0x0001

#define I40E_FW_API_VERSION_MINOR_X722	0x0005

#define I40E_FW_API_VERSION_MINOR_X722	0x0006

#define I40E_FW_API_VERSION_MINOR_X710	0x0007



#define I40E_FW_MINOR_VERSION(_h) ((_h)->mac.type == I40E_MAC_XL710 ? \
@@ -20,6 +20,8 @@ 


/* API version 1.7 implements additional link and PHY-specific APIs  */

#define I40E_MINOR_VER_GET_LINK_INFO_XL710 0x0007

/* API version 1.6 for X722 devices adds ability to stop FW LLDP agent */

#define I40E_MINOR_VER_FW_LLDP_STOPPABLE_X722 0x0006



struct i40e_aq_desc {

	__le16 flags;

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

+3 −0
Original line number Diff line number Diff line
@@ -3723,6 +3723,9 @@ i40e_aq_set_dcb_parameters(struct i40e_hw *hw, bool dcb_enable, 
		(struct i40e_aqc_set_dcb_parameters *)&desc.params.raw;

	i40e_status status;



	if (!(hw->flags & I40E_HW_FLAG_FW_LLDP_STOPPABLE))

		return I40E_ERR_DEVICE_NOT_SUPPORTED;



	i40e_fill_default_direct_cmd_desc(&desc,

					  i40e_aqc_opc_set_dcb_parameters);

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

+13 −11
Original line number Diff line number Diff line
@@ -906,6 +906,7 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw, 
		ks->base.speed = SPEED_100;

		break;

	default:

		ks->base.speed = SPEED_UNKNOWN;

		break;

	}

	ks->base.duplex = DUPLEX_FULL;
@@ -1335,6 +1336,7 @@ static int i40e_set_pauseparam(struct net_device *netdev, 
	i40e_status status;

	u8 aq_failures;

	int err = 0;

	u32 is_an;



	/* Changing the port's flow control is not supported if this isn't the

	 * port's controlling PF
@@ -1347,15 +1349,14 @@ static int i40e_set_pauseparam(struct net_device *netdev, 
	if (vsi != pf->vsi[pf->lan_vsi])

		return -EOPNOTSUPP;



	if (pause->autoneg != ((hw_link_info->an_info & I40E_AQ_AN_COMPLETED) ?

	    AUTONEG_ENABLE : AUTONEG_DISABLE)) {

	is_an = hw_link_info->an_info & I40E_AQ_AN_COMPLETED;

	if (pause->autoneg != is_an) {

		netdev_info(netdev, "To change autoneg please use: ethtool -s <dev> autoneg <on|off>\n");

		return -EOPNOTSUPP;

	}



	/* If we have link and don't have autoneg */

	if (!test_bit(__I40E_DOWN, pf->state) &&

	    !(hw_link_info->an_info & I40E_AQ_AN_COMPLETED)) {

	if (!test_bit(__I40E_DOWN, pf->state) && !is_an) {

		/* Send message that it might not necessarily work*/

		netdev_info(netdev, "Autoneg did not complete so changing settings may not result in an actual change.\n");

	}
@@ -1406,7 +1407,7 @@ static int i40e_set_pauseparam(struct net_device *netdev, 
		err = -EAGAIN;

	}



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

	if (!test_bit(__I40E_DOWN, pf->state) && is_an) {

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

		msleep(75);

		if (!test_bit(__I40E_DOWN, pf->state))
@@ -4660,14 +4661,15 @@ flags_complete: 
		return -EOPNOTSUPP;



	/* If the driver detected FW LLDP was disabled on init, this flag could

	 * be set, however we do not support _changing_ the flag if NPAR is

	 * enabled or FW API version < 1.7.  There are situations where older

	 * FW versions/NPAR enabled PFs could disable LLDP, however we _must_

	 * not allow the user to enable/disable LLDP with this flag on

	 * unsupported FW versions.

	 * be set, however we do not support _changing_ the flag:

	 * - on XL710 if NPAR is enabled or FW API version < 1.7

	 * - on X722 with FW API version < 1.6

	 * There are situations where older FW versions/NPAR enabled PFs could

	 * disable LLDP, however we _must_ not allow the user to enable/disable

	 * LLDP with this flag on unsupported FW versions.

	 */

	if (changed_flags & I40E_FLAG_DISABLE_FW_LLDP) {

		if (!(pf->hw_features & I40E_HW_STOPPABLE_FW_LLDP)) {

		if (!(pf->hw.flags & I40E_HW_FLAG_FW_LLDP_STOPPABLE)) {

			dev_warn(&pf->pdev->dev,

				 "Device does not support changing FW LLDP\n");

			return -EOPNOTSUPP;

CRA Git | Maintained and supported by SUSTech CRA and CCSE