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

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

Merge branch 'intel' 



Jeff Kirsher says:

====================
This series contains updates to e1000e only.

All three patches come from Konstantin Khlebnikov to resolve power
management issues.  The first patch removes redundant and unbalanced
pci_disable_device() from the shutdown function.  The second patch
removes redundant actions from the driver and fixes the interaction
with actions in pci-bus runtime power management code.  The third
and last patch fixes some messages like 'Error reading PHY register'
and 'Hardware Erorr' and saves several seconds on reboot.
====================

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

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

+13 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <linux/delay.h>

#include <linux/vmalloc.h>

#include <linux/mdio.h>

#include <linux/pm_runtime.h>



#include "e1000.h"
@@ -2229,7 +2230,19 @@ static int e1000e_get_ts_info(struct net_device *netdev, 
	return 0;

}



static int e1000e_ethtool_begin(struct net_device *netdev)

{

	return pm_runtime_get_sync(netdev->dev.parent);

}



static void e1000e_ethtool_complete(struct net_device *netdev)

{

	pm_runtime_put_sync(netdev->dev.parent);

}



static const struct ethtool_ops e1000_ethtool_ops = {

	.begin			= e1000e_ethtool_begin,

	.complete		= e1000e_ethtool_complete,

	.get_settings		= e1000_get_settings,

	.set_settings		= e1000_set_settings,

	.get_drvinfo		= e1000_get_drvinfo,

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

+21 −61
Original line number Diff line number Diff line
@@ -4303,6 +4303,7 @@ static int e1000_open(struct net_device *netdev) 
	netif_start_queue(netdev);



	adapter->idle_check = true;

	hw->mac.get_link_status = true;

	pm_runtime_put(&pdev->dev);



	/* fire a link status change interrupt to start the watchdog */
@@ -4662,6 +4663,7 @@ static void e1000_phy_read_status(struct e1000_adapter *adapter) 
	    (adapter->hw.phy.media_type == e1000_media_type_copper)) {

		int ret_val;



		pm_runtime_get_sync(&adapter->pdev->dev);

		ret_val = e1e_rphy(hw, MII_BMCR, &phy->bmcr);

		ret_val |= e1e_rphy(hw, MII_BMSR, &phy->bmsr);

		ret_val |= e1e_rphy(hw, MII_ADVERTISE, &phy->advertise);
@@ -4672,6 +4674,7 @@ static void e1000_phy_read_status(struct e1000_adapter *adapter) 
		ret_val |= e1e_rphy(hw, MII_ESTATUS, &phy->estatus);

		if (ret_val)

			e_warn("Error reading PHY register\n");

		pm_runtime_put_sync(&adapter->pdev->dev);

	} else {

		/* Do not read PHY registers if link is not up

		 * Set values to typical power-on defaults
@@ -5887,8 +5890,7 @@ static int e1000_init_phy_wakeup(struct e1000_adapter *adapter, u32 wufc) 
	return retval;

}



static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake,

			    bool runtime)

static int __e1000_shutdown(struct pci_dev *pdev, bool runtime)

{

	struct net_device *netdev = pci_get_drvdata(pdev);

	struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -5912,10 +5914,6 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake, 
	}

	e1000e_reset_interrupt_capability(adapter);



	retval = pci_save_state(pdev);

	if (retval)

		return retval;



	status = er32(STATUS);

	if (status & E1000_STATUS_LU)

		wufc &= ~E1000_WUFC_LNKC;
@@ -5971,13 +5969,6 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake, 
		ew32(WUFC, 0);

	}



	*enable_wake = !!wufc;



	/* make sure adapter isn't asleep if manageability is enabled */

	if ((adapter->flags & FLAG_MNG_PT_ENABLED) ||

	    (hw->mac.ops.check_mng_mode(hw)))

		*enable_wake = true;



	if (adapter->hw.phy.type == e1000_phy_igp_3)

		e1000e_igp3_phy_powerdown_workaround_ich8lan(&adapter->hw);
@@ -5986,27 +5977,7 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake, 
	 */

	e1000e_release_hw_control(adapter);



	pci_disable_device(pdev);



	return 0;

}



static void e1000_power_off(struct pci_dev *pdev, bool sleep, bool wake)

