Commit 6ee24258 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-03-10

This series contains updates to ice and iavf drivers.

Cleaned up unnecessary parenthesis, which was pointed out by Sergei
Shtylyov.

Mitch updates the iavf and ice drivers to expand the limitation on the
number of queues that the driver can support to account for the newer
800-series capabilities.

Brett cleans up the error messages for both SR-IOV and non SR-IOV use
cases.  Fixed the logic when the ice driver is removed and a bare-metal
VF is passing traffic, which was causing a transmit hang on the VF.
Updated the ice driver to display "Link detected" field via ethtool,
when the driver is in safe mode.  Updated ice driver to properly set
VLAN pruning when transmit anti-spoof is off.

Avinash fixed a corner case in DCB, when switching from IEEE to CEE
mode, the DCBX mode does not get properly updated.

Dave updates the logic when switching from software DCB to firmware DCB
to renegotiate DCBX to ensure the firmware agent has up to date
information about the DCB settings of the link partner.

Lukasz increases the PF's mailbox receive queue size to the maximum to
prevent potential bottleneck or slow down occurring from the PF's
mailbox receive queue being full.

Bruce updates the ice driver to use strscpy() instead of strlcpy().
Cleaned up variable names that were not very descriptive with names that
had more meaning.

Anirudh replaces the use of ENOTSUPP with EOPNOTSUPP in the ice driver.

Jake fixed up a function header comment to properly reflect the variable
size and use.

v2: Dropped patch 5 of the original series, where Tony added tunnel
    offload support.  Based on community feedback, the patch needed
    changes, so giving Tony additional time to work on those changes and
    not hold up the remaining changes in the series.
====================

Acked-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 13e787ca dab02de8

