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

Commit 9811d1e3 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-11-04

This series contains updates to ixgbe and ixgbevf only.

Don does cleanup and configuration for our X553 devices, related to LED,
auto-negotiation, flow control and SFP+ setup and config.  Adds the
(not secret) sauce for B0 hardware for X553 hardware.

Emil provides several fixes, first replaces the driver specific MDIO
defines for the more preferred equivalent kernel ones.  Provides a fix
for auto-negotiaion status, by reading a PHY register twice.  Introduces
ixgbe_link_operations structure to allow X550EM_a to override the
methods for MDIO access while X550EM_x provides methods to use I2C
combined access.

Mark fixes an issue where the driver was crashing when msix_entires
were not there because they were freed by a previous suspend or remove.

Sowmini Varadhan fixes an issue where an incorrect check for IPPROTO_UDP
in ixgbe_atr().  Then makes sure that the network and transport headers
in the paged data are available in the headlen bytes to calculate the
l4_proto.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b6e41797 eeffceee

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

+2 −0
Original line number Diff line number Diff line
@@ -1027,4 +1027,6 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb, 
				  struct ixgbe_ring *tx_ring);

u32 ixgbe_rss_indir_tbl_entries(struct ixgbe_adapter *adapter);

void ixgbe_store_reta(struct ixgbe_adapter *adapter);

s32 ixgbe_negotiate_fc(struct ixgbe_hw *hw, u32 adv_reg, u32 lp_reg,

		       u32 adv_sym, u32 adv_asm, u32 lp_sym, u32 lp_asm);

#endif /* _IXGBE_H_ */

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

+3 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw) 
	}



	/* Negotiate the fc mode to use */

	ixgbe_fc_autoneg(hw);

	hw->mac.ops.fc_autoneg(hw);



	/* Disable any previous flow control settings */

	fctrl_reg = IXGBE_READ_REG(hw, IXGBE_FCTRL);
