From 3d12cc1b425b9e0f0fdca70c4f567ec8fa0add5c Mon Sep 17 00:00:00 2001 From: Guo-Fu Tseng Date: Tue, 28 Jun 2011 12:49:36 +0800 Subject: [PATCH] jme: Cleanup PM operations after using new PM API 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. --- jme.c | 78 ++++++++++++++++++++++++++++++++++++----------------------- jme.h | 6 +++++ 2 files changed, 54 insertions(+), 30 deletions(-) diff --git a/jme.c b/jme.c index 4fb3c50..b941494 100644 --- a/jme.c +++ b/jme.c @@ -59,6 +59,19 @@ module_param(no_extplug, int, 0); MODULE_PARM_DESC(no_extplug, "Do not use external plug signal for pseudo hot-plug."); +static void +jme_pci_wakeup_enable(struct jme_adapter *jme, int enable) +{ +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,27) + pci_enable_wake(jme->pdev, PCI_D1, enable); + pci_enable_wake(jme->pdev, PCI_D2, enable); + pci_enable_wake(jme->pdev, PCI_D3hot, enable); + pci_enable_wake(jme->pdev, PCI_D3cold, enable); +#else + pci_pme_active(jme->pdev, enable); +#endif +} + static int jme_mdio_read(struct net_device *netdev, int phy, int reg) { @@ -274,13 +287,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); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) - pci_enable_wake(jme->pdev, PCI_D0, false); -#else - device_set_wakeup_enable(&jme->pdev->dev, false); -#endif + jwrite32(jme, JME_PMCS, PMCS_STMASK | jme->reg_pmcs); } static int @@ -2634,10 +2641,12 @@ jme_set_wol(struct net_device *netdev, jwrite32(jme, JME_PMCS, jme->reg_pmcs); +#ifndef JME_NEW_PM_API + jme_pci_wakeup_enable(jme, !!(jme->reg_pmcs)); +#endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) - device_set_wakeup_enable(&jme->pdev->dev, jme->reg_pmcs); + device_set_wakeup_enable(&jme->pdev->dev, !!(jme->reg_pmcs)); #endif - return 0; } @@ -3186,6 +3195,15 @@ jme_init_one(struct pci_dev *pdev, set_bit(JME_FLAG_TXCSUM, &jme->flags); set_bit(JME_FLAG_TSO, &jme->flags); + jme_clear_pm(jme); + pci_set_power_state(jme->pdev, PCI_D0); +#ifndef JME_NEW_PM_API + jme_pci_wakeup_enable(jme, true); +#endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) + device_set_wakeup_enable(&jme->pdev->dev, true); +#endif + /* * Get Max Read Req Size from PCI Config Space */ @@ -3238,7 +3256,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); #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,22) pci_read_config_byte(pdev, PCI_REVISION_ID, &jme->pcirev); @@ -3323,12 +3340,15 @@ 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); -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,27) - pci_enable_wake(pdev, PCI_D3hot, true); -#else - pci_pme_active(pdev, true); + if (jme->reg_pmcs) { + jme_powersave_phy(jme); + jme_pci_wakeup_enable(jme, true); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) + device_set_wakeup_enable(&jme->pdev->dev, true); #endif + } else { + jme_phy_off(jme); + } } #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) @@ -3343,13 +3363,13 @@ jme_shutdown(struct pci_dev *pdev) #ifdef JME_HAVE_PM static int -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,38) -jme_suspend(struct pci_dev *pdev, pm_message_t state) -#else +#ifdef JME_NEW_PM_API jme_suspend(struct device *dev) +#else +jme_suspend(struct pci_dev *pdev, pm_message_t state) #endif { -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,38) +#ifdef JME_NEW_PM_API struct pci_dev *pdev = to_pci_dev(dev); #endif struct net_device *netdev = pci_get_drvdata(pdev); @@ -3384,34 +3404,32 @@ jme_suspend(struct device *dev) tasklet_hi_enable(&jme->rxempty_task); jme_powersave_phy(jme); -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,38) +#ifndef JME_NEW_PM_API pci_save_state(pdev); -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,27) - pci_enable_wake(pdev, PCI_D3hot, true); -#else - pci_pme_active(pdev, true); -#endif + jme_pci_wakeup_enable(jme, true); pci_set_power_state(pdev, PCI_D3hot); #endif + jme_clear_pm(jme); return 0; } static int -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,38) -jme_resume(struct pci_dev *pdev) -#else +#ifdef JME_NEW_PM_API jme_resume(struct device *dev) +#else +jme_resume(struct pci_dev *pdev) #endif { -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,38) +#ifdef JME_NEW_PM_API struct pci_dev *pdev = to_pci_dev(dev); #endif struct net_device *netdev = pci_get_drvdata(pdev); struct jme_adapter *jme = netdev_priv(netdev); jme_clear_pm(jme); -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,38) +#ifndef JME_NEW_PM_API + pci_set_power_state(pdev, PCI_D0); pci_restore_state(pdev); #endif diff --git a/jme.h b/jme.h index 34f77a1..7c07715 100644 --- a/jme.h +++ b/jme.h @@ -530,6 +530,10 @@ static inline struct tcphdr *tcp_hdr(const struct sk_buff *skb) __napi_schedule(&priv->napi); #endif +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,38) +#define JME_NEW_PM_API +#endif + /* * Jmac Adapter Private data */ @@ -993,6 +997,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, @@ -1004,6 +1009,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, -- 2.39.3