Cleanup pm operations

[jme.git] / jme.c

diff --git a/jme.c b/jme.c
index b07d889573c9334b0278de46bbbf5d56135c490f..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,9 +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);
-       pci_enable_wake(jme->pdev, PCI_D0, false);
+       jwrite32(jme, JME_PMCS, PMCS_STMASK | jme->reg_pmcs);
 }
 
 static int
@@ -962,8 +973,34 @@ jme_disable_rx_engine(struct jme_adapter *jme)
        jme_mac_rxclk_off(jme);
 }
 
+static u16
+jme_udpsum(struct sk_buff *skb)
+{
+       u16 csum = 0xFFFFu;
+
+       if (skb->len < (ETH_HLEN + sizeof(struct iphdr)))
+               return csum;
+       if (skb->protocol != htons(ETH_P_IP))
+               return csum;
+       skb_set_network_header(skb, ETH_HLEN);
+       if ((ip_hdr(skb)->protocol != IPPROTO_UDP) ||
+           (skb->len < (ETH_HLEN +
+                       (ip_hdr(skb)->ihl << 2) +
+                       sizeof(struct udphdr)))) {
+               skb_reset_network_header(skb);
+               return csum;
+       }
+       skb_set_transport_header(skb,
+                       ETH_HLEN + (ip_hdr(skb)->ihl << 2));
+       csum = udp_hdr(skb)->check;
+       skb_reset_transport_header(skb);
+       skb_reset_network_header(skb);
+
+       return csum;
+}
+
 static int
-jme_rxsum_ok(struct jme_adapter *jme, u16 flags)
+jme_rxsum_ok(struct jme_adapter *jme, u16 flags, struct sk_buff *skb)
 {
        if (!(flags & (RXWBFLAG_TCPON | RXWBFLAG_UDPON | RXWBFLAG_IPV4)))
                return false;
@@ -976,7 +1013,7 @@ jme_rxsum_ok(struct jme_adapter *jme, u16 flags)
        }
 
        if (unlikely((flags & (RXWBFLAG_MF | RXWBFLAG_UDPON | RXWBFLAG_UDPCS))
-                       == RXWBFLAG_UDPON)) {
+                       == RXWBFLAG_UDPON) && jme_udpsum(skb)) {
                if (flags & RXWBFLAG_IPV4)
                        netif_err(jme, rx_err, jme->dev, "UDP Checksum error\n");
                return false;
@@ -1024,10 +1061,10 @@ jme_alloc_and_feed_skb(struct jme_adapter *jme, int idx)
                skb_put(skb, framesize);
                skb->protocol = eth_type_trans(skb, jme->dev);
 
-               if (jme_rxsum_ok(jme, le16_to_cpu(rxdesc->descwb.flags)))
+               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);
@@ -1817,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);
        }
@@ -2604,6 +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));
+#endif
        return 0;
 }
 
@@ -2627,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;
 
        /*
@@ -3205,8 +3247,20 @@ 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);
+#else
+       jme->pcirev = pdev->revision;
+#endif
        if (!jme->fpgaver)
                jme_phy_init(jme);
        jme_phy_off(jme);
@@ -3286,17 +3340,35 @@ 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
+#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
 {
+#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);
 
@@ -3328,26 +3400,34 @@ jme_suspend(struct pci_dev *pdev, pm_message_t state)
        tasklet_hi_enable(&jme->rxclean_task);
        tasklet_hi_enable(&jme->rxempty_task);
 
-       pci_save_state(pdev);
        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);
-#endif
+#ifndef JME_NEW_PM_API
+       pci_save_state(pdev);
+       jme_pci_wakeup_enable(jme, !!(jme->reg_pmcs));
        pci_set_power_state(pdev, PCI_D3hot);
+#endif
 
        return 0;
 }
 
 static int
+#ifdef JME_NEW_PM_API
+jme_resume(struct device *dev)
+#else
 jme_resume(struct pci_dev *pdev)
+#endif
 {
+#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);
+#ifndef JME_NEW_PM_API
+       pci_set_power_state(pdev, PCI_D0);
        pci_restore_state(pdev);
+#endif
 
        jme_phy_on(jme);
        if (test_bit(JME_FLAG_SSET, &jme->flags))
@@ -3364,6 +3444,17 @@ jme_resume(struct pci_dev *pdev)
 
        return 0;
 }
+
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,38)
+static SIMPLE_DEV_PM_OPS(jme_pm_ops, jme_suspend, jme_resume);
+#define JME_PM_OPS (&jme_pm_ops)
+#endif
+
+#else
+
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,38)
+#define JME_PM_OPS NULL
+#endif
 #endif
 
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,24)
@@ -3381,11 +3472,13 @@ static struct pci_driver jme_driver = {
        .id_table       = jme_pci_tbl,
        .probe          = jme_init_one,
        .remove         = __devexit_p(jme_remove_one),
-#ifdef CONFIG_PM
-       .suspend        = jme_suspend,
-       .resume         = jme_resume,
-#endif /* CONFIG_PM */
        .shutdown       = jme_shutdown,
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,38)
+       .suspend        = jme_suspend,
+       .resume         = jme_resume
+#else
+       .driver.pm      = JME_PM_OPS,
+#endif
 };
 
 static int __init