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

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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue 



Jeff Kirsher says:

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

This series contains fixes for igb, e1000e and i40evf.

Todd disables IPv6 extension header processing due to a hardware errata
and bumps the driver version.

Yanir provides six fixes for e1000e.  First is a fix for a locking issue
where we were not always taking the pci_bus_sem semaphore all the time
when calling pci_disable_link_state_locked(), so fix the code to only call
pci_disable_link_state_locked() when the semaphore has been acquired,
otherwise call pci_disable_link_state().  A previous fix for i219 where
the hardware prevented ULP entry caused EEE in Sx not the be enabled, so
modify the code flow that allows both ULP and EEE in Sx.  Fix an issue
when running 10/100 full duplex on i219 where CRC errors were occurring
by increasing the IPG from 8 to 0xC as per the hardware developers.
Fix a data corruption issue found on some platforms by increasing the
minimum gap between the PHY FIFO read and write pointers.  Fix i219,
which does not require the K1 workaround for LPT devices.

Mitch provides a i40evf fix for a panic when changing MTU.  Down was
requesting queue disables, but then exited immediately without waiting
for the queues to actually be disabled.  This could allow any function
called after i40evf_down() to run immediately, including i40evf_up(),
and causes a memory leak.  Fixed the issue by removing the whole
reinit_locked function which allows for the driver to handle the state
changes by requesting reset from the periodic timer.  The second fix
resolves an issue where RSS was being configured as though it is using
the maximum number of queue.  This can cause the device to drop a lot
of receive traffic, as the packets get assigned to non-functional queues.
This is resolved by only configuring RSS with the number of active queues.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents da1da284 40746eb1

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

+98 −28
Original line number Diff line number Diff line
@@ -237,8 +237,9 @@ static bool e1000_phy_is_accessible_pchlan(struct e1000_hw *hw) 
	if (ret_val)

		return false;

