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

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

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



Jeff Kirsher says:

====================
1GbE Intel Wired LAN Driver Updates 2016-02-24

This series contains updates to e1000e, igb and igbvf.

Raanan provides updates for e1000e, first increases the ULP timer since it
now takes longer for the ULP exit to complete on Skylake.  Fixes the
configuration of the internal hardware PHY clock gating mechanism, which was
causing packet loss due to mis configuring.  Fixed additional ULP
configuration settings which were not being properly cleared after cable
connect in V-Pro capable systems.  Added support for more i219 devices.

Takuma Ueba provides a fix for I210 where IPv6 autoconf test sometimes
fails due to DAD NS for link-local is not transmitted.  To avoid this
issue, we need to wait until 1000BASE-T status register "Remote receiver
status OK".

Todd provides a patch to override EEPROM WoL settings for specific OEM
devices. Then renamed igb defines to be more generic, since the define
E1000_MRQC_ENABLE_RSS_4Q enables 4 and 8 queues depending on the part.

Roland Hii fixes an issue where only the half cycle time of less than or
equal to 70 millisecond uses the I210 clock output function.  His patch
adds additional conditions when half cycle time is equal to 125 or 250 or
500 millisecond to use the clock output function.

Alex Duyck adds support for generic transmit checksums for igb and igbvf.

Jon Maxwell fixes an issues where customer applications are registering
and un-registering multicast addresses every few seconds which is leading
to many "Link is up" messages in the logs as a result of the
netif_carrier_off(netdev) in igbvf_msix_other().  So remove the
link is up message when registering multicast addresses.

Corinna Vinschen provides a fix for when switching off VLAN offloading on
i350, the VLAN interface becomes unusable.

Stefan Assmann updates the driver to use ndo_stop() instead of
dev_close() when running ethtool offline self test.  Since dev_close()
causes IFF_UP to be cleared which will remove the interfaces routes
and some addresses.

v2: Dropped patches 6-10 in the original series.  Patch 6-7 added support
    for character device for AVB and based on community feedback, we do not
    want to do this.  Patches 8-10 provided fixes to the problematic code
    added in patches 6 & 7.  So all of them must go!
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 22463876 46eafa59

drivers/net/ethernet/intel/e1000e/hw.h

+4 −0
Original line number Diff line number Diff line
@@ -92,6 +92,10 @@ struct e1000_hw; 
#define E1000_DEV_ID_PCH_SPT_I219_LM2		0x15B7	/* SPT-H PCH */

#define E1000_DEV_ID_PCH_SPT_I219_V2		0x15B8	/* SPT-H PCH */

#define E1000_DEV_ID_PCH_LBG_I219_LM3		0x15B9	/* LBG PCH */

#define E1000_DEV_ID_PCH_SPT_I219_LM4		0x15D7

#define E1000_DEV_ID_PCH_SPT_I219_V4		0x15D8

#define E1000_DEV_ID_PCH_SPT_I219_LM5		0x15E3

#define E1000_DEV_ID_PCH_SPT_I219_V5		0x15D6



#define E1000_REVISION_4	4

drivers/net/ethernet/intel/e1000e/ich8lan.c

+28 −2
Original line number Diff line number Diff line
@@ -1252,9 +1252,9 @@ static s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force) 
			ew32(H2ME, mac_reg);

		}



		/* Poll up to 100msec for ME to clear ULP_CFG_DONE */

		/* Poll up to 300msec for ME to clear ULP_CFG_DONE. */

		while (er32(FWSM) & E1000_FWSM_ULP_CFG_DONE) {

			if (i++ == 10) {

			if (i++ == 30) {

				ret_val = -E1000_ERR_PHY;

				goto out;

			}
@@ -1328,6 +1328,8 @@ static s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force) 
		     I218_ULP_CONFIG1_RESET_TO_SMBUS |

		     I218_ULP_CONFIG1_WOL_HOST |

		     I218_ULP_CONFIG1_INBAND_EXIT |

		     I218_ULP_CONFIG1_EN_ULP_LANPHYPC |

		     I218_ULP_CONFIG1_DIS_CLR_STICKY_ON_PERST |

		     I218_ULP_CONFIG1_DISABLE_SMB_PERST);

	e1000_write_phy_reg_hv_locked(hw, I218_ULP_CONFIG1, phy_reg);