@@ -1179,6 +1179,7 @@ static const struct ixgbe_mac_operations mac_ops_82598 = { 
	.get_link_capabilities	= &ixgbe_get_link_capabilities_82598,

	.led_on			= &ixgbe_led_on_generic,

	.led_off		= &ixgbe_led_off_generic,

	.init_led_link_act	= ixgbe_init_led_link_act_generic,

	.blink_led_start	= &ixgbe_blink_led_start_generic,

	.blink_led_stop		= &ixgbe_blink_led_stop_generic,

	.set_rar		= &ixgbe_set_rar_generic,
@@ -1193,6 +1194,7 @@ static const struct ixgbe_mac_operations mac_ops_82598 = { 
	.set_vfta		= &ixgbe_set_vfta_82598,

	.fc_enable		= &ixgbe_fc_enable_82598,

	.setup_fc		= ixgbe_setup_fc_generic,

	.fc_autoneg		= ixgbe_fc_autoneg,

	.set_fw_drv_ver         = NULL,

	.acquire_swfw_sync      = &ixgbe_acquire_swfw_sync,

	.release_swfw_sync      = &ixgbe_release_swfw_sync,

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

+2 −0
Original line number Diff line number Diff line
@@ -2204,6 +2204,7 @@ static const struct ixgbe_mac_operations mac_ops_82599 = { 
	.get_link_capabilities  = &ixgbe_get_link_capabilities_82599,

	.led_on                 = &ixgbe_led_on_generic,

	.led_off                = &ixgbe_led_off_generic,

	.init_led_link_act	= ixgbe_init_led_link_act_generic,

	.blink_led_start        = &ixgbe_blink_led_start_generic,

	.blink_led_stop         = &ixgbe_blink_led_stop_generic,

	.set_rar                = &ixgbe_set_rar_generic,
@@ -2219,6 +2220,7 @@ static const struct ixgbe_mac_operations mac_ops_82599 = { 
	.set_vfta               = &ixgbe_set_vfta_generic,

	.fc_enable              = &ixgbe_fc_enable_generic,

	.setup_fc		= ixgbe_setup_fc_generic,

	.fc_autoneg		= ixgbe_fc_autoneg,

	.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,

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

+55 −7
Original line number Diff line number Diff line
@@ -298,10 +298,12 @@ s32 ixgbe_start_hw_generic(struct ixgbe_hw *hw) 
	IXGBE_WRITE_REG(hw, IXGBE_CTRL_EXT, ctrl_ext);

	IXGBE_WRITE_FLUSH(hw);



	/* Setup flow control */

	/* Setup flow control if method for doing so */

	if (hw->mac.ops.setup_fc) {

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

		if (ret_val)

			return ret_val;

	}



	/* Cashe bit indicating need for crosstalk fix */

	switch (hw->mac.type) {
@@ -390,6 +392,9 @@ s32 ixgbe_init_hw_generic(struct ixgbe_hw *hw) 
		status = hw->mac.ops.start_hw(hw);

	}



	/* Initialize the LED link active for LED blink support */

	hw->mac.ops.init_led_link_act(hw);



	return status;

}
@@ -772,6 +777,49 @@ s32 ixgbe_stop_adapter_generic(struct ixgbe_hw *hw) 
	return ixgbe_disable_pcie_master(hw);

}



/**

 *  ixgbe_init_led_link_act_generic - Store the LED index link/activity.

 *  @hw: pointer to hardware structure

 *

 *  Store the index for the link active LED. This will be used to support

 *  blinking the LED.

 **/

s32 ixgbe_init_led_link_act_generic(struct ixgbe_hw *hw)

{

	struct ixgbe_mac_info *mac = &hw->mac;

	u32 led_reg, led_mode;

	u16 i;



	led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);



	/* Get LED link active from the LEDCTL register */

	for (i = 0; i < 4; i++) {

		led_mode = led_reg >> IXGBE_LED_MODE_SHIFT(i);



		if ((led_mode & IXGBE_LED_MODE_MASK_BASE) ==

		    IXGBE_LED_LINK_ACTIVE) {

			mac->led_link_act = i;

			return 0;

		}

	}



	/* If LEDCTL register does not have the LED link active set, then use

	 * known MAC defaults.

	 */

	switch (hw->mac.type) {

	case ixgbe_mac_x550em_a:

		mac->led_link_act = 0;

		break;

	case ixgbe_mac_X550EM_x:

		mac->led_link_act = 1;

		break;

	default:

		mac->led_link_act = 2;

	}



	return 0;

}



/**

 *  ixgbe_led_on_generic - Turns on the software controllable LEDs.

 *  @hw: pointer to hardware structure
@@ -2127,7 +2175,7 @@ s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw) 
	}



	/* Negotiate the fc mode to use */

	ixgbe_fc_autoneg(hw);

	hw->mac.ops.fc_autoneg(hw);



	/* Disable any previous flow control settings */

	mflcn_reg = IXGBE_READ_REG(hw, IXGBE_MFLCN);
@@ -2231,7 +2279,7 @@ s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw) 
 *  Find the intersection between advertised settings and link partner's

 *  advertised settings

 **/

static s32 ixgbe_negotiate_fc(struct ixgbe_hw *hw, u32 adv_reg, u32 lp_reg,

s32 ixgbe_negotiate_fc(struct ixgbe_hw *hw, u32 adv_reg, u32 lp_reg,

		       u32 adv_sym, u32 adv_asm, u32 lp_sym, u32 lp_asm)

{

	if ((!(adv_reg)) ||  (!(lp_reg)))

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

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ s32 ixgbe_stop_adapter_generic(struct ixgbe_hw *hw); 


s32 ixgbe_led_on_generic(struct ixgbe_hw *hw, u32 index);

s32 ixgbe_led_off_generic(struct ixgbe_hw *hw, u32 index);

s32 ixgbe_init_led_link_act_generic(struct ixgbe_hw *hw);



s32 ixgbe_init_eeprom_params_generic(struct ixgbe_hw *hw);

s32 ixgbe_write_eeprom_generic(struct ixgbe_hw *hw, u16 offset, u16 data);