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

Commit ba779198 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/net-queue 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2018-01-02

This series contains fixes for e1000 and e1000e.

Tushar Dave adds a check to the driver so that it won't attempt to disable a
device that is already disabled for e1000.

Benjamin Poirier provides a fix to e1000e, where a previous commit that
Benjamin submitted changed the meaning of the return value for
"check_for_link" for copper media and not all the instances were properly
updated.  Benjamin fixes the remaining instances that needed the change.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c0955087 4110e02e

drivers/net/ethernet/intel/e1000/e1000.h

+2 −1
Original line number Diff line number Diff line
@@ -331,7 +331,8 @@ struct e1000_adapter { 
enum e1000_state_t {

	__E1000_TESTING,

	__E1000_RESETTING,

	__E1000_DOWN

	__E1000_DOWN,

	__E1000_DISABLED

};



#undef pr_fmt

drivers/net/ethernet/intel/e1000/e1000_main.c

+22 −5
Original line number Diff line number Diff line
@@ -945,7 +945,7 @@ static int e1000_init_hw_struct(struct e1000_adapter *adapter, 
static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	struct net_device *netdev;

	struct e1000_adapter *adapter;

	struct e1000_adapter *adapter = NULL;

	struct e1000_hw *hw;



	static int cards_found;
@@ -955,6 +955,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	u16 tmp = 0;

	u16 eeprom_apme_mask = E1000_EEPROM_APME;

	int bars, need_ioport;

	bool disable_dev = false;



	/* do not allocate ioport bars when not needed */

	need_ioport = e1000_is_need_ioport(pdev);
@@ -1259,10 +1260,12 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	iounmap(hw->ce4100_gbe_mdio_base_virt);

	iounmap(hw->hw_addr);

err_ioremap:

	disable_dev = !test_and_set_bit(__E1000_DISABLED, &adapter->flags);

	free_netdev(netdev);

err_alloc_etherdev:

	pci_release_selected_regions(pdev, bars);

err_pci_reg:

	if (!adapter || disable_dev)

		pci_disable_device(pdev);

	return err;

}
@@ -1281,6 +1284,7 @@ static void e1000_remove(struct pci_dev *pdev) 
	struct net_device *netdev = pci_get_drvdata(pdev);

	struct e1000_adapter *adapter = netdev_priv(netdev);

	struct e1000_hw *hw = &adapter->hw;

	bool disable_dev;



	e1000_down_and_stop(adapter);

	e1000_release_manageability(adapter);
@@ -1299,8 +1303,10 @@ static void e1000_remove(struct pci_dev *pdev) 
		iounmap(hw->flash_address);

	pci_release_selected_regions(pdev, adapter->bars);



	disable_dev = !test_and_set_bit(__E1000_DISABLED, &adapter->flags);

	free_netdev(netdev);



	if (disable_dev)

		pci_disable_device(pdev);

}
@@ -5156,6 +5162,7 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake) 
	if (netif_running(netdev))

		e1000_free_irq(adapter);



	if (!test_and_set_bit(__E1000_DISABLED, &adapter->flags))

		pci_disable_device(pdev);



	return 0;
@@ -5200,6 +5207,10 @@ static int e1000_resume(struct pci_dev *pdev) 
		pr_err("Cannot enable PCI device from suspend\n");

		return err;

	}



	/* flush memory to make sure state is correct */

	smp_mb__before_atomic();

	clear_bit(__E1000_DISABLED, &adapter->flags);

	pci_set_master(pdev);



	pci_enable_wake(pdev, PCI_D3hot, 0);
@@ -5274,6 +5285,8 @@ static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev, 


	if (netif_running(netdev))

		e1000_down(adapter);



	if (!test_and_set_bit(__E1000_DISABLED, &adapter->flags))

		pci_disable_device(pdev);



	/* Request a slot slot reset. */
@@ -5302,6 +5315,10 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev) 
		pr_err("Cannot re-enable PCI device after reset.\n");

		return PCI_ERS_RESULT_DISCONNECT;

	}



	/* flush memory to make sure state is correct */

	smp_mb__before_atomic();

	clear_bit(__E1000_DISABLED, &adapter->flags);

	pci_set_master(pdev);



	pci_enable_wake(pdev, PCI_D3hot, 0);

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

+8 −3
Original line number Diff line number Diff line
@@ -1367,6 +1367,9 @@ static s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force) 
 *  Checks to see of the link status of the hardware has changed.  If a

 *  change in link status has been detected, then we read the PHY registers

 *  to get the current speed/duplex if link exists.

 *

 *  Returns a negative error code (-E1000_ERR_*) or 0 (link down) or 1 (link

 *  up).

 **/

static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)

{
@@ -1382,7 +1385,7 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw) 
	 * Change or Rx Sequence Error interrupt.

	 */

	if (!mac->get_link_status)

		return 0;

		return 1;



	/* First we want to see if the MII Status Register reports

	 * link.  If so, then we want to get the current speed/duplex
@@ -1613,12 +1616,14 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw) 
	 * different link partner.

	 */

	ret_val = e1000e_config_fc_after_link_up(hw);

	if (ret_val)

	if (ret_val) {

		e_dbg("Error configuring flow control\n");



		return ret_val;

	}



	return 1;

}



static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter)

{

	struct e1000_hw *hw = &adapter->hw;