{

	if (sleep && wake) {

		pci_prepare_to_sleep(pdev);

		return;

	}



	pci_wake_from_d3(pdev, wake);

	pci_set_power_state(pdev, PCI_D3hot);

}



static void e1000_complete_shutdown(struct pci_dev *pdev, bool sleep,

                                    bool wake)

{

	struct net_device *netdev = pci_get_drvdata(pdev);

	struct e1000_adapter *adapter = netdev_priv(netdev);

	pci_clear_master(pdev);



	/* The pci-e switch on some quad port adapters will report a

	 * correctable error when the MAC transitions from D0 to D3.  To
@@ -6021,12 +5992,13 @@ static void e1000_complete_shutdown(struct pci_dev *pdev, bool sleep, 
		pcie_capability_write_word(us_dev, PCI_EXP_DEVCTL,

					   (devctl & ~PCI_EXP_DEVCTL_CERE));



		e1000_power_off(pdev, sleep, wake);

		pci_save_state(pdev);

		pci_prepare_to_sleep(pdev);



		pcie_capability_write_word(us_dev, PCI_EXP_DEVCTL, devctl);

	} else {

		e1000_power_off(pdev, sleep, wake);

	}



	return 0;

}



#ifdef CONFIG_PCIEASPM
@@ -6084,9 +6056,7 @@ static int __e1000_resume(struct pci_dev *pdev) 
	if (aspm_disable_flag)

		e1000e_disable_aspm(pdev, aspm_disable_flag);



	pci_set_power_state(pdev, PCI_D0);

	pci_restore_state(pdev);

	pci_save_state(pdev);

	pci_set_master(pdev);



	e1000e_set_interrupt_capability(adapter);

	if (netif_running(netdev)) {
@@ -6152,14 +6122,8 @@ static int __e1000_resume(struct pci_dev *pdev) 
static int e1000_suspend(struct device *dev)

{

	struct pci_dev *pdev = to_pci_dev(dev);

	int retval;

	bool wake;



	retval = __e1000_shutdown(pdev, &wake, false);

	if (!retval)

		e1000_complete_shutdown(pdev, true, wake);



	return retval;

	return __e1000_shutdown(pdev, false);

}



static int e1000_resume(struct device *dev)
@@ -6182,13 +6146,10 @@ static int e1000_runtime_suspend(struct device *dev) 
	struct net_device *netdev = pci_get_drvdata(pdev);

	struct e1000_adapter *adapter = netdev_priv(netdev);



	if (e1000e_pm_ready(adapter)) {

		bool wake;



		__e1000_shutdown(pdev, &wake, true);

	}



	if (!e1000e_pm_ready(adapter))

		return 0;



	return __e1000_shutdown(pdev, true);

}



static int e1000_idle(struct device *dev)
@@ -6226,12 +6187,7 @@ static int e1000_runtime_resume(struct device *dev) 


static void e1000_shutdown(struct pci_dev *pdev)

{

	bool wake = false;



	__e1000_shutdown(pdev, &wake, false);



	if (system_state == SYSTEM_POWER_OFF)

		e1000_complete_shutdown(pdev, false, wake);

	__e1000_shutdown(pdev, false);

}



#ifdef CONFIG_NET_POLL_CONTROLLER
@@ -6352,9 +6308,9 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev) 
			"Cannot re-enable PCI device after reset.\n");

		result = PCI_ERS_RESULT_DISCONNECT;

	} else {

		pci_set_master(pdev);

		pdev->state_saved = true;

		pci_restore_state(pdev);

		pci_set_master(pdev);



		pci_enable_wake(pdev, PCI_D3hot, 0);

		pci_enable_wake(pdev, PCI_D3cold, 0);
@@ -6783,7 +6739,11 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	/* initialize the wol settings based on the eeprom settings */

	adapter->wol = adapter->eeprom_wol;

	device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);



	/* make sure adapter isn't asleep if manageability is enabled */

	if (adapter->wol || (adapter->flags & FLAG_MNG_PT_ENABLED) ||

	    (hw->mac.ops.check_mng_mode(hw)))

		device_wakeup_enable(&pdev->dev);



	/* save off EEPROM version number */

	e1000_read_nvm(&adapter->hw, 5, 1, &adapter->eeprom_vers);