Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b58f648 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:

====================
Intel Wired LAN Driver Updates 2019-06-26

This series contains updates to ixgbe and i40e only.

Mauro S. M. Rodrigues update the ixgbe driver to handle transceivers who
comply with SFF-8472 but do not implement the Digital Diagnostic
Monitoring (DOM) interface.  Update the driver to check the necessary
bits to see if DOM is implemented before trying to read the additional
256 bytes in the EEPROM for DOM data.

Young Xiao fixes a potential divide by zero issue in ixgbe driver.

Aleksandr fixes i40e to recognize 2.5 and 5.0 GbE link speeds so that it
is not reported as "Unknown bps".  Fixes the driver to read the firmware
LLDP agent status during DCB initialization, and to properly log the
LLDP agent status to help with debugging when DCB fails to initialize.

Martyna fixes i40e for the missing supported and advertised link modes
information in ethtool.

Jake fixes a function header comment that was incorrect for a PTP
function in i40e.

Maciej fixes an issue for i40e when a XDP program is loaded the
descriptor count gets reset to the default value, resolve the issue by
making the current descriptor count persistent across resets.

Alice corrects a copyright date which she found to be incorrect.

Piotr adds a log entry when the traffic class 0 is added or deleted, which
was not being logged previously.

Gustavo A. R. Silva updates i40e to use struct_size() where possible.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 096cc49c fae6cad1

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

+2 −1
Original line number Diff line number Diff line
@@ -775,7 +775,8 @@ struct i40e_vsi { 
	u16 alloc_queue_pairs;	/* Allocated Tx/Rx queues */

	u16 req_queue_pairs;	/* User requested queue pairs */

	u16 num_queue_pairs;	/* Used tx and rx pairs */

	u16 num_desc;

	u16 num_tx_desc;

	u16 num_rx_desc;

	enum i40e_vsi_type type;  /* VSI type, e.g., LAN, FCoE, etc */

	s16 vf_id;		/* Virtual function ID for SRIOV VSIs */

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

+1 −2
Original line number Diff line number Diff line
@@ -1861,8 +1861,7 @@ i40e_status i40e_aq_get_link_info(struct i40e_hw *hw, 
	     hw->aq.fw_min_ver < 40)) && hw_link_info->phy_type == 0xE)

		hw_link_info->phy_type = I40E_PHY_TYPE_10GBASE_SFPP_CU;



	if (hw->aq.api_maj_ver == I40E_FW_API_VERSION_MAJOR &&

	    hw->aq.api_min_ver >= 7) {

	if (hw->flags & I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE) {

		__le32 tmp;



		memcpy(&tmp, resp->link_type, sizeof(tmp));

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

+3 −2
Original line number Diff line number Diff line
@@ -333,8 +333,9 @@ static void i40e_dbg_dump_vsi_seid(struct i40e_pf *pf, int seid) 
		 "    seid = %d, id = %d, uplink_seid = %d\n",

		 vsi->seid, vsi->id, vsi->uplink_seid);

	dev_info(&pf->pdev->dev,

		 "    base_queue = %d, num_queue_pairs = %d, num_desc = %d\n",

		 vsi->base_queue, vsi->num_queue_pairs, vsi->num_desc);

		 "    base_queue = %d, num_queue_pairs = %d, num_tx_desc = %d, num_rx_desc = %d\n",

		 vsi->base_queue, vsi->num_queue_pairs, vsi->num_tx_desc,

		 vsi->num_rx_desc);

	dev_info(&pf->pdev->dev, "    type = %i\n", vsi->type);

	if (vsi->type == I40E_VSI_SRIOV)

		dev_info(&pf->pdev->dev, "    VF ID = %i\n", vsi->vf_id);

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

+4 −0
Original line number Diff line number Diff line
@@ -1982,6 +1982,8 @@ static int i40e_set_ringparam(struct net_device *netdev, 
			if (i40e_enabled_xdp_vsi(vsi))

				vsi->xdp_rings[i]->count = new_tx_count;

		}

		vsi->num_tx_desc = new_tx_count;

		vsi->num_rx_desc = new_rx_count;

		goto done;

	}
@@ -2118,6 +2120,8 @@ static int i40e_set_ringparam(struct net_device *netdev, 
		rx_rings = NULL;

	}



	vsi->num_tx_desc = new_tx_count;

	vsi->num_rx_desc = new_rx_count;

	i40e_up(vsi);