out:

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

	    (hw->mac.type == e1000_pch_spt)) {

	if ((hw->mac.type == e1000_pch_lpt) || (hw->mac.type == e1000_pch_spt)) {

		/* Only unforce SMBus if ME is not active */

		if (!(er32(FWSM) & E1000_ICH_FWSM_FW_VALID)) {

			/* Unforce SMBus mode in PHY */

			e1e_rphy_locked(hw, CV_SMB_CTRL, &phy_reg);

			phy_reg &= ~CV_SMB_CTRL_FORCE_SMBUS;
@@ -249,6 +250,7 @@ static bool e1000_phy_is_accessible_pchlan(struct e1000_hw *hw) 
			mac_reg &= ~E1000_CTRL_EXT_FORCE_SMBUS;

			ew32(CTRL_EXT, mac_reg);

		}

	}



	return true;

}
@@ -1087,6 +1089,7 @@ s32 e1000_enable_ulp_lpt_lp(struct e1000_hw *hw, bool to_sx) 
	u32 mac_reg;

	s32 ret_val = 0;

	u16 phy_reg;

	u16 oem_reg = 0;



	if ((hw->mac.type < e1000_pch_lpt) ||

	    (hw->adapter->pdev->device == E1000_DEV_ID_PCH_LPT_I217_LM) ||
@@ -1128,32 +1131,36 @@ s32 e1000_enable_ulp_lpt_lp(struct e1000_hw *hw, bool to_sx) 
	if (ret_val)

		goto out;



	/* Force SMBus mode in PHY */

	ret_val = e1000_read_phy_reg_hv_locked(hw, CV_SMB_CTRL, &phy_reg);

	if (ret_val)

		goto release;

	phy_reg |= CV_SMB_CTRL_FORCE_SMBUS;

	e1000_write_phy_reg_hv_locked(hw, CV_SMB_CTRL, phy_reg);



	/* Force SMBus mode in MAC */

	mac_reg = er32(CTRL_EXT);

	mac_reg |= E1000_CTRL_EXT_FORCE_SMBUS;

	ew32(CTRL_EXT, mac_reg);



	/* Si workaround for ULP entry flow on i127/rev6 h/w.  Enable

	 * LPLU and disable Gig speed when entering ULP

	 */

	if ((hw->phy.type == e1000_phy_i217) && (hw->phy.revision == 6)) {

		ret_val = e1000_read_phy_reg_hv_locked(hw, HV_OEM_BITS,

						       &phy_reg);

						       &oem_reg);

		if (ret_val)

			goto release;



		phy_reg = oem_reg;

		phy_reg |= HV_OEM_BITS_LPLU | HV_OEM_BITS_GBE_DIS;



		ret_val = e1000_write_phy_reg_hv_locked(hw, HV_OEM_BITS,

							phy_reg);

		if (ret_val)

			goto release;

	}



	/* Force SMBus mode in PHY */

	ret_val = e1000_read_phy_reg_hv_locked(hw, CV_SMB_CTRL, &phy_reg);

		if (ret_val)

			goto release;

	phy_reg |= CV_SMB_CTRL_FORCE_SMBUS;

	e1000_write_phy_reg_hv_locked(hw, CV_SMB_CTRL, phy_reg);



	/* Force SMBus mode in MAC */

	mac_reg = er32(CTRL_EXT);

	mac_reg |= E1000_CTRL_EXT_FORCE_SMBUS;

	ew32(CTRL_EXT, mac_reg);

	}



	/* Set Inband ULP Exit, Reset to SMBus mode and

	 * Disable SMBus Release on PERST# in PHY
@@ -1166,10 +1173,15 @@ s32 e1000_enable_ulp_lpt_lp(struct e1000_hw *hw, bool to_sx) 
	if (to_sx) {

		if (er32(WUFC) & E1000_WUFC_LNKC)

			phy_reg |= I218_ULP_CONFIG1_WOL_HOST;

		else

			phy_reg &= ~I218_ULP_CONFIG1_WOL_HOST;



		phy_reg |= I218_ULP_CONFIG1_STICKY_ULP;

		phy_reg &= ~I218_ULP_CONFIG1_INBAND_EXIT;

	} else {

		phy_reg |= I218_ULP_CONFIG1_INBAND_EXIT;

		phy_reg &= ~I218_ULP_CONFIG1_STICKY_ULP;

		phy_reg &= ~I218_ULP_CONFIG1_WOL_HOST;

	}

	e1000_write_phy_reg_hv_locked(hw, I218_ULP_CONFIG1, phy_reg);
@@ -1181,6 +1193,15 @@ s32 e1000_enable_ulp_lpt_lp(struct e1000_hw *hw, bool to_sx) 
	/* Commit ULP changes in PHY by starting auto ULP configuration */

	phy_reg |= I218_ULP_CONFIG1_START;

	e1000_write_phy_reg_hv_locked(hw, I218_ULP_CONFIG1, phy_reg);



	if ((hw->phy.type == e1000_phy_i217) && (hw->phy.revision == 6) &&

	    to_sx && (er32(STATUS) & E1000_STATUS_LU)) {

		ret_val = e1000_write_phy_reg_hv_locked(hw, HV_OEM_BITS,

							oem_reg);

		if (ret_val)

			goto release;

	}



release:

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

