X-Git-Url: http://bbs.cooldavid.org/git/?p=jme.git;a=blobdiff_plain;f=jme.c;h=986db28b1cba3d5de79c558fe1c8b5ed97b78ba2;hp=f34bcb96e883a9488c490e3ba45a79bf2dd49d7b;hb=42b1055e2e1ef3ceba54535a95780dd90b8ddf5c;hpb=79ce639c9d90abc4d30d749af2d135c20a8c419e diff --git a/jme.c b/jme.c index f34bcb9..986db28 100644 --- a/jme.c +++ b/jme.c @@ -32,13 +32,7 @@ /* * Timeline before release: - * Stage 4: Basic feature support. - * 0.7: - * - Implement Power Managemt related functions. - * * Stage 5: Advanced offloading support. - * 0.8: - * - Implement VLAN offloading. * 0.9: * - Implement scatter-gather offloading. * Use pci_map_page on scattered sk_buff for HIGHMEM support @@ -71,11 +65,13 @@ #include #include #include +#include #include #include #include #include #include +#include #include "jme.h" #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,21) @@ -180,8 +176,9 @@ jme_reset_mac_processor(struct jme_adapter *jme) __always_inline static void jme_clear_pm(struct jme_adapter *jme) { - jwrite32(jme, JME_PMCS, 0xFFFF0000); + jwrite32(jme, JME_PMCS, 0xFFFF0000 | jme->reg_pmcs); pci_set_power_state(jme->pdev, PCI_D0); + pci_enable_wake(jme->pdev, PCI_D0, false); } static int @@ -487,6 +484,15 @@ jme_tx_csum(struct sk_buff *skb, unsigned mtu, __u8 *flags) } } +__always_inline static void +jme_tx_vlan(struct sk_buff *skb, volatile __u16 *vlan, __u8 *flags) +{ + if(vlan_tx_tag_present(skb)) { + *flags |= TXFLAG_TAGON; + *vlan = vlan_tx_tag_get(skb); + } +} + static int jme_set_new_txdesc(struct jme_adapter *jme, struct sk_buff *skb) @@ -550,6 +556,7 @@ jme_set_new_txdesc(struct jme_adapter *jme, wmb(); flags = TXFLAG_OWN | TXFLAG_INT; jme_tx_csum(skb, jme->dev->mtu, &flags); + jme_tx_vlan(skb, &(ctxdesc->desc1.vlan), &flags); ctxdesc->desc1.flags = flags; /* * Set tx buffer info after telling NIC to send @@ -667,6 +674,17 @@ jme_enable_tx_engine(struct jme_adapter *jme) } +__always_inline static void +jme_restart_tx_engine(struct jme_adapter *jme) +{ + /* + * Restart TX Engine + */ + jwrite32(jme, JME_TXCS, jme->reg_txcs | + TXCS_SELECT_QUEUE0 | + TXCS_ENABLE); +} + __always_inline static void jme_disable_tx_engine(struct jme_adapter *jme) { @@ -886,14 +904,12 @@ jme_disable_rx_engine(struct jme_adapter *jme) /* * Disable RX Engine */ - val = jread32(jme, JME_RXCS); - val &= ~RXCS_ENABLE; - jwrite32(jme, JME_RXCS, val); + jwrite32(jme, JME_RXCS, jme->reg_rxcs); val = jread32(jme, JME_RXCS); for(i = JME_RX_DISABLE_TIMEOUT ; (val & RXCS_ENABLE) && i > 0 ; --i) { - mdelay(100); + mdelay(1); val = jread32(jme, JME_RXCS); } @@ -903,7 +919,7 @@ jme_disable_rx_engine(struct jme_adapter *jme) } static void -jme_alloc_and_feed_skb(struct jme_adapter *jme, int idx, int summed) +jme_alloc_and_feed_skb(struct jme_adapter *jme, int idx) { struct jme_ring *rxring = &(jme->rxring[0]); volatile struct rxdesc *rxdesc = rxring->desc; @@ -936,10 +952,19 @@ jme_alloc_and_feed_skb(struct jme_adapter *jme, int idx, int summed) skb_put(skb, framesize); skb->protocol = eth_type_trans(skb, jme->dev); - if(summed) + if((rxdesc->descwb.flags & + (RXWBFLAG_TCPON | + RXWBFLAG_UDPON | + RXWBFLAG_IPV4))) skb->ip_summed = CHECKSUM_UNNECESSARY; + else + skb->ip_summed = CHECKSUM_NONE; - netif_rx(skb); + if(jme->vlgrp && (rxdesc->descwb.flags & RXWBFLAG_TAGON)) + vlan_hwaccel_rx(skb, jme->vlgrp, + le32_to_cpu(rxdesc->descwb.vlan)); + else + netif_rx(skb); if(le16_to_cpu(rxdesc->descwb.flags) & RXWBFLAG_DEST_MUL) ++(NET_STAT(jme).multicast); @@ -1025,11 +1050,7 @@ jme_process_receive(struct jme_adapter *jme, int limit) } else { - jme_alloc_and_feed_skb(jme, i, - (rxdesc->descwb.flags & - (RXWBFLAG_TCPON | - RXWBFLAG_UDPON | - RXWBFLAG_IPV4))); + jme_alloc_and_feed_skb(jme, i); } if((i += desccnt) >= RING_DESC_NR) @@ -1095,16 +1116,26 @@ jme_start_pcc_timer(struct jme_adapter *jme) TMCSR_EN | ((0xFFFFFF - PCC_INTERVAL_US) & TMCSR_CNT)); } +static void +jme_stop_pcc_timer(struct jme_adapter *jme) +{ + jwrite32(jme, JME_TMCSR, 0); +} + static void jme_pcc_tasklet(unsigned long arg) { struct jme_adapter *jme = (struct jme_adapter*)arg; struct net_device *netdev = jme->dev; - if(netif_queue_stopped(netdev)) { - jwrite32(jme, JME_TMCSR, 0); + + if(unlikely(netif_queue_stopped(netdev) || + (atomic_read(&jme->link_changing) != 1) + )) { + jme_stop_pcc_timer(jme); return; } + jme_dynamic_pcc(jme); jme_start_pcc_timer(jme); } @@ -1120,10 +1151,10 @@ jme_link_change_tasklet(unsigned long arg) if(!atomic_dec_and_test(&jme->link_changing)) goto out; - if(jme_check_link(netdev, 1) && jme->oldmtu == netdev->mtu) + if(jme_check_link(netdev, 1) && jme->old_mtu == netdev->mtu) goto out; - jme->oldmtu = netdev->mtu; + jme->old_mtu = netdev->mtu; netif_stop_queue(netdev); while(--timeout > 0 && @@ -1136,6 +1167,7 @@ jme_link_change_tasklet(unsigned long arg) } if(netif_carrier_ok(netdev)) { + jme_stop_pcc_timer(jme); jme_reset_mac_processor(jme); jme_free_rx_resources(jme); jme_free_tx_resources(jme); @@ -1183,7 +1215,7 @@ jme_rx_clean_tasklet(unsigned long arg) if(unlikely(!atomic_dec_and_test(&jme->rx_cleaning))) goto out; - + if(unlikely(atomic_read(&jme->link_changing) != 1)) goto out; @@ -1208,6 +1240,8 @@ jme_rx_empty_tasklet(unsigned long arg) if(unlikely(netif_queue_stopped(jme->dev))) return; + queue_dbg(jme->dev->name, "RX Queue empty!\n"); + jme_rx_clean_tasklet(arg); jme_restart_rx_engine(jme); } @@ -1309,9 +1343,14 @@ jme_intr_msi(struct jme_adapter *jme, __u32 intrstat) */ jwrite32f(jme, JME_IENC, INTR_ENABLE); + /* + * Write 1 clear interrupt status + */ + jwrite32f(jme, JME_IEVE, intrstat); + if(intrstat & (INTR_LINKCH | INTR_SWINTR)) { tasklet_schedule(&jme->linkch_task); - goto out_deassert; + goto out_reenable; } if(intrstat & INTR_TMINTR) @@ -1333,12 +1372,7 @@ jme_intr_msi(struct jme_adapter *jme, __u32 intrstat) */ } -out_deassert: - /* - * Deassert interrupts - */ - jwrite32f(jme, JME_IEVE, intrstat); - +out_reenable: /* * Re-enable interrupt */ @@ -1352,7 +1386,6 @@ jme_intr(int irq, void *dev_id) { struct net_device *netdev = dev_id; struct jme_adapter *jme = netdev_priv(netdev); - irqreturn_t rc = IRQ_HANDLED; __u32 intrstat; intrstat = jread32(jme, JME_IEVE); @@ -1360,35 +1393,18 @@ jme_intr(int irq, void *dev_id) /* * Check if it's really an interrupt for us */ - if(unlikely(intrstat == 0)) { - rc = IRQ_NONE; - goto out; - } + if(unlikely(intrstat == 0)) + return IRQ_NONE; /* * Check if the device still exist */ - if(unlikely(intrstat == ~((typeof(intrstat))0))) { - rc = IRQ_NONE; - goto out; - } - - /* - * Allow one interrupt handling at a time - */ - if(unlikely(!atomic_dec_and_test(&jme->intr_sem))) - goto out_inc; + if(unlikely(intrstat == ~((typeof(intrstat))0))) + return IRQ_NONE; jme_intr_msi(jme, intrstat); -out_inc: - /* - * Enable next interrupt handling - */ - atomic_inc(&jme->intr_sem); - -out: - return rc; + return IRQ_HANDLED; } static irqreturn_t @@ -1449,8 +1465,7 @@ jme_request_irq(struct jme_adapter *jme) if(rc) { jeprintk(netdev->name, "Unable to allocate %s interrupt (return: %d)\n", - jme->flags & JME_FLAG_MSI ? "MSI":"INTx", - rc); + jme->flags & JME_FLAG_MSI ? "MSI":"INTx", rc); if(jme->flags & JME_FLAG_MSI) { pci_disable_msi(jme->pdev); @@ -1496,6 +1511,7 @@ jme_open(struct net_device *netdev) goto err_out; } + jme_clear_pm(jme); jme_reset_mac_processor(jme); rc = jme_request_irq(jme); @@ -1504,7 +1520,13 @@ jme_open(struct net_device *netdev) jme_enable_shadow(jme); jme_start_irq(jme); - jme_restart_an(jme); + + if(jme->flags & JME_FLAG_SSET) + jme_set_settings(netdev, &jme->old_ecmd); + else + jme_reset_phy_processor(jme); + + jme_reset_link(jme); return 0; @@ -1514,6 +1536,29 @@ err_out: return rc; } +static void +jme_set_100m_half(struct jme_adapter *jme) +{ + __u32 bmcr, tmp; + + bmcr = jme_mdio_read(jme->dev, jme->mii_if.phy_id, MII_BMCR); + tmp = bmcr & ~(BMCR_ANENABLE | BMCR_SPEED100 | + BMCR_SPEED1000 | BMCR_FULLDPLX); + tmp |= BMCR_SPEED100; + + if (bmcr != tmp) + jme_mdio_write(jme->dev, jme->mii_if.phy_id, MII_BMCR, tmp); + + jwrite32(jme, JME_GHC, GHC_SPEED_100M); +} + +static void +jme_phy_off(struct jme_adapter *jme) +{ + jme_mdio_write(jme->dev, jme->mii_if.phy_id, MII_BMCR, BMCR_PDOWN); +} + + static int jme_close(struct net_device *netdev) { @@ -1534,6 +1579,18 @@ jme_close(struct net_device *netdev) jme_reset_mac_processor(jme); jme_free_rx_resources(jme); jme_free_tx_resources(jme); + jme->phylink = 0; + + if(jme->reg_pmcs) { + jme_set_100m_half(jme); + pci_enable_wake(jme->pdev, PCI_D0, true); + pci_enable_wake(jme->pdev, PCI_D3hot, true); + pci_enable_wake(jme->pdev, PCI_D3cold, true); + jwrite32(jme, JME_PMCS, jme->reg_pmcs); + } + else { + jme_phy_off(jme); + } return 0; } @@ -1646,8 +1703,11 @@ jme_change_mtu(struct net_device *netdev, int new_mtu) { struct jme_adapter *jme = netdev_priv(netdev); + if(new_mtu == jme->old_mtu) + return 0; + if (((new_mtu + ETH_HLEN) > MAX_ETHERNET_JUMBO_PACKET_SIZE) || - ((new_mtu + ETH_HLEN) < MIN_ETHERNET_PACKET_SIZE)) + ((new_mtu) < IPV6_MIN_MTU)) return -EINVAL; if(new_mtu > 4000) { @@ -1683,7 +1743,16 @@ jme_tx_timeout(struct net_device *netdev) * Reset the link * And the link change will reinitiallize all RX/TX resources */ - jme_restart_an(jme); + jme->phylink = 0; + jme_reset_link(jme); +} + +static void +jme_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp) +{ + struct jme_adapter *jme = netdev_priv(netdev); + + jme->vlgrp = grp; } static void @@ -1870,6 +1939,49 @@ jme_set_pauseparam(struct net_device *netdev, return 0; } +static void +jme_get_wol(struct net_device *netdev, + struct ethtool_wolinfo *wol) +{ + struct jme_adapter *jme = netdev_priv(netdev); + + wol->supported = WAKE_MAGIC | WAKE_PHY; + + wol->wolopts = 0; + + if(jme->reg_pmcs & (PMCS_LFEN | PMCS_LREN)) + wol->wolopts |= WAKE_PHY; + + if(jme->reg_pmcs & PMCS_MFEN) + wol->wolopts |= WAKE_MAGIC; + +} + +static int +jme_set_wol(struct net_device *netdev, + struct ethtool_wolinfo *wol) +{ + struct jme_adapter *jme = netdev_priv(netdev); + + if(wol->wolopts & (WAKE_MAGICSECURE | + WAKE_UCAST | + WAKE_MCAST | + WAKE_BCAST | + WAKE_ARP)) + return -EOPNOTSUPP; + + jme->reg_pmcs = 0; + + if(wol->wolopts & WAKE_PHY) + jme->reg_pmcs |= PMCS_LFEN | PMCS_LREN; + + if(wol->wolopts & WAKE_MAGIC) + jme->reg_pmcs |= PMCS_MFEN; + + + return 0; +} + static int jme_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd) @@ -1907,6 +2019,11 @@ jme_set_settings(struct net_device *netdev, if(!rc && fdc) jme_reset_link(jme); + if(!rc) { + jme->flags |= JME_FLAG_SSET; + jme->old_ecmd = *ecmd; + } + return rc; } @@ -1945,7 +2062,7 @@ jme_set_rx_csum(struct net_device *netdev, u32 on) static int jme_set_tx_csum(struct net_device *netdev, u32 on) { - if(on) + if(on && netdev->mtu <= 1900) netdev->features |= NETIF_F_HW_CSUM; else netdev->features &= ~NETIF_F_HW_CSUM; @@ -1969,6 +2086,8 @@ static const struct ethtool_ops jme_ethtool_ops = { .set_coalesce = jme_set_coalesce, .get_pauseparam = jme_get_pauseparam, .set_pauseparam = jme_set_pauseparam, + .get_wol = jme_get_wol, + .set_wol = jme_set_wol, .get_settings = jme_get_settings, .set_settings = jme_set_settings, .get_link = jme_get_link, @@ -1982,20 +2101,32 @@ static int jme_pci_dma64(struct pci_dev *pdev) { if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) - if(!pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK)) + if(!pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK)) { + dprintk("jme", "64Bit DMA Selected.\n"); return 1; + } if (!pci_set_dma_mask(pdev, DMA_40BIT_MASK)) - if(!pci_set_consistent_dma_mask(pdev, DMA_40BIT_MASK)) + if(!pci_set_consistent_dma_mask(pdev, DMA_40BIT_MASK)) { + dprintk("jme", "40Bit DMA Selected.\n"); return 1; + } if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)) - if(!pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK)) + if(!pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK)) { + dprintk("jme", "32Bit DMA Selected.\n"); return 0; + } return -1; } +__always_inline static void +jme_set_phy_ps(struct jme_adapter *jme) +{ + jme_mdio_write(jme->dev, jme->mii_if.phy_id, 26, 0x00001000); +} + static int __devinit jme_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) @@ -2039,6 +2170,7 @@ jme_init_one(struct pci_dev *pdev, */ netdev = alloc_etherdev(sizeof(*jme)); if(!netdev) { + printk(KERN_ERR PFX "Cannot allocate netdev structure.\n"); rc = -ENOMEM; goto err_out_release_regions; } @@ -2051,8 +2183,11 @@ jme_init_one(struct pci_dev *pdev, netdev->ethtool_ops = &jme_ethtool_ops; netdev->tx_timeout = jme_tx_timeout; netdev->watchdog_timeo = TX_TIMEOUT; + netdev->vlan_rx_register = jme_vlan_rx_register; NETDEV_GET_STATS(netdev, &jme_get_stats); - netdev->features = NETIF_F_HW_CSUM; + netdev->features = NETIF_F_HW_CSUM | + NETIF_F_HW_VLAN_TX | + NETIF_F_HW_VLAN_RX; if(using_dac) netdev->features |= NETIF_F_HIGHDMA; @@ -2065,11 +2200,12 @@ jme_init_one(struct pci_dev *pdev, jme = netdev_priv(netdev); jme->pdev = pdev; jme->dev = netdev; - jme->oldmtu = netdev->mtu = 1500; + jme->old_mtu = netdev->mtu = 1500; jme->phylink = 0; jme->regs = ioremap(pci_resource_start(pdev, 0), pci_resource_len(pdev, 0)); if (!(jme->regs)) { + printk(KERN_ERR PFX "Mapping PCI resource region error.\n"); rc = -ENOMEM; goto err_out_free_netdev; } @@ -2077,6 +2213,7 @@ jme_init_one(struct pci_dev *pdev, sizeof(__u32) * SHADOW_REG_NR, &(jme->shadow_dma)); if (!(jme->shadow_regs)) { + printk(KERN_ERR PFX "Allocating shadow register mapping error.\n"); rc = -ENOMEM; goto err_out_unmap; } @@ -2085,7 +2222,6 @@ jme_init_one(struct pci_dev *pdev, spin_lock_init(&jme->macaddr_lock); spin_lock_init(&jme->rxmcs_lock); - atomic_set(&jme->intr_sem, 1); atomic_set(&jme->link_changing, 1); atomic_set(&jme->rx_cleaning, 1); atomic_set(&jme->tx_cleaning, 1); @@ -2117,6 +2253,7 @@ jme_init_one(struct pci_dev *pdev, jme->reg_rxcs = RXCS_DEFAULT; jme->reg_rxmcs = RXMCS_DEFAULT; jme->reg_txpfc = 0; + jme->reg_pmcs = 0; /* * Get Max Read Req Size from PCI Config Space */ @@ -2138,7 +2275,8 @@ jme_init_one(struct pci_dev *pdev, * Reset MAC processor and reload EEPROM for MAC Address */ jme_clear_pm(jme); - jme_reset_phy_processor(jme); + jme_set_phy_ps(jme); + jme_phy_off(jme); jme_reset_mac_processor(jme); rc = jme_reload_eeprom(jme); if(rc) { @@ -2212,6 +2350,87 @@ jme_remove_one(struct pci_dev *pdev) } +static int +jme_suspend(struct pci_dev *pdev, pm_message_t state) +{ + struct net_device *netdev = pci_get_drvdata(pdev); + struct jme_adapter *jme = netdev_priv(netdev); + int timeout = 100; + + atomic_dec(&jme->link_changing); + + netif_device_detach(netdev); + netif_stop_queue(netdev); + jme_stop_irq(jme); + jme_free_irq(jme); + + while(--timeout > 0 && + ( + atomic_read(&jme->rx_cleaning) != 1 || + atomic_read(&jme->tx_cleaning) != 1 + )) { + mdelay(1); + } + if(!timeout) { + jeprintk(netdev->name, "Waiting tasklets timeout.\n"); + return -EBUSY; + } + jme_disable_shadow(jme); + + if(netif_carrier_ok(netdev)) { + jme_stop_pcc_timer(jme); + jme_reset_mac_processor(jme); + jme_free_rx_resources(jme); + jme_free_tx_resources(jme); + netif_carrier_off(netdev); + jme->phylink = 0; + } + + + pci_save_state(pdev); + if(jme->reg_pmcs) { + jme_set_100m_half(jme); + jwrite32(jme, JME_PMCS, jme->reg_pmcs); + pci_enable_wake(pdev, PCI_D3hot, true); + pci_enable_wake(pdev, PCI_D3cold, true); + } + else { + jme_phy_off(jme); + pci_enable_wake(pdev, PCI_D3hot, false); + pci_enable_wake(pdev, PCI_D3cold, false); + } + pci_set_power_state(pdev, pci_choose_state(pdev, state)); + + return 0; +} + +static int +jme_resume(struct pci_dev *pdev) +{ + struct net_device *netdev = pci_get_drvdata(pdev); + struct jme_adapter *jme = netdev_priv(netdev); + + jme_clear_pm(jme); + pci_restore_state(pdev); + + if(jme->flags & JME_FLAG_SSET) + jme_set_settings(netdev, &jme->old_ecmd); + else + jme_reset_phy_processor(jme); + + jme_reset_mac_processor(jme); + jme_enable_shadow(jme); + jme_request_irq(jme); + jme_start_irq(jme); + netif_device_attach(netdev); + + atomic_inc(&jme->link_changing); + + jme_reset_link(jme); + + return 0; +} + static struct pci_device_id jme_pci_tbl[] = { { PCI_VDEVICE(JMICRON, 0x250) }, { } @@ -2222,12 +2441,10 @@ static struct pci_driver jme_driver = { .id_table = jme_pci_tbl, .probe = jme_init_one, .remove = __devexit_p(jme_remove_one), -#if 0 #ifdef CONFIG_PM .suspend = jme_suspend, .resume = jme_resume, #endif /* CONFIG_PM */ -#endif }; static int __init