@@ -1433,6 +1435,18 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw) 
			emi_addr = I217_RX_CONFIG;

		ret_val = e1000_write_emi_reg_locked(hw, emi_addr, emi_val);



		if (hw->mac.type == e1000_pch_lpt ||

		    hw->mac.type == e1000_pch_spt) {

			u16 phy_reg;



			e1e_rphy_locked(hw, I217_PLL_CLOCK_GATE_REG, &phy_reg);

			phy_reg &= ~I217_PLL_CLOCK_GATE_MASK;

			if (speed == SPEED_100 || speed == SPEED_10)

				phy_reg |= 0x3E8;

			else

				phy_reg |= 0xFA;

			e1e_wphy_locked(hw, I217_PLL_CLOCK_GATE_REG, phy_reg);

		}

		hw->phy.ops.release(hw);



		if (ret_val)
@@ -1467,6 +1481,18 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw) 
				hw->phy.ops.release(hw);

				if (ret_val)

					return ret_val;

			} else {

				ret_val = hw->phy.ops.acquire(hw);

				if (ret_val)

					return ret_val;



				ret_val = e1e_wphy_locked(hw,

							  PHY_REG(776, 20),

							  0xC023);

				hw->phy.ops.release(hw);

				if (ret_val)

					return ret_val;



			}

		}

	}

drivers/net/ethernet/intel/e1000e/ich8lan.h

+7 −0
Original line number Diff line number Diff line
@@ -188,6 +188,10 @@ 
#define I218_ULP_CONFIG1_INBAND_EXIT	0x0020	/* Inband on ULP exit */

#define I218_ULP_CONFIG1_WOL_HOST	0x0040	/* WoL Host on ULP exit */

#define I218_ULP_CONFIG1_RESET_TO_SMBUS	0x0100	/* Reset to SMBus mode */

/* enable ULP even if when phy powered down via lanphypc */

#define I218_ULP_CONFIG1_EN_ULP_LANPHYPC	0x0400

/* disable clear of sticky ULP on PERST */

#define I218_ULP_CONFIG1_DIS_CLR_STICKY_ON_PERST	0x0800

#define I218_ULP_CONFIG1_DISABLE_SMB_PERST	0x1000	/* Disable on PERST# */



/* SMBus Address Phy Register */
@@ -226,6 +230,9 @@ 
#define HV_PM_CTRL_PLL_STOP_IN_K1_GIGA	0x100

#define HV_PM_CTRL_K1_ENABLE		0x4000



#define I217_PLL_CLOCK_GATE_REG	PHY_REG(772, 28)

#define I217_PLL_CLOCK_GATE_MASK	0x07FF



#define SW_FLAG_TIMEOUT		1000	/* SW Semaphore flag timeout in ms */



/* Inband Control */

drivers/net/ethernet/intel/e1000e/netdev.c

+4 −0
Original line number Diff line number Diff line
@@ -7452,6 +7452,10 @@ static const struct pci_device_id e1000_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_SPT_I219_LM2), board_pch_spt },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_SPT_I219_V2), board_pch_spt },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LBG_I219_LM3), board_pch_spt },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_SPT_I219_LM4), board_pch_spt },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_SPT_I219_V4), board_pch_spt },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_SPT_I219_LM5), board_pch_spt },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_SPT_I219_V5), board_pch_spt },



	{ 0, 0, 0, 0, 0, 0, 0 }	/* terminate list */

};

drivers/net/ethernet/intel/igb/e1000_82575.c

+1 −1
Original line number Diff line number Diff line
@@ -2920,7 +2920,7 @@ static struct e1000_mac_operations e1000_mac_ops_82575 = { 
#endif

};



static struct e1000_phy_operations e1000_phy_ops_82575 = {

static const struct e1000_phy_operations e1000_phy_ops_82575 = {

	.acquire              = igb_acquire_phy_82575,

	.get_cfg_done         = igb_get_cfg_done_82575,

	.release              = igb_release_phy_82575,