out:
@@ -1379,16 +1400,20 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw) 
	if (((hw->mac.type == e1000_pch2lan) ||

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

	     (hw->mac.type == e1000_pch_spt)) && link) {

		u32 reg;

		u16 speed, duplex;



		reg = er32(STATUS);

		e1000e_get_speed_and_duplex_copper(hw, &speed, &duplex);

		tipg_reg = er32(TIPG);

		tipg_reg &= ~E1000_TIPG_IPGT_MASK;



		if (!(reg & (E1000_STATUS_FD | E1000_STATUS_SPEED_MASK))) {

		if (duplex == HALF_DUPLEX && speed == SPEED_10) {

			tipg_reg |= 0xFF;

			/* Reduce Rx latency in analog PHY */

			emi_val = 0;

		} else if (hw->mac.type == e1000_pch_spt &&

			   duplex == FULL_DUPLEX && speed != SPEED_1000) {

			tipg_reg |= 0xC;

			emi_val = 1;

		} else {



			/* Roll back the default values */
@@ -1412,14 +1437,59 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw) 


		if (ret_val)

			return ret_val;



		if (hw->mac.type == e1000_pch_spt) {

			u16 data;

			u16 ptr_gap;



			if (speed == SPEED_1000) {

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

				if (ret_val)

					return ret_val;



				ret_val = e1e_rphy_locked(hw,

							  PHY_REG(776, 20),

							  &data);

				if (ret_val) {

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

					return ret_val;

				}



				ptr_gap = (data & (0x3FF << 2)) >> 2;

				if (ptr_gap < 0x18) {

					data &= ~(0x3FF << 2);

					data |= (0x18 << 2);

					ret_val =

					    e1e_wphy_locked(hw,

							    PHY_REG(776, 20),

							    data);

				}

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

				if (ret_val)

					return ret_val;

			}

		}

	}



	/* I217 Packet Loss issue:

	 * ensure that FEXTNVM4 Beacon Duration is set correctly

	 * on power up.

	 * Set the Beacon Duration for I217 to 8 usec

	 */

	if ((hw->mac.type == e1000_pch_lpt) || (hw->mac.type == e1000_pch_spt)) {

		u32 mac_reg;



		mac_reg = er32(FEXTNVM4);

		mac_reg &= ~E1000_FEXTNVM4_BEACON_DURATION_MASK;

		mac_reg |= E1000_FEXTNVM4_BEACON_DURATION_8USEC;

		ew32(FEXTNVM4, mac_reg);

	}



	/* Work-around I218 hang issue */

	if ((hw->adapter->pdev->device == E1000_DEV_ID_PCH_LPTLP_I218_LM) ||

	    (hw->adapter->pdev->device == E1000_DEV_ID_PCH_LPTLP_I218_V) ||

	    (hw->adapter->pdev->device == E1000_DEV_ID_PCH_I218_LM3) ||

	    (hw->adapter->pdev->device == E1000_DEV_ID_PCH_I218_V3) ||

	    (hw->mac.type == e1000_pch_spt)) {

	    (hw->adapter->pdev->device == E1000_DEV_ID_PCH_I218_V3)) {

		ret_val = e1000_k1_workaround_lpt_lp(hw, link);

		if (ret_val)

			return ret_val;

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

+34 −4
Original line number Diff line number Diff line
@@ -6354,13 +6354,14 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime) 
}



/**

 * e1000e_disable_aspm - Disable ASPM states

 * __e1000e_disable_aspm - Disable ASPM states

 * @pdev: pointer to PCI device struct

 * @state: bit-mask of ASPM states to disable

 * @locked: indication if this context holds pci_bus_sem locked.

 *

 * Some devices *must* have certain ASPM states disabled per hardware errata.

 **/

static void e1000e_disable_aspm(struct pci_dev *pdev, u16 state)

static void __e1000e_disable_aspm(struct pci_dev *pdev, u16 state, int locked)

{

	struct pci_dev *parent = pdev->bus->self;

	u16 aspm_dis_mask = 0;
@@ -6399,7 +6400,10 @@ static void e1000e_disable_aspm(struct pci_dev *pdev, u16 state) 
		 "L1" : "");



