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

Commit 1b06e994 authored by Guo-Fu Tseng's avatar Guo-Fu Tseng Committed by Greg Kroah-Hartman
Browse files

jme: Do not enable NIC WoL functions on S0 



commit 0772a99b818079e628a1da122ac7ee023faed83e upstream.

Otherwise it might be back on resume right after going to suspend in
some hardware.

Reported-by: default avatarDiego Viola <diego.viola@gmail.com>
Signed-off-by: default avatarGuo-Fu Tseng <cooldavid@cooldavid.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c565897f

drivers/net/ethernet/jme.c

+11 −6
Original line number Diff line number Diff line
@@ -270,11 +270,17 @@ jme_reset_mac_processor(struct jme_adapter *jme) 
}



static inline void

jme_clear_pm(struct jme_adapter *jme)

jme_clear_pm_enable_wol(struct jme_adapter *jme)

{

	jwrite32(jme, JME_PMCS, PMCS_STMASK | jme->reg_pmcs);

}



static inline void

jme_clear_pm_disable_wol(struct jme_adapter *jme)

{

	jwrite32(jme, JME_PMCS, PMCS_STMASK);

}



static int

jme_reload_eeprom(struct jme_adapter *jme)

{
@@ -1853,7 +1859,7 @@ jme_open(struct net_device *netdev) 
	struct jme_adapter *jme = netdev_priv(netdev);

	int rc;



	jme_clear_pm(jme);

	jme_clear_pm_disable_wol(jme);

	JME_NAPI_ENABLE(jme);



	tasklet_init(&jme->linkch_task, jme_link_change_tasklet,
@@ -1929,7 +1935,7 @@ jme_powersave_phy(struct jme_adapter *jme) 
		jme_set_100m_half(jme);

		if (jme->reg_pmcs & (PMCS_LFEN | PMCS_LREN))

			jme_wait_link(jme);

		jme_clear_pm(jme);

		jme_clear_pm_enable_wol(jme);

	} else {

		jme_phy_off(jme);

	}
@@ -2646,7 +2652,6 @@ jme_set_wol(struct net_device *netdev, 
	if (wol->wolopts & WAKE_MAGIC)

		jme->reg_pmcs |= PMCS_MFEN;



	jwrite32(jme, JME_PMCS, jme->reg_pmcs);

	device_set_wakeup_enable(&jme->pdev->dev, !!(jme->reg_pmcs));



	return 0;
@@ -3172,7 +3177,7 @@ jme_init_one(struct pci_dev *pdev, 
	jme->mii_if.mdio_read = jme_mdio_read;

	jme->mii_if.mdio_write = jme_mdio_write;



	jme_clear_pm(jme);

	jme_clear_pm_disable_wol(jme);

	device_set_wakeup_enable(&pdev->dev, true);



	jme_set_phyfifo_5level(jme);
@@ -3304,7 +3309,7 @@ jme_resume(struct device *dev) 
	if (!netif_running(netdev))

		return 0;



	jme_clear_pm(jme);

	jme_clear_pm_disable_wol(jme);

	jme_phy_on(jme);

	if (test_bit(JME_FLAG_SSET, &jme->flags))

		jme_set_settings(netdev, &jme->old_ecmd);