Cleanup pm operations

[jme.git] / jme.c

diff --git a/jme.c b/jme.c
index 3eb01a559309cb27ec6f2b938cde8b459cfb3c5a..8d27f2730bcebcec5119db6b76e66c969ee1b032 100644 (file)
--- 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
@@ -1057,7 +1064,7 @@ jme_alloc_and_feed_skb(struct jme_adapter *jme, int idx)
                if (jme_rxsum_ok(jme, le16_to_cpu(rxdesc->descwb.flags), skb))
                        skb->ip_summed = CHECKSUM_UNNECESSARY;
                else
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,35)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,36)
                        skb->ip_summed = CHECKSUM_NONE;
 #else
                        skb_checksum_none_assert(skb);
@@ -1847,11 +1854,9 @@ jme_powersave_phy(struct jme_adapter *jme)
 {
        if (jme->reg_pmcs) {
                jme_set_100m_half(jme);
-
                if (jme->reg_pmcs & (PMCS_LFEN | PMCS_LREN))
                        jme_wait_link(jme);
-
-               jwrite32(jme, JME_PMCS, jme->reg_pmcs);
+               jme_clear_pm(jme);
        } else {
                jme_phy_off(jme);
        }
@@ -2634,10 +2639,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;
 }
 
@@ -2661,7 +2668,8 @@ jme_set_settings(struct net_device *netdev,
        struct jme_adapter *jme = netdev_priv(netdev);
        int rc, fdc = 0;
 
-       if (ecmd->speed == SPEED_1000 && ecmd->autoneg != AUTONEG_ENABLE)
+       if (ethtool_cmd_speed(ecmd) == SPEED_1000
+           && ecmd->autoneg != AUTONEG_ENABLE)
                return -EINVAL;
 
        /*
@@ -3239,6 +3247,14 @@ jme_init_one(struct pci_dev *pdev,
        jme->mii_if.mdio_write = jme_mdio_write;
 
        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
+
        jme_set_phyfifo_5level(jme);
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,22)
        pci_read_config_byte(pdev, PCI_REVISION_ID, &jme->pcirev);
@@ -3324,22 +3340,33 @@ jme_shutdown(struct pci_dev *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);
+#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));
 #endif
 }
 
-#ifdef CONFIG_PM
-static int
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,38)
-jme_suspend(struct pci_dev *pdev, pm_message_t state)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
+       #ifdef CONFIG_PM
+               #define JME_HAVE_PM
+       #endif
 #else
+       #ifdef CONFIG_PM_SLEEP
+               #define JME_HAVE_PM
+       #endif
+#endif
+
+#ifdef JME_HAVE_PM
+static int
+#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);
@@ -3374,13 +3401,9 @@ 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, !!(jme->reg_pmcs));
        pci_set_power_state(pdev, PCI_D3hot);
 #endif
 
@@ -3388,20 +3411,21 @@ jme_suspend(struct device *dev)
 }
 
 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