#ifdef CONFIG_PCIEASPM

	if (locked)

		pci_disable_link_state_locked(pdev, state);

	else

		pci_disable_link_state(pdev, state);



	/* Double-check ASPM control.  If not disabled by the above, the

	 * BIOS is preventing that from happening (or CONFIG_PCIEASPM is
@@ -6422,6 +6426,32 @@ static void e1000e_disable_aspm(struct pci_dev *pdev, u16 state) 
					   aspm_dis_mask);

}



/**

 * e1000e_disable_aspm - Disable ASPM states.

 * @pdev: pointer to PCI device struct

 * @state: bit-mask of ASPM states to disable

 *

 * This function acquires the pci_bus_sem!

 * Some devices *must* have certain ASPM states disabled per hardware errata.

 **/

static void e1000e_disable_aspm(struct pci_dev *pdev, u16 state)

{

	__e1000e_disable_aspm(pdev, state, 0);

}



/**

 * e1000e_disable_aspm_locked   Disable ASPM states.

 * @pdev: pointer to PCI device struct

 * @state: bit-mask of ASPM states to disable

 *

 * This function must be called with pci_bus_sem acquired!

 * Some devices *must* have certain ASPM states disabled per hardware errata.

 **/

static void e1000e_disable_aspm_locked(struct pci_dev *pdev, u16 state)

{

	__e1000e_disable_aspm(pdev, state, 1);

}



#ifdef CONFIG_PM

static int __e1000_resume(struct pci_dev *pdev)

{
@@ -6435,7 +6465,7 @@ static int __e1000_resume(struct pci_dev *pdev) 
	if (adapter->flags2 & FLAG2_DISABLE_ASPM_L1)

		aspm_disable_flag |= PCIE_LINK_STATE_L1;

	if (aspm_disable_flag)

		e1000e_disable_aspm(pdev, aspm_disable_flag);

		e1000e_disable_aspm_locked(pdev, aspm_disable_flag);



	pci_set_master(pdev);

drivers/net/ethernet/intel/i40evf/i40e_txrx.c

+4 −0
Original line number Diff line number Diff line
@@ -484,6 +484,8 @@ int i40evf_setup_tx_descriptors(struct i40e_ring *tx_ring) 
	if (!dev)

		return -ENOMEM;



	/* warn if we are about to overwrite the pointer */

	WARN_ON(tx_ring->tx_bi);

	bi_size = sizeof(struct i40e_tx_buffer) * tx_ring->count;

	tx_ring->tx_bi = kzalloc(bi_size, GFP_KERNEL);

	if (!tx_ring->tx_bi)
@@ -644,6 +646,8 @@ int i40evf_setup_rx_descriptors(struct i40e_ring *rx_ring) 
	struct device *dev = rx_ring->dev;

	int bi_size;



	/* warn if we are about to overwrite the pointer */

	WARN_ON(rx_ring->rx_bi);

	bi_size = sizeof(struct i40e_rx_buffer) * rx_ring->count;

	rx_ring->rx_bi = kzalloc(bi_size, GFP_KERNEL);

	if (!rx_ring->rx_bi)

drivers/net/ethernet/intel/i40evf/i40evf.h

+0 −1
Original line number Diff line number Diff line
@@ -264,7 +264,6 @@ extern const char i40evf_driver_version[]; 


int i40evf_up(struct i40evf_adapter *adapter);

void i40evf_down(struct i40evf_adapter *adapter);

void i40evf_reinit_locked(struct i40evf_adapter *adapter);

void i40evf_reset(struct i40evf_adapter *adapter);

void i40evf_set_ethtool_ops(struct net_device *netdev);

void i40evf_update_stats(struct i40evf_adapter *adapter);

drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c

+4 −2
Original line number Diff line number Diff line
@@ -267,8 +267,10 @@ static int i40evf_set_ringparam(struct net_device *netdev, 
	adapter->tx_desc_count = new_tx_count;

	adapter->rx_desc_count = new_rx_count;



	if (netif_running(netdev))

		i40evf_reinit_locked(adapter);

	if (netif_running(netdev)) {

		adapter->flags |= I40EVF_FLAG_RESET_NEEDED;

		schedule_work(&adapter->reset_task);

	}



	return 0;

}