MODULE_PARM_DESC(no_extplug,
"Do not use external plug signal for pseudo hot-plug.");
+#ifndef JME_NEW_PM_API
+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
+}
+#endif
+
static int
jme_mdio_read(struct net_device *netdev, int phy, int reg)
{
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
struct jme_ring *rxring = &(jme->rxring[0]);
struct jme_buffer_info *rxbi = rxring->bufinf + i;
struct sk_buff *skb;
+ dma_addr_t mapping;
skb = netdev_alloc_skb(jme->dev,
jme->dev->mtu + RX_EXTRA_LEN);
skb->dev = jme->dev;
#endif
+ mapping = pci_map_page(jme->pdev, virt_to_page(skb->data),
+ offset_in_page(skb->data), skb_tailroom(skb),
+ PCI_DMA_FROMDEVICE);
+ if (unlikely(pci_dma_mapping_error(jme->pdev, mapping))) {
+ dev_kfree_skb(skb);
+ return -ENOMEM;
+ }
+
+ if (likely(rxbi->mapping))
+ pci_unmap_page(jme->pdev, rxbi->mapping,
+ rxbi->len, PCI_DMA_FROMDEVICE);
+
rxbi->skb = skb;
rxbi->len = skb_tailroom(skb);
- rxbi->mapping = pci_map_page(jme->pdev,
- virt_to_page(skb->data),
- offset_in_page(skb->data),
- rxbi->len,
- PCI_DMA_FROMDEVICE);
-
+ rxbi->mapping = mapping;
return 0;
}
jme_udpsum(struct sk_buff *skb)
{
u16 csum = 0xFFFFu;
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,21)
+ struct iphdr *iph;
+ int iphlen;
+ struct udphdr *udph;
+#endif
if (skb->len < (ETH_HLEN + sizeof(struct iphdr)))
return csum;
if (skb->protocol != htons(ETH_P_IP))
return csum;
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,21)
+ iph = (struct iphdr *)skb_pull(skb, ETH_HLEN);
+ iphlen = (iph->ihl << 2);
+ if ((iph->protocol != IPPROTO_UDP) ||
+ (skb->len < (iphlen + sizeof(struct udphdr)))) {
+ skb_push(skb, ETH_HLEN);
+ return csum;
+ }
+ udph = (struct udphdr *)skb_pull(skb, iphlen);
+ csum = udph->check;
+ skb_push(skb, iphlen);
+ skb_push(skb, ETH_HLEN);
+#else
skb_set_network_header(skb, ETH_HLEN);
if ((ip_hdr(skb)->protocol != IPPROTO_UDP) ||
(skb->len < (ETH_HLEN +
csum = udp_hdr(skb)->check;
skb_reset_transport_header(skb);
skb_reset_network_header(skb);
+#endif
return csum;
}
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);
{
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);
}
(jiffies - txbi->start_xmit) >= TX_TIMEOUT &&
txbi->skb)) {
netif_stop_queue(jme->dev);
- netif_info(jme, tx_queued, jme->dev, "TX Queue Stopped %d@%lu\n", idx, jiffies);
+ netif_info(jme, tx_queued, jme->dev,
+ "TX Queue Stopped %d@%lu\n", idx, jiffies);
}
}
jme->reg_pmcs |= PMCS_MFEN;
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;
}
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;
/*
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(&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);
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);
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))
return 0;
}
+
+#ifdef JME_NEW_PM_API
+static SIMPLE_DEV_PM_OPS(jme_pm_ops, jme_suspend, jme_resume);
+#define JME_PM_OPS (&jme_pm_ops)
+#endif
+
+#else
+
+#ifdef JME_NEW_PM_API
+#define JME_PM_OPS NULL
+#endif
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,24)
.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,
+#ifndef JME_NEW_PM_API
+ .suspend = jme_suspend,
+ .resume = jme_resume
+#else
+ .driver.pm = JME_PM_OPS,
+#endif
};
static int __init
git://bbs.cooldavid.org / jme.git / blobdiff