drivers/net/ethernet/intel/iavf/iavf.h

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ struct iavf_vsi { 
#define IAVF_TX_DESC(R, i) (&(((struct iavf_tx_desc *)((R)->desc))[i]))

#define IAVF_TX_CTXTDESC(R, i) \

	(&(((struct iavf_tx_context_desc *)((R)->desc))[i]))

#define IAVF_MAX_REQ_QUEUES 4

#define IAVF_MAX_REQ_QUEUES 16



#define IAVF_HKEY_ARRAY_SIZE ((IAVF_VFQF_HKEY_MAX_INDEX + 1) * 4)

#define IAVF_HLUT_ARRAY_SIZE ((IAVF_VFQF_HLUT_MAX_INDEX + 1) * 4)

drivers/net/ethernet/intel/iavf/iavf_ethtool.c

+9 −11
Original line number Diff line number Diff line
@@ -860,7 +860,7 @@ static void iavf_get_channels(struct net_device *netdev, 
	struct iavf_adapter *adapter = netdev_priv(netdev);



	/* Report maximum channels */

	ch->max_combined = IAVF_MAX_REQ_QUEUES;

	ch->max_combined = adapter->vsi_res->num_queue_pairs;



	ch->max_other = NONQ_VECS;

	ch->other_count = NONQ_VECS;
@@ -881,14 +881,7 @@ static int iavf_set_channels(struct net_device *netdev, 
			     struct ethtool_channels *ch)

{

	struct iavf_adapter *adapter = netdev_priv(netdev);

	int num_req = ch->combined_count;



	if (num_req != adapter->num_active_queues &&

	    !(adapter->vf_res->vf_cap_flags &

	      VIRTCHNL_VF_OFFLOAD_REQ_QUEUES)) {

		dev_info(&adapter->pdev->dev, "PF is not capable of queue negotiation.\n");

		return -EINVAL;

	}

	u32 num_req = ch->combined_count;



	if ((adapter->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_ADQ) &&

	    adapter->num_tc) {
@@ -899,14 +892,19 @@ static int iavf_set_channels(struct net_device *netdev, 
	/* All of these should have already been checked by ethtool before this

	 * even gets to us, but just to be sure.

	 */

	if (num_req <= 0 || num_req > IAVF_MAX_REQ_QUEUES)

	if (num_req > adapter->vsi_res->num_queue_pairs)

		return -EINVAL;



	if (num_req == adapter->num_active_queues)

		return 0;



	if (ch->rx_count || ch->tx_count || ch->other_count != NONQ_VECS)

		return -EINVAL;



	adapter->num_req_queues = num_req;

	return iavf_request_queues(adapter, num_req);

	adapter->flags |= IAVF_FLAG_REINIT_ITR_NEEDED;

	iavf_schedule_reset(adapter);

	return 0;

}



/**

drivers/net/ethernet/intel/iavf/iavf_main.c

+1 −1
Original line number Diff line number Diff line
@@ -3450,7 +3450,7 @@ int iavf_process_config(struct iavf_adapter *adapter) 
	}



	if (num_req_queues &&

	    num_req_queues != adapter->vsi_res->num_queue_pairs) {

	    num_req_queues > adapter->vsi_res->num_queue_pairs) {

		/* Problem.  The PF gave us fewer queues than what we had

		 * negotiated in our request.  Need a reset to see if we can't

		 * get back to a working state.

drivers/net/ethernet/intel/iavf/iavf_virtchnl.c

+0 −27
Original line number Diff line number Diff line
@@ -396,33 +396,6 @@ void iavf_map_queues(struct iavf_adapter *adapter) 
	kfree(vimi);

}



/**

 * iavf_request_queues

 * @adapter: adapter structure

 * @num: number of requested queues

 *

 * We get a default number of queues from the PF.  This enables us to request a

 * different number.  Returns 0 on success, negative on failure

 **/

int iavf_request_queues(struct iavf_adapter *adapter, int num)

{

	struct virtchnl_vf_res_request vfres;



	if (adapter->current_op != VIRTCHNL_OP_UNKNOWN) {

		/* bail because we already have a command pending */

		dev_err(&adapter->pdev->dev, "Cannot request queues, command %d pending\n",

			adapter->current_op);

		return -EBUSY;

	}



	vfres.num_queue_pairs = min_t(int, num, num_online_cpus());



	adapter->current_op = VIRTCHNL_OP_REQUEST_QUEUES;

	adapter->flags |= IAVF_FLAG_REINIT_ITR_NEEDED;

	return iavf_send_pf_msg(adapter, VIRTCHNL_OP_REQUEST_QUEUES,

				(u8 *)&vfres, sizeof(vfres));

}



/**

 * iavf_add_ether_addrs

 * @adapter: adapter structure

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

+3 −4
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ extern const char ice_drv_ver[]; 
#define ICE_INT_NAME_STR_LEN	(IFNAMSIZ + 16)

#define ICE_AQ_LEN		64

#define ICE_MBXSQ_LEN		64

#define ICE_MBXRQ_LEN		512

#define ICE_MIN_MSIX		2

#define ICE_NO_VSI		0xffff

#define ICE_VSI_MAP_CONTIG	0
@@ -70,7 +69,6 @@ extern const char ice_drv_ver[]; 
#define ICE_Q_WAIT_RETRY_LIMIT	10

#define ICE_Q_WAIT_MAX_RETRY	(5 * ICE_Q_WAIT_RETRY_LIMIT)

#define ICE_MAX_LG_RSS_QS	256

#define ICE_MAX_SMALL_RSS_QS	8

#define ICE_RES_VALID_BIT	0x8000

#define ICE_RES_MISC_VEC_ID	(ICE_RES_VALID_BIT - 1)

#define ICE_INVAL_Q_INDEX	0xffff
@@ -213,6 +211,7 @@ enum ice_state { 
	__ICE_SERVICE_DIS,

	__ICE_OICR_INTR_DIS,		/* Global OICR interrupt disabled */

	__ICE_MDD_VF_PRINT_PENDING,	/* set when MDD event handle */

	__ICE_VF_RESETS_DISABLED,	/* disable resets during ice_remove */

	__ICE_STATE_NBITS		/* must be last */

};
@@ -363,8 +362,8 @@ struct ice_pf { 
	struct ice_vf *vf;

	int num_alloc_vfs;		/* actual number of VFs allocated */

	u16 num_vfs_supported;		/* num VFs supported for this PF */

	u16 num_vf_qps;			/* num queue pairs per VF */

	u16 num_vf_msix;		/* num vectors per VF */

	u16 num_qps_per_vf;

	u16 num_msix_per_vf;

	/* used to ratelimit the MDD event logging */

	unsigned long last_printed_mdd_jiffies;

	DECLARE_BITMAP(state, __ICE_STATE_NBITS);

CRA Git | Maintained and supported by SUSTech CRA and CCSE