Patchwork [net-next-2.6,2/2] jme: Cleanup PM operations after using new PM API

login
register
mail settings
Submitter Guo-Fu Tseng
Date June 28, 2011, 5:23 a.m.
Message ID <1309238615-25590-2-git-send-email-cooldavid@cooldavid.org>
Download mbox | patch
Permalink /patch/102324/
State Changes Requested
Delegated to: David Miller
Headers show

Comments

Guo-Fu Tseng - June 28, 2011, 5:23 a.m.
From: Guo-Fu Tseng <cooldavid@cooldavid.org>

	1. Using enum name instead of numeric value.
	2. device_set_wakeup_enable expect bool argument
	   adding !!() to the argument to be passed.
	3. Remove non-hardware related operations from
	   jme_clear_pm()
	4. Reuse jme_clear_pm() in jme_resume()
	5. Clear wakeup event indicator bits(call jme_clear_pm())
	   before going to sleep.
	6. Check for wakeup setting while shutdown
		Turn off PHY if wakeup is not enabled.
		Power-safe PHY(lower speed) if wakeup is enabled.

Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org>
---
 drivers/net/jme.c |   31 +++++++++++++++++++------------
 drivers/net/jme.h |    2 ++
 2 files changed, 21 insertions(+), 12 deletions(-)
Guo-Fu Tseng - June 28, 2011, 11:19 a.m.
On Tue, 28 Jun 2011 13:23:35 +0800, Guo-Fu Tseng wrote
> From: Guo-Fu Tseng <cooldavid@cooldavid.org>
> 
> 	1. Using enum name instead of numeric value.
> 	2. device_set_wakeup_enable expect bool argument
> 	   adding !!() to the argument to be passed.
> 	3. Remove non-hardware related operations from
> 	   jme_clear_pm()
> 	4. Reuse jme_clear_pm() in jme_resume()
> 	5. Clear wakeup event indicator bits(call jme_clear_pm())
> 	   before going to sleep.
> 	6. Check for wakeup setting while shutdown
> 		Turn off PHY if wakeup is not enabled.
> 		Power-safe PHY(lower speed) if wakeup is enabled.
> 
> Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org>
Dear Davem:

Please ignore this patch.
I'll resend a cleaner version later.

Sorry for the inconvenience.

Guo-Fu Tseng

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/jme.c b/drivers/net/jme.c
index 2ce9339..8887e2d 100644
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
@@ -271,9 +271,7 @@  jme_reset_mac_processor(struct jme_adapter *jme)
 static inline void
 jme_clear_pm(struct jme_adapter *jme)
 {
-	jwrite32(jme, JME_PMCS, 0xFFFF0000 | jme->reg_pmcs);
-	pci_set_power_state(jme->pdev, PCI_D0);
-	device_set_wakeup_enable(&jme->pdev->dev, false);
+	jwrite32(jme, JME_PMCS, PMCS_STMASK | jme->reg_pmcs);
 }
 
 static int
@@ -2529,8 +2527,7 @@  jme_set_wol(struct net_device *netdev,
 		jme->reg_pmcs |= PMCS_MFEN;
 
 	jwrite32(jme, JME_PMCS, jme->reg_pmcs);
-
-	device_set_wakeup_enable(&jme->pdev->dev, jme->reg_pmcs);
+	device_set_wakeup_enable(&jme->pdev->dev, !!(jme->reg_pmcs));
 
 	return 0;
 }
@@ -3002,6 +2999,10 @@  jme_init_one(struct pci_dev *pdev,
 	jme->reg_pmcs = PMCS_MFEN;
 	jme->reg_gpreg1 = GPREG1_DEFAULT;
 
+	jme_clear_pm(jme);
+	pci_set_power_state(jme->pdev, PCI_D0);
+	device_set_wakeup_enable(&pdev->dev, true);
+
 	if (jme->reg_rxmcs & RXMCS_CHECKSUM)
 		netdev->features |= NETIF_F_RXCSUM;
 
@@ -3057,7 +3058,6 @@  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_set_phyfifo_5level(jme);
 	jme->pcirev = pdev->revision;
 	if (!jme->fpgaver)
@@ -3131,12 +3131,18 @@  jme_shutdown(struct pci_dev *pdev)
 	struct net_device *netdev = pci_get_drvdata(pdev);
 	struct jme_adapter *jme = netdev_priv(netdev);
 
-	jme_powersave_phy(jme);
-	pci_pme_active(pdev, true);
+	if (jme->reg_pmcs) {
+		jme_powersave_phy(jme);
+		jme_clear_pm(jme);
+		pci_pme_active(pdev, true);
+	} else {
+		jme_phy_off(jme);
+	}
 }
 
 #ifdef CONFIG_PM_SLEEP
-static int jme_suspend(struct device *dev)
+static int
+jme_suspend(struct device *dev)
 {
 	struct pci_dev *pdev = to_pci_dev(dev);
 	struct net_device *netdev = pci_get_drvdata(pdev);
@@ -3171,18 +3177,19 @@  static int jme_suspend(struct device *dev)
 	tasklet_hi_enable(&jme->rxempty_task);
 
 	jme_powersave_phy(jme);
+	jme_clear_pm(jme);
 
 	return 0;
 }
 
-static int jme_resume(struct device *dev)
+static int
+jme_resume(struct device *dev)
 {
 	struct pci_dev *pdev = to_pci_dev(dev);
 	struct net_device *netdev = pci_get_drvdata(pdev);
 	struct jme_adapter *jme = netdev_priv(netdev);
 
-	jwrite32(jme, JME_PMCS, 0xFFFF0000 | jme->reg_pmcs);
-
+	jme_clear_pm(jme);
 	jme_phy_on(jme);
 	if (test_bit(JME_FLAG_SSET, &jme->flags))
 		jme_set_settings(netdev, &jme->old_ecmd);
diff --git a/drivers/net/jme.h b/drivers/net/jme.h
index 0d5da06..1481a62 100644
--- a/drivers/net/jme.h
+++ b/drivers/net/jme.h
@@ -852,6 +852,7 @@  enum jme_ghc_txmac_clk {
  * Power management control and status register
  */
 enum jme_pmcs_bit_masks {
+	PMCS_STMASK	= 0xFFFF0000,
 	PMCS_WF7DET	= 0x80000000,
 	PMCS_WF6DET	= 0x40000000,
 	PMCS_WF5DET	= 0x20000000,
@@ -863,6 +864,7 @@  enum jme_pmcs_bit_masks {
 	PMCS_LFDET	= 0x00040000,
 	PMCS_LRDET	= 0x00020000,
 	PMCS_MFDET	= 0x00010000,
+	PMCS_ENMASK	= 0x0000FFFF,
 	PMCS_WF7EN	= 0x00008000,
 	PMCS_WF6EN	= 0x00004000,
 	PMCS_WF5EN	= 0x00002000,