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

Commit 43e2dfb2 authored by David S. Miller's avatar David S. Miller
Browse files

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



Jeff Kirsher says:

====================
10GbE Intel Wired LAN Driver Updates 2016-04-04

This series contains updates to ixgbe and ixgbevf.

Pavel Tikhomirov fixes a typo where we were incrementing transmit stats
instead of receive stats on the receive side.

Emil updates the ixgbevf driver to use bit operations for setting and
checking the adapter state.

Chas Williams adds the new NDO trust feature check so that the VF guest
has the ability to set the unicast address of the interface, if it is a
trusted VF.

Alex cleans up the driver to that the only time we add a PF entry to the
VLVF is either for VLAN 0 or if the PF has requested a VLAN that a VF
is already using.  Also adds support for generic transmit checksums,
giving the added advantage is that we can support inner checksum offloads
for tunnels and MPLS while still being able to transparently insert
VLAN tags.  Lastly, changed ixgbe so that we can use the ethtool
rx-vlan-filter flag to toggle receive VLAN filtering on and off.

Mark cleans up the ixgbe driver by making all op structures that do not
change constants.  Also fixed flow control for Xeon D KR backplanes, since
we cannot use auto-negotiation to determine the mode, we have to use
whatever the user configured.

Sowmini Varadhan updates ixgbe to use eth_platform_get_mac_address()
instead of the arch specific solution that was added by a previous
commit.

Don fixed an issue where it was possible that a system reset could occur
when we were holding the SWFW semaphore lock, which the next time the
driver loaded would see it incorrectly as locked.

v2: updated patch 8 of the series to include a minor flags issue where
    we had lost NETIF_F_HW_TC and we were setting NETIF_F_SCTP_CRC in
    two different areas, when we only needed/wanted it in one spot.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6e338048 0c5a6166

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+7 −7
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel 10 Gigabit PCI Express Linux driver

  Copyright(c) 1999 - 2013 Intel Corporation.

  Copyright(c) 1999 - 2016 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -456,7 +456,7 @@ static inline bool ixgbe_qv_lock_poll(struct ixgbe_q_vector *q_vector) 
				IXGBE_QV_STATE_POLL);

#ifdef BP_EXTENDED_STATS

	if (rc != IXGBE_QV_STATE_IDLE)

		q_vector->tx.ring->stats.yields++;

		q_vector->rx.ring->stats.yields++;

#endif

	return rc == IXGBE_QV_STATE_IDLE;

}
@@ -862,11 +862,11 @@ enum ixgbe_boards { 
	board_X550EM_x,

};



extern struct ixgbe_info ixgbe_82598_info;

extern struct ixgbe_info ixgbe_82599_info;

extern struct ixgbe_info ixgbe_X540_info;

extern struct ixgbe_info ixgbe_X550_info;

extern struct ixgbe_info ixgbe_X550EM_x_info;

extern const struct ixgbe_info ixgbe_82598_info;

extern const struct ixgbe_info ixgbe_82599_info;

extern const struct ixgbe_info ixgbe_X540_info;

extern const struct ixgbe_info ixgbe_X550_info;

extern const struct ixgbe_info ixgbe_X550EM_x_info;

#ifdef CONFIG_IXGBE_DCB

extern const struct dcbnl_rtnl_ops dcbnl_ops;

#endif

drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c

+7 −5
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel 10 Gigabit PCI Express Linux driver

  Copyright(c) 1999 - 2015 Intel Corporation.

  Copyright(c) 1999 - 2016 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -1160,7 +1160,7 @@ static void ixgbe_set_rxpba_82598(struct ixgbe_hw *hw, int num_pb, 
		IXGBE_WRITE_REG(hw, IXGBE_TXPBSIZE(i), IXGBE_TXPBSIZE_40KB);

}