free_tx:

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

+84 −15
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ static const char i40e_driver_string[] = 
	     __stringify(DRV_VERSION_MINOR) "." \

	     __stringify(DRV_VERSION_BUILD)    DRV_KERN

const char i40e_driver_version_str[] = DRV_VERSION;

static const char i40e_copyright[] = "Copyright (c) 2013 - 2014 Intel Corporation.";

static const char i40e_copyright[] = "Copyright (c) 2013 - 2019 Intel Corporation.";



/* a bit of forward declarations */

static void i40e_vsi_reinit_locked(struct i40e_vsi *vsi);
@@ -6409,6 +6409,50 @@ static int i40e_resume_port_tx(struct i40e_pf *pf) 
	return ret;

}



/**

 * i40e_update_dcb_config

 * @hw: pointer to the HW struct

 * @enable_mib_change: enable MIB change event

 *

 * Update DCB configuration from the firmware

 **/

static enum i40e_status_code

i40e_update_dcb_config(struct i40e_hw *hw, bool enable_mib_change)

{

	struct i40e_lldp_variables lldp_cfg;

	i40e_status ret;



	if (!hw->func_caps.dcb)

		return I40E_NOT_SUPPORTED;



	/* Read LLDP NVM area */

	ret = i40e_read_lldp_cfg(hw, &lldp_cfg);

	if (ret)

		return I40E_ERR_NOT_READY;



	/* Get DCBX status */

	ret = i40e_get_dcbx_status(hw, &hw->dcbx_status);

	if (ret)

		return ret;



	/* Check the DCBX Status */

	if (hw->dcbx_status == I40E_DCBX_STATUS_DONE ||

	    hw->dcbx_status == I40E_DCBX_STATUS_IN_PROGRESS) {

		/* Get current DCBX configuration */

		ret = i40e_get_dcb_config(hw);

		if (ret)

			return ret;

	} else if (hw->dcbx_status == I40E_DCBX_STATUS_DISABLED) {

		return I40E_ERR_NOT_READY;

	}



	/* Configure the LLDP MIB change event */

	if (enable_mib_change)

		ret = i40e_aq_cfg_lldp_mib_change_event(hw, true, NULL);



	return ret;

}



