summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
614c0bf)
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.
MODULE_PARM_DESC(no_extplug,
"Do not use external plug signal for pseudo hot-plug.");
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)
{
static int
jme_mdio_read(struct net_device *netdev, int phy, int reg)
{
static inline void
jme_clear_pm(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);
jwrite32(jme, JME_PMCS, jme->reg_pmcs);
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)
#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));
set_bit(JME_FLAG_TXCSUM, &jme->flags);
set_bit(JME_FLAG_TSO, &jme->flags);
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
*/
/*
* Get Max Read Req Size from PCI Config Space
*/
jme->mii_if.mdio_read = jme_mdio_read;
jme->mii_if.mdio_write = jme_mdio_write;
jme->mii_if.mdio_read = jme_mdio_read;
jme->mii_if.mdio_write = jme_mdio_write;
jme_set_phyfifo_5level(jme);
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,22)
pci_read_config_byte(pdev, PCI_REVISION_ID, &jme->pcirev);
jme_set_phyfifo_5level(jme);
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,22)
pci_read_config_byte(pdev, PCI_REVISION_ID, &jme->pcirev);
struct net_device *netdev = pci_get_drvdata(pdev);
struct jme_adapter *jme = netdev_priv(netdev);
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);
+ } else {
+ jme_phy_off(jme);
+ }
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
#ifdef JME_HAVE_PM
static int
#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
jme_suspend(struct device *dev)
jme_suspend(struct device *dev)
+#else
+jme_suspend(struct pci_dev *pdev, pm_message_t state)
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,38)
struct pci_dev *pdev = to_pci_dev(dev);
#endif
struct net_device *netdev = pci_get_drvdata(pdev);
struct pci_dev *pdev = to_pci_dev(dev);
#endif
struct net_device *netdev = pci_get_drvdata(pdev);
tasklet_hi_enable(&jme->rxempty_task);
jme_powersave_phy(jme);
tasklet_hi_enable(&jme->rxempty_task);
jme_powersave_phy(jme);
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,38)
-#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
pci_set_power_state(pdev, PCI_D3hot);
#endif
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,38)
-jme_resume(struct pci_dev *pdev)
-#else
jme_resume(struct device *dev)
jme_resume(struct device *dev)
+#else
+jme_resume(struct pci_dev *pdev)
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,38)
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);
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
pci_restore_state(pdev);
#endif
__napi_schedule(&priv->napi);
#endif
__napi_schedule(&priv->napi);
#endif
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,38)
+#define JME_NEW_PM_API
+#endif
+
/*
* Jmac Adapter Private data
*/
/*
* Jmac Adapter Private data
*/
* Power management control and status register
*/
enum jme_pmcs_bit_masks {
* Power management control and status register
*/
enum jme_pmcs_bit_masks {
+ PMCS_STMASK = 0xFFFF0000,
PMCS_WF7DET = 0x80000000,
PMCS_WF6DET = 0x40000000,
PMCS_WF5DET = 0x20000000,
PMCS_WF7DET = 0x80000000,
PMCS_WF6DET = 0x40000000,
PMCS_WF5DET = 0x20000000,
PMCS_LFDET = 0x00040000,
PMCS_LRDET = 0x00020000,
PMCS_MFDET = 0x00010000,
PMCS_LFDET = 0x00040000,
PMCS_LRDET = 0x00020000,
PMCS_MFDET = 0x00010000,
+ PMCS_ENMASK = 0x0000FFFF,
PMCS_WF7EN = 0x00008000,
PMCS_WF6EN = 0x00004000,
PMCS_WF5EN = 0x00002000,
PMCS_WF7EN = 0x00008000,
PMCS_WF6EN = 0x00004000,
PMCS_WF5EN = 0x00002000,