static struct ixgbe_mac_operations mac_ops_82598 = {

static const struct ixgbe_mac_operations mac_ops_82598 = {

	.init_hw		= &ixgbe_init_hw_generic,

	.reset_hw		= &ixgbe_reset_hw_82598,

	.start_hw		= &ixgbe_start_hw_82598,
@@ -1192,9 +1192,11 @@ static struct ixgbe_mac_operations mac_ops_82598 = { 
	.clear_vfta		= &ixgbe_clear_vfta_82598,

	.set_vfta		= &ixgbe_set_vfta_82598,

	.fc_enable		= &ixgbe_fc_enable_82598,

	.setup_fc		= ixgbe_setup_fc_generic,

	.set_fw_drv_ver         = NULL,

	.acquire_swfw_sync      = &ixgbe_acquire_swfw_sync,

	.release_swfw_sync      = &ixgbe_release_swfw_sync,

	.init_swfw_sync		= NULL,

	.get_thermal_sensor_data = NULL,

	.init_thermal_sensor_thresh = NULL,

	.prot_autoc_read	= &prot_autoc_read_generic,
@@ -1203,7 +1205,7 @@ static struct ixgbe_mac_operations mac_ops_82598 = { 
	.disable_rx		= &ixgbe_disable_rx_generic,

};



static struct ixgbe_eeprom_operations eeprom_ops_82598 = {

static const struct ixgbe_eeprom_operations eeprom_ops_82598 = {

	.init_params		= &ixgbe_init_eeprom_params_generic,

	.read			= &ixgbe_read_eerd_generic,

	.write			= &ixgbe_write_eeprom_generic,
@@ -1214,7 +1216,7 @@ static struct ixgbe_eeprom_operations eeprom_ops_82598 = { 
	.update_checksum	= &ixgbe_update_eeprom_checksum_generic,

};



static struct ixgbe_phy_operations phy_ops_82598 = {

static const struct ixgbe_phy_operations phy_ops_82598 = {

	.identify		= &ixgbe_identify_phy_generic,

	.identify_sfp		= &ixgbe_identify_module_generic,

	.init			= &ixgbe_init_phy_ops_82598,
@@ -1230,7 +1232,7 @@ static struct ixgbe_phy_operations phy_ops_82598 = { 
	.check_overtemp		= &ixgbe_tn_check_overtemp,

};



struct ixgbe_info ixgbe_82598_info = {

const struct ixgbe_info ixgbe_82598_info = {

	.mac			= ixgbe_mac_82598EB,

	.get_invariants		= &ixgbe_get_invariants_82598,

	.mac_ops		= &mac_ops_82598,

drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c

+7 −5
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel 10 Gigabit PCI Express Linux driver

  Copyright(c) 1999 - 2015 Intel Corporation.

  Copyright(c) 1999 - 2016 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -2181,7 +2181,7 @@ static s32 ixgbe_write_i2c_byte_82599(struct ixgbe_hw *hw, u8 byte_offset, 
	return status;

}



static struct ixgbe_mac_operations mac_ops_82599 = {

static const struct ixgbe_mac_operations mac_ops_82599 = {

	.init_hw                = &ixgbe_init_hw_generic,

	.reset_hw               = &ixgbe_reset_hw_82599,

	.start_hw               = &ixgbe_start_hw_82599,
@@ -2220,6 +2220,7 @@ static struct ixgbe_mac_operations mac_ops_82599 = { 
	.clear_vfta             = &ixgbe_clear_vfta_generic,

	.set_vfta               = &ixgbe_set_vfta_generic,

	.fc_enable              = &ixgbe_fc_enable_generic,

	.setup_fc		= ixgbe_setup_fc_generic,

	.set_fw_drv_ver         = &ixgbe_set_fw_drv_ver_generic,

	.init_uta_tables        = &ixgbe_init_uta_tables_generic,

	.setup_sfp              = &ixgbe_setup_sfp_modules_82599,
@@ -2227,6 +2228,7 @@ static struct ixgbe_mac_operations mac_ops_82599 = { 
	.set_vlan_anti_spoofing = &ixgbe_set_vlan_anti_spoofing,

	.acquire_swfw_sync      = &ixgbe_acquire_swfw_sync,

	.release_swfw_sync      = &ixgbe_release_swfw_sync,

	.init_swfw_sync		= NULL,

	.get_thermal_sensor_data = &ixgbe_get_thermal_sensor_data_generic,

	.init_thermal_sensor_thresh = &ixgbe_init_thermal_sensor_thresh_generic,

	.prot_autoc_read	= &prot_autoc_read_82599,
@@ -2235,7 +2237,7 @@ static struct ixgbe_mac_operations mac_ops_82599 = { 
	.disable_rx		= &ixgbe_disable_rx_generic,

};



static struct ixgbe_eeprom_operations eeprom_ops_82599 = {

static const struct ixgbe_eeprom_operations eeprom_ops_82599 = {

	.init_params		= &ixgbe_init_eeprom_params_generic,

	.read			= &ixgbe_read_eeprom_82599,

	.read_buffer		= &ixgbe_read_eeprom_buffer_82599,
@@ -2246,7 +2248,7 @@ static struct ixgbe_eeprom_operations eeprom_ops_82599 = { 
	.update_checksum	= &ixgbe_update_eeprom_checksum_generic,

};



static struct ixgbe_phy_operations phy_ops_82599 = {

static const struct ixgbe_phy_operations phy_ops_82599 = {

	.identify		= &ixgbe_identify_phy_82599,

	.identify_sfp		= &ixgbe_identify_module_generic,

	.init			= &ixgbe_init_phy_ops_82599,
@@ -2263,7 +2265,7 @@ static struct ixgbe_phy_operations phy_ops_82599 = { 
	.check_overtemp		= &ixgbe_tn_check_overtemp,

};



struct ixgbe_info ixgbe_82599_info = {

const struct ixgbe_info ixgbe_82599_info = {

	.mac                    = ixgbe_mac_82599EB,

	.get_invariants         = &ixgbe_get_invariants_82599,

	.mac_ops                = &mac_ops_82599,

drivers/net/ethernet/intel/ixgbe/ixgbe_common.c

+4 −4
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel 10 Gigabit PCI Express Linux driver

  Copyright(c) 1999 - 2015 Intel Corporation.

  Copyright(c) 1999 - 2016 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -111,12 +111,12 @@ bool ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw) 
}



/**

 *  ixgbe_setup_fc - Set up flow control

 *  ixgbe_setup_fc_generic - Set up flow control

 *  @hw: pointer to hardware structure

 *

 *  Called at init time to set up flow control.

 **/

static s32 ixgbe_setup_fc(struct ixgbe_hw *hw)

s32 ixgbe_setup_fc_generic(struct ixgbe_hw *hw)

{

	s32 ret_val = 0;

	u32 reg = 0, reg_bp = 0;
@@ -296,7 +296,7 @@ s32 ixgbe_start_hw_generic(struct ixgbe_hw *hw) 
	IXGBE_WRITE_FLUSH(hw);



	/* Setup flow control */

	ret_val = ixgbe_setup_fc(hw);

	ret_val = hw->mac.ops.setup_fc(hw);

	if (ret_val)

		return ret_val;

drivers/net/ethernet/intel/ixgbe/ixgbe_common.h

+2 −1
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel 10 Gigabit PCI Express Linux driver

  Copyright(c) 1999 - 2014 Intel Corporation.

  Copyright(c) 1999 - 2016 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -81,6 +81,7 @@ s32 ixgbe_disable_rx_buff_generic(struct ixgbe_hw *hw); 
s32 ixgbe_enable_rx_buff_generic(struct ixgbe_hw *hw);

s32 ixgbe_enable_rx_dma_generic(struct ixgbe_hw *hw, u32 regval);

s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw);

s32 ixgbe_setup_fc_generic(struct ixgbe_hw *);

bool ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw);

void ixgbe_fc_autoneg(struct ixgbe_hw *hw);