/**

 * i40e_init_pf_dcb - Initialize DCB configuration

 * @pf: PF being configured
@@ -6425,11 +6469,13 @@ static int i40e_init_pf_dcb(struct i40e_pf *pf) 
	 * Also do not enable DCBx if FW LLDP agent is disabled

	 */

	if ((pf->hw_features & I40E_HW_NO_DCB_SUPPORT) ||

	    (pf->flags & I40E_FLAG_DISABLE_FW_LLDP))

	    (pf->flags & I40E_FLAG_DISABLE_FW_LLDP)) {

		dev_info(&pf->pdev->dev, "DCB is not supported or FW LLDP is disabled\n");

		err = I40E_NOT_SUPPORTED;

		goto out;

	}



	/* Get the initial DCB configuration */

	err = i40e_init_dcb(hw, true);

	err = i40e_update_dcb_config(hw, true);

	if (!err) {

		/* Device/Function is not DCBX capable */

		if ((!hw->func_caps.dcb) ||
@@ -6960,6 +7006,10 @@ static int i40e_setup_tc(struct net_device *netdev, void *type_data) 
			    vsi->seid);

		need_reset = true;

		goto exit;

	} else {

		dev_info(&vsi->back->pdev->dev,

			 "Setup channel (id:%u) utilizing num_queues %d\n",

			 vsi->seid, vsi->tc_config.tc_info[0].qcount);

	}



	if (pf->flags & I40E_FLAG_TC_MQPRIO) {
@@ -10028,7 +10078,11 @@ static int i40e_set_num_rings_in_vsi(struct i40e_vsi *vsi) 
	switch (vsi->type) {

	case I40E_VSI_MAIN:

		vsi->alloc_queue_pairs = pf->num_lan_qps;

		vsi->num_desc = ALIGN(I40E_DEFAULT_NUM_DESCRIPTORS,

		if (!vsi->num_tx_desc)

			vsi->num_tx_desc = ALIGN(I40E_DEFAULT_NUM_DESCRIPTORS,

						 I40E_REQ_DESCRIPTOR_MULTIPLE);

		if (!vsi->num_rx_desc)

			vsi->num_rx_desc = ALIGN(I40E_DEFAULT_NUM_DESCRIPTORS,

						 I40E_REQ_DESCRIPTOR_MULTIPLE);

		if (pf->flags & I40E_FLAG_MSIX_ENABLED)

			vsi->num_q_vectors = pf->num_lan_msix;
@@ -10039,21 +10093,31 @@ static int i40e_set_num_rings_in_vsi(struct i40e_vsi *vsi) 


	case I40E_VSI_FDIR:

		vsi->alloc_queue_pairs = 1;

		vsi->num_desc = ALIGN(I40E_FDIR_RING_COUNT,

		vsi->num_tx_desc = ALIGN(I40E_FDIR_RING_COUNT,

					 I40E_REQ_DESCRIPTOR_MULTIPLE);

		vsi->num_rx_desc = ALIGN(I40E_FDIR_RING_COUNT,

					 I40E_REQ_DESCRIPTOR_MULTIPLE);

		vsi->num_q_vectors = pf->num_fdsb_msix;

		break;



	case I40E_VSI_VMDQ2:

		vsi->alloc_queue_pairs = pf->num_vmdq_qps;

		vsi->num_desc = ALIGN(I40E_DEFAULT_NUM_DESCRIPTORS,

		if (!vsi->num_tx_desc)

			vsi->num_tx_desc = ALIGN(I40E_DEFAULT_NUM_DESCRIPTORS,

						 I40E_REQ_DESCRIPTOR_MULTIPLE);

		if (!vsi->num_rx_desc)

			vsi->num_rx_desc = ALIGN(I40E_DEFAULT_NUM_DESCRIPTORS,

						 I40E_REQ_DESCRIPTOR_MULTIPLE);

		vsi->num_q_vectors = pf->num_vmdq_msix;

		break;



	case I40E_VSI_SRIOV:

		vsi->alloc_queue_pairs = pf->num_vf_qps;

		vsi->num_desc = ALIGN(I40E_DEFAULT_NUM_DESCRIPTORS,

		if (!vsi->num_tx_desc)

			vsi->num_tx_desc = ALIGN(I40E_DEFAULT_NUM_DESCRIPTORS,

						 I40E_REQ_DESCRIPTOR_MULTIPLE);

		if (!vsi->num_rx_desc)

			vsi->num_rx_desc = ALIGN(I40E_DEFAULT_NUM_DESCRIPTORS,

						 I40E_REQ_DESCRIPTOR_MULTIPLE);

		break;
@@ -10330,7 +10394,7 @@ static int i40e_alloc_rings(struct i40e_vsi *vsi) 
		ring->vsi = vsi;

		ring->netdev = vsi->netdev;

		ring->dev = &pf->pdev->dev;

		ring->count = vsi->num_desc;

		ring->count = vsi->num_tx_desc;

		ring->size = 0;

		ring->dcb_tc = 0;

		if (vsi->back->hw_features & I40E_HW_WB_ON_ITR_CAPABLE)
@@ -10347,7 +10411,7 @@ static int i40e_alloc_rings(struct i40e_vsi *vsi) 
		ring->vsi = vsi;

		ring->netdev = NULL;

		ring->dev = &pf->pdev->dev;

		ring->count = vsi->num_desc;

		ring->count = vsi->num_tx_desc;

		ring->size = 0;

		ring->dcb_tc = 0;

		if (vsi->back->hw_features & I40E_HW_WB_ON_ITR_CAPABLE)
@@ -10363,7 +10427,7 @@ static int i40e_alloc_rings(struct i40e_vsi *vsi) 
		ring->vsi = vsi;

		ring->netdev = vsi->netdev;

		ring->dev = &pf->pdev->dev;

		ring->count = vsi->num_desc;

		ring->count = vsi->num_rx_desc;

		ring->size = 0;

		ring->dcb_tc = 0;

		ring->itr_setting = pf->rx_itr_default;
@@ -14397,6 +14461,11 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	pci_set_drvdata(pdev, pf);

	pci_save_state(pdev);



	dev_info(&pdev->dev,

		 (pf->flags & I40E_FLAG_DISABLE_FW_LLDP) ?

			"FW LLDP is disabled\n" :

			"FW LLDP is enabled\n");



	/* Enable FW to write default DCB config on link-up */

	i40e_aq_set_dcb_parameters(hw, true, NULL);