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

Commit 92b6d35f 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 2016-04-05

This series contains updates to i40e and i40evf only.

Colin Ian King cleaned up a redundant NULL check which was found by static
analysis.

Anjali enables geneve receive offload for XL710/X710 devices.

Mitch cleans up unused variable in i40e_vc_get_vf_resources_msg().
Fixed the driver to actually be able to adjust VLAN tagging features
through ethtool, as expected.  Fixed a problem where VF resets would
get lost by the PF preventing the VF driver from initializing.  Also
put users mind at ease by lowering some message levels since many of
these conditions can happen any time VFs are enabled or disabled and
are not really indicative a fatal problems, unless they happen
continuously.

Shannon disables the link polling to lessen the admin queue traffic
especially since the link event mask usage has been fixed recently.

Alex Duyck fixes the i40e and i40evf drivers to correctly update
checksums for frames up to 16776960 in length which should be more than
large enough for all possible TSO frames in the near future.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6f555635 24d41e5e

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

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ static i40e_status i40e_set_mac_type(struct i40e_hw *hw) 
		case I40E_DEV_ID_SFP_X722:

		case I40E_DEV_ID_1G_BASE_T_X722:

		case I40E_DEV_ID_10G_BASE_T_X722:

		case I40E_DEV_ID_SFP_I_X722:

			hw->mac.type = I40E_MAC_X722;

			break;

		default:

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

+2 −3
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ static void i40e_dbg_dump_vsi_seid(struct i40e_pf *pf, int seid) 
		dev_info(&pf->pdev->dev, "        vlan_features = 0x%08lx\n",

			 (unsigned long int)nd->vlan_features);

	}

	if (vsi->active_vlans)

	dev_info(&pf->pdev->dev,

		 "    vlgrp: & = %p\n", vsi->active_vlans);

	dev_info(&pf->pdev->dev,

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

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#define I40E_DEV_ID_SFP_X722		0x37D0

#define I40E_DEV_ID_1G_BASE_T_X722	0x37D1

#define I40E_DEV_ID_10G_BASE_T_X722	0x37D2

#define I40E_DEV_ID_SFP_I_X722		0x37D3



#define i40e_is_40G_device(d)		((d) == I40E_DEV_ID_QSFP_A  || \

					 (d) == I40E_DEV_ID_QSFP_B  || \

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

+16 −0
Original line number Diff line number Diff line
@@ -313,6 +313,13 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw, 
			ecmd->advertising |= ADVERTISED_10000baseT_Full;

		if (hw_link_info->requested_speeds & I40E_LINK_SPEED_1GB)

			ecmd->advertising |= ADVERTISED_1000baseT_Full;

		/* adding 100baseT support for 10GBASET_PHY */

		if (pf->flags & I40E_FLAG_HAVE_10GBASET_PHY) {

			ecmd->supported |= SUPPORTED_100baseT_Full;

			ecmd->advertising |= ADVERTISED_100baseT_Full |

					     ADVERTISED_1000baseT_Full |

					     ADVERTISED_10000baseT_Full;

		}

		break;

	case I40E_PHY_TYPE_1000BASE_T_OPTICAL:

		ecmd->supported = SUPPORTED_Autoneg |
@@ -325,6 +332,15 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw, 
				  SUPPORTED_100baseT_Full;

		if (hw_link_info->requested_speeds & I40E_LINK_SPEED_100MB)

			ecmd->advertising |= ADVERTISED_100baseT_Full;

		/* firmware detects 10G phy as 100M phy at 100M speed */

		if (pf->flags & I40E_FLAG_HAVE_10GBASET_PHY) {

			ecmd->supported |= SUPPORTED_10000baseT_Full |

					   SUPPORTED_1000baseT_Full;

			ecmd->advertising |= ADVERTISED_Autoneg |

					     ADVERTISED_100baseT_Full |

					     ADVERTISED_1000baseT_Full |

					     ADVERTISED_10000baseT_Full;

		}

		break;

	case I40E_PHY_TYPE_10GBASE_CR1_CU:

	case I40E_PHY_TYPE_10GBASE_CR1:

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

+10 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static const char i40e_driver_string[] = 


#define DRV_VERSION_MAJOR 1

#define DRV_VERSION_MINOR 5

#define DRV_VERSION_BUILD 1

#define DRV_VERSION_BUILD 2

#define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \

	     __stringify(DRV_VERSION_MINOR) "." \

	     __stringify(DRV_VERSION_BUILD)    DRV_KERN
@@ -90,6 +90,7 @@ static const struct pci_device_id i40e_pci_tbl[] = { 
	{PCI_VDEVICE(INTEL, I40E_DEV_ID_SFP_X722), 0},

	{PCI_VDEVICE(INTEL, I40E_DEV_ID_1G_BASE_T_X722), 0},

	{PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T_X722), 0},

	{PCI_VDEVICE(INTEL, I40E_DEV_ID_SFP_I_X722), 0},

	{PCI_VDEVICE(INTEL, I40E_DEV_ID_20G_KR2), 0},

	{PCI_VDEVICE(INTEL, I40E_DEV_ID_20G_KR2_A), 0},

	/* required last entry */
@@ -6858,6 +6859,7 @@ static void i40e_reset_and_rebuild(struct i40e_pf *pf, bool reinit) 
	 */

	ret = i40e_aq_set_phy_int_mask(&pf->hw,

				       ~(I40E_AQ_EVENT_LINK_UPDOWN |

					 I40E_AQ_EVENT_MEDIA_NA |

					 I40E_AQ_EVENT_MODULE_QUAL_FAIL), NULL);

	if (ret)

		dev_info(&pf->pdev->dev, "set phy mask fail, err %s aq_err %s\n",
@@ -8447,7 +8449,6 @@ static int i40e_sw_init(struct i40e_pf *pf) 
	/* Set default capability flags */

	pf->flags = I40E_FLAG_RX_CSUM_ENABLED |

		    I40E_FLAG_MSI_ENABLED     |

		    I40E_FLAG_LINK_POLLING_ENABLED |

		    I40E_FLAG_MSIX_ENABLED;



	if (iommu_present(&pci_bus_type))
@@ -9158,6 +9159,12 @@ static int i40e_config_netdev(struct i40e_vsi *vsi) 
					I40E_VLAN_ANY, false, true);

			spin_unlock_bh(&vsi->mac_filter_list_lock);

		}

	} else if ((pf->hw.aq.api_maj_ver > 1) ||

		   ((pf->hw.aq.api_maj_ver == 1) &&

		    (pf->hw.aq.api_min_ver > 4))) {

		/* Supported in FW API version higher than 1.4 */

		pf->flags |= I40E_FLAG_GENEVE_OFFLOAD_CAPABLE;

		pf->auto_disable_flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;

	} else {

		/* relate the VSI_VMDQ name to the VSI_MAIN name */

		snprintf(netdev->name, IFNAMSIZ, "%sv%%d",
@@ -11064,6 +11071,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	 */

	err = i40e_aq_set_phy_int_mask(&pf->hw,

				       ~(I40E_AQ_EVENT_LINK_UPDOWN |

					 I40E_AQ_EVENT_MEDIA_NA |

					 I40E_AQ_EVENT_MODULE_QUAL_FAIL), NULL);

	if (err)

		dev_info(&pf->pdev->dev, "set phy mask fail, err %s aq_err %s\n",