]> bbs.cooldavid.org Git - jme.git/blobdiff - jme.c
Import jme 0.9a source
[jme.git] / jme.c
diff --git a/jme.c b/jme.c
index aead26ea3a4a4db30d74e4783be52b1f58d728bf..44acc00f803bdc314d7564c15b98ac6e46690c27 100644 (file)
--- a/jme.c
+++ b/jme.c
  */
 
 /*
- * Timeline before release:
- *     Stage 4: Basic feature support.
- *     -  Implement scatter-gather offloading.
- *        Use pci_map_page on scattered sk_buff for HIGHMEM support
- *     -  Implement Power Managemt related functions.
- *     -  Implement Jumboframe.
- *     -  Implement MSI.
- *
- *     Stage 5: Advanced offloading support.
- *     -  Implement VLAN offloading.
- *     -  Implement TCP Segement offloading.
- *
- *     Stage 6: CPU Load balancing.
+ * TODO:
  *     -  Implement MSI-X.
  *        Along with multiple RX queue, for CPU load balancing.
- *
- *     Stage 7:
- *     -  Cleanup/re-orginize code, performence tuneing(alignment etc...).
- *     -  Test and Release 1.0
- *
- *     Non-Critical:
- *     -  Use NAPI instead of rx_tasklet?
- *             PCC Support Both Packet Counter and Timeout Interrupt for
- *             receive and transmit complete, does NAPI really needed?
  *     -  Decode register dump for ethtool.
  */
 
 #include <linux/mii.h>
 #include <linux/crc32.h>
 #include <linux/delay.h>
+#include <linux/spinlock.h>
 #include <linux/in.h>
 #include <linux/ip.h>
+#include <linux/ipv6.h>
+#include <linux/tcp.h>
+#include <linux/udp.h>
+#include <linux/if_vlan.h>
 #include "jme.h"
 
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,21)
@@ -83,9 +67,10 @@ jme_mdio_read(struct net_device *netdev, int phy, int reg)
                                smi_reg_addr(reg));
 
        wmb();
-        for (i = JME_PHY_TIMEOUT; i > 0; --i) {
+        for (i = JME_PHY_TIMEOUT ; i > 0 ; --i) {
                udelay(1);
-               if (((val = jread32(jme, JME_SMI)) & SMI_OP_REQ) == 0)
+               val = jread32(jme, JME_SMI);
+               if ((val & SMI_OP_REQ) == 0)
                        break;
         }
 
@@ -111,7 +96,8 @@ jme_mdio_write(struct net_device *netdev,
        wmb();
        for (i = JME_PHY_TIMEOUT ; i > 0 ; --i) {
                udelay(1);
-               if (((val = jread32(jme, JME_SMI)) & SMI_OP_REQ) == 0)
+               val = jread32(jme, JME_SMI);
+               if ((val & SMI_OP_REQ) == 0)
                        break;
        }
 
@@ -147,17 +133,47 @@ jme_reset_phy_processor(struct jme_adapter *jme)
        return;
 }
 
+static void
+jme_setup_wakeup_frame(struct jme_adapter *jme,
+               __u32 *mask, __u32 crc, int fnr)
+{
+       int i;
+
+       /*
+        * Setup CRC pattern
+        */
+       jwrite32(jme, JME_WFOI, WFOI_CRC_SEL | (fnr & WFOI_FRAME_SEL));
+       wmb();
+       jwrite32(jme, JME_WFODP, crc);
+       wmb();
+
+       /*
+        * Setup Mask
+        */
+       for(i = 0 ; i < WAKEUP_FRAME_MASK_DWNR ; ++i) {
+               jwrite32(jme, JME_WFOI,
+                               ((i << WFOI_MASK_SHIFT) & WFOI_MASK_SEL) |
+                               (fnr & WFOI_FRAME_SEL));
+               wmb();
+               jwrite32(jme, JME_WFODP, mask[i]);
+               wmb();
+       }
+}
 
 __always_inline static void
 jme_reset_mac_processor(struct jme_adapter *jme)
 {
+       __u32 mask[WAKEUP_FRAME_MASK_DWNR] = {0,0,0,0};
+       __u32 crc = 0xCDCDCDCD;
+       int i;
+
        jwrite32(jme, JME_GHC, jme->reg_ghc | GHC_SWRST);
        udelay(2);
        jwrite32(jme, JME_GHC, jme->reg_ghc);
        jwrite32(jme, JME_RXMCHT_LO, 0x00000000);
        jwrite32(jme, JME_RXMCHT_HI, 0x00000000);
-       jwrite32(jme, JME_WFODP, 0);
-       jwrite32(jme, JME_WFOI, 0);
+       for(i = 0 ; i < WAKEUP_FRAME_NR ; ++i)
+               jme_setup_wakeup_frame(jme, mask, crc, i);
        jwrite32(jme, JME_GPREG0, GPREG0_DEFAULT);
        jwrite32(jme, JME_GPREG1, 0);
 }
@@ -165,8 +181,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
@@ -227,6 +244,11 @@ __always_inline static void
 jme_set_rx_pcc(struct jme_adapter *jme, int p)
 {
        switch(p) {
+       case PCC_OFF:
+               jwrite32(jme, JME_PCCRX0,
+                       ((PCC_OFF_TO << PCCRXTO_SHIFT) & PCCRXTO_MASK) |
+                       ((PCC_OFF_CNT << PCCRX_SHIFT) & PCCRX_MASK));
+               break;
        case PCC_P1:
                jwrite32(jme, JME_PCCRX0,
                        ((PCC_P1_TO << PCCRXTO_SHIFT) & PCCRXTO_MASK) |
@@ -245,8 +267,10 @@ jme_set_rx_pcc(struct jme_adapter *jme, int p)
        default:
                break;
        }
+       wmb();
 
-       dprintk(jme->dev->name, "Switched to PCC_P%d\n", p);
+       if(!(jme->flags & JME_FLAG_POLL))
+               dprintk(jme->dev->name, "Switched to PCC_P%d\n", p);
 }
 
 static void
@@ -255,10 +279,6 @@ jme_start_irq(struct jme_adapter *jme)
        register struct dynpcc_info *dpi = &(jme->dpi);
 
        jme_set_rx_pcc(jme, PCC_P1);
-
-       dpi->check_point        = jiffies + PCC_INTERVAL;
-       dpi->last_bytes         = NET_STAT(jme).rx_bytes;
-       dpi->last_pkts          = NET_STAT(jme).rx_packets;
        dpi->cur                = PCC_P1;
        dpi->attempt            = PCC_P1;
        dpi->cnt                = 0;
@@ -304,9 +324,10 @@ jme_check_link(struct net_device *netdev, int testonly)
 {
        struct jme_adapter *jme = netdev_priv(netdev);
        __u32 phylink, ghc, cnt = JME_SPDRSV_TIMEOUT, bmcr;
-       char linkmsg[32];
+       char linkmsg[64];
        int rc = 0;
 
+       linkmsg[0] = '\0';
        phylink = jread32(jme, JME_PHY_LINK);
 
         if (phylink & PHY_LINK_UP) {
@@ -321,6 +342,7 @@ jme_check_link(struct net_device *netdev, int testonly)
                                                jme->mii_if.phy_id,
                                                MII_BMCR);
 
+
                        phylink |= ((bmcr & BMCR_SPEED1000) &&
                                        (bmcr & BMCR_SPEED100) == 0) ?
                                        PHY_LINK_SPEED_1000M :
@@ -330,6 +352,8 @@ jme_check_link(struct net_device *netdev, int testonly)
 
                        phylink |= (bmcr & BMCR_FULLDPLX) ?
                                         PHY_LINK_DUPLEX : 0;
+
+                       strcat(linkmsg, "Forced: ");
                }
                else {
                        /*
@@ -346,6 +370,8 @@ jme_check_link(struct net_device *netdev, int testonly)
                        if(!cnt)
                                jeprintk(netdev->name,
                                        "Waiting speed resolve timeout.\n");
+
+                       strcat(linkmsg, "ANed: ");
                }
 
                if(jme->phylink == phylink) {
@@ -360,15 +386,15 @@ jme_check_link(struct net_device *netdev, int testonly)
                switch(phylink & PHY_LINK_SPEED_MASK) {
                        case PHY_LINK_SPEED_10M:
                                ghc = GHC_SPEED_10M;
-                               strcpy(linkmsg, "10 Mbps, ");
+                               strcat(linkmsg, "10 Mbps, ");
                                break;
                        case PHY_LINK_SPEED_100M:
                                ghc = GHC_SPEED_100M;
-                               strcpy(linkmsg, "100 Mbps, ");
+                               strcat(linkmsg, "100 Mbps, ");
                                break;
                        case PHY_LINK_SPEED_1000M:
                                ghc = GHC_SPEED_1000M;
-                               strcpy(linkmsg, "1000 Mbps, ");
+                               strcat(linkmsg, "1000 Mbps, ");
                                break;
                        default:
                                ghc = 0;
@@ -417,129 +443,15 @@ out:
        return rc;
 }
 
-
-static int
-jme_alloc_txdesc(struct jme_adapter *jme,
-                       int nr_alloc)
-{
-       struct jme_ring *txring = jme->txring;
-       int idx;
-
-       idx = txring->next_to_use;
-
-       if(unlikely(txring->nr_free < nr_alloc))
-               return -1;
-
-       spin_lock(&jme->tx_lock);
-       txring->nr_free -= nr_alloc;
-
-       if((txring->next_to_use += nr_alloc) >= RING_DESC_NR)
-               txring->next_to_use -= RING_DESC_NR;
-       spin_unlock(&jme->tx_lock);
-
-       return idx;
-}
-
-static int
-jme_set_new_txdesc(struct jme_adapter *jme,
-                       struct sk_buff *skb)
-{
-       struct jme_ring *txring = jme->txring;
-       volatile struct txdesc *txdesc = txring->desc, *ctxdesc;
-       struct jme_buffer_info *txbi = txring->bufinf, *ctxbi;
-       dma_addr_t dmaaddr;
-       int i, idx, nr_desc;
-       __u8 flags;
-
-       nr_desc = 2;
-       idx = jme_alloc_txdesc(jme, nr_desc);
-
-       if(unlikely(idx<0))
-               return NETDEV_TX_BUSY;
-
-       for(i = 1 ; i < nr_desc  ; ++i) {
-               ctxdesc = txdesc + ((idx + i) & (RING_DESC_NR-1));
-               ctxbi = txbi + ((idx + i) & (RING_DESC_NR-1));
-
-               dmaaddr = pci_map_single(jme->pdev,
-                                        skb->data,
-                                        skb->len,
-                                        PCI_DMA_TODEVICE);
-
-               pci_dma_sync_single_for_device(jme->pdev,
-                                              dmaaddr,
-                                              skb->len,
-                                              PCI_DMA_TODEVICE);
-
-               ctxdesc->dw[0] = 0;
-               ctxdesc->dw[1] = 0;
-               ctxdesc->desc2.flags    = TXFLAG_OWN;
-               if(jme->dev->features & NETIF_F_HIGHDMA)
-                       ctxdesc->desc2.flags |= TXFLAG_64BIT;
-               ctxdesc->desc2.datalen  = cpu_to_le16(skb->len);
-               ctxdesc->desc2.bufaddrh = cpu_to_le32((__u64)dmaaddr >> 32);
-               ctxdesc->desc2.bufaddrl = cpu_to_le32(
-                                               (__u64)dmaaddr & 0xFFFFFFFFUL);
-
-               ctxbi->mapping = dmaaddr;
-               ctxbi->len = skb->len;
-       }
-
-       ctxdesc = txdesc + idx;
-       ctxbi = txbi + idx;
-
-       ctxdesc->dw[0] = 0;
-       ctxdesc->dw[1] = 0;
-       ctxdesc->dw[2] = 0;
-       ctxdesc->dw[3] = 0;
-       ctxdesc->desc1.pktsize = cpu_to_le16(skb->len);
-       /*
-        * Set OWN bit at final.
-        * When kernel transmit faster than NIC.
-        * And NIC trying to send this descriptor before we tell
-        * it to start sending this TX queue.
-        * Other fields are already filled correctly.
-        */
-       wmb();
-       flags = TXFLAG_OWN | TXFLAG_INT; 
-       if(skb->ip_summed == CHECKSUM_PARTIAL) {
-               //flags |= TXFLAG_IPCS;
-
-               switch(ip_hdr(skb)->protocol) {
-               case IPPROTO_TCP:
-                       flags |= TXFLAG_TCPCS;
-                       break;
-               case IPPROTO_UDP:
-                       flags |= TXFLAG_UDPCS;
-                       break;
-               default:
-                       break;
-               }
-       }
-       ctxdesc->desc1.flags = flags;
-       /*
-        * Set tx buffer info after telling NIC to send
-        * For better tx_clean timing
-        */
-       wmb();
-       ctxbi->nr_desc = nr_desc;
-       ctxbi->skb = skb;
-
-       tx_dbg(jme->dev->name, "Xmit: %d+%d\n", idx, nr_desc);
-
-       return 0;
-}
-
-
 static int
 jme_setup_tx_resources(struct jme_adapter *jme)
 {
        struct jme_ring *txring = &(jme->txring[0]);
 
        txring->alloc = dma_alloc_coherent(&(jme->pdev->dev),
-                                          TX_RING_ALLOC_SIZE,
-                                          &(txring->dmaalloc),
-                                          GFP_ATOMIC);
+                                  TX_RING_ALLOC_SIZE(jme->tx_ring_size),
+                                  &(txring->dmaalloc),
+                                  GFP_ATOMIC);
 
        if(!txring->alloc) {
                txring->desc = NULL;
@@ -556,14 +468,14 @@ jme_setup_tx_resources(struct jme_adapter *jme)
        txring->dma             = ALIGN(txring->dmaalloc, RING_DESC_ALIGN);
        txring->next_to_use     = 0;
        txring->next_to_clean   = 0;
-       txring->nr_free         = RING_DESC_NR;
+       atomic_set(&txring->nr_free, jme->tx_ring_size);
 
        /*
-        * Initiallize Transmit Descriptors
+        * Initialize Transmit Descriptors
         */
-       memset(txring->alloc, 0, TX_RING_ALLOC_SIZE);
+       memset(txring->alloc, 0, TX_RING_ALLOC_SIZE(jme->tx_ring_size));
        memset(txring->bufinf, 0,
-               sizeof(struct jme_buffer_info) * RING_DESC_NR);
+               sizeof(struct jme_buffer_info) * jme->tx_ring_size);
 
        return 0;
 }
@@ -576,7 +488,7 @@ jme_free_tx_resources(struct jme_adapter *jme)
        struct jme_buffer_info *txbi = txring->bufinf;
 
        if(txring->alloc) {
-               for(i = 0 ; i < RING_DESC_NR ; ++i) {
+               for(i = 0 ; i < jme->tx_ring_size ; ++i) {
                        txbi = txring->bufinf + i;
                        if(txbi->skb) {
                                dev_kfree_skb(txbi->skb);
@@ -588,7 +500,7 @@ jme_free_tx_resources(struct jme_adapter *jme)
                }
 
                dma_free_coherent(&(jme->pdev->dev),
-                                 TX_RING_ALLOC_SIZE,
+                                 TX_RING_ALLOC_SIZE(jme->tx_ring_size),
                                  txring->alloc,
                                  txring->dmaalloc);
 
@@ -599,7 +511,7 @@ jme_free_tx_resources(struct jme_adapter *jme)
        }
        txring->next_to_use     = 0;
        txring->next_to_clean   = 0;
-       txring->nr_free         = 0;
+       atomic_set(&txring->nr_free, 0);
 
 }
 
@@ -621,7 +533,7 @@ jme_enable_tx_engine(struct jme_adapter *jme)
        /*
         * Setup TX Descptor Count
         */
-       jwrite32(jme, JME_TXQDC, RING_DESC_NR);
+       jwrite32(jme, JME_TXQDC, jme->tx_ring_size);
 
        /*
         * Enable TX Engine
@@ -633,6 +545,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)
 {
@@ -684,34 +607,27 @@ static int
 jme_make_new_rx_buf(struct jme_adapter *jme, int i)
 {
        struct jme_ring *rxring = &(jme->rxring[0]);
-       struct jme_buffer_info *rxbi = rxring->bufinf;
+       struct jme_buffer_info *rxbi = rxring->bufinf + i;
        unsigned long offset;
        struct sk_buff* skb;
 
-       skb = netdev_alloc_skb(jme->dev, RX_BUF_ALLOC_SIZE);
+       skb = netdev_alloc_skb(jme->dev,
+               jme->dev->mtu + RX_EXTRA_LEN);
        if(unlikely(!skb))
                return -ENOMEM;
 
-       if(unlikely(skb_is_nonlinear(skb))) {
-               dprintk(jme->dev->name,
-                       "Allocated skb fragged(%d).\n",
-                       skb_shinfo(skb)->nr_frags);
-               dev_kfree_skb(skb);
-               return -ENOMEM;
-       }
-
        if(unlikely(offset =
                        (unsigned long)(skb->data)
-                       & (unsigned long)(RX_BUF_DMA_ALIGN - 1)))
+                       & ((unsigned long)RX_BUF_DMA_ALIGN - 1)))
                skb_reserve(skb, RX_BUF_DMA_ALIGN - offset);
 
-       rxbi += i;
        rxbi->skb = skb;
        rxbi->len = skb_tailroom(skb);
-       rxbi->mapping = pci_map_single(jme->pdev,
-                                      skb->data,
-                                      rxbi->len,
-                                      PCI_DMA_FROMDEVICE);
+       rxbi->mapping = pci_map_page(jme->pdev,
+                                       virt_to_page(skb->data),
+                                       offset_in_page(skb->data),
+                                       rxbi->len,
+                                       PCI_DMA_FROMDEVICE);
 
        return 0;
 }
@@ -724,7 +640,7 @@ jme_free_rx_buf(struct jme_adapter *jme, int i)
        rxbi += i;
 
        if(rxbi->skb) {
-               pci_unmap_single(jme->pdev,
+               pci_unmap_page(jme->pdev,
                                 rxbi->mapping,
                                 rxbi->len,
                                 PCI_DMA_FROMDEVICE);
@@ -742,11 +658,11 @@ jme_free_rx_resources(struct jme_adapter *jme)
        struct jme_ring *rxring = &(jme->rxring[0]);
 
        if(rxring->alloc) {
-               for(i = 0 ; i < RING_DESC_NR ; ++i)
+               for(i = 0 ; i < jme->rx_ring_size ; ++i)
                        jme_free_rx_buf(jme, i);
 
                dma_free_coherent(&(jme->pdev->dev),
-                                 RX_RING_ALLOC_SIZE,
+                                 RX_RING_ALLOC_SIZE(jme->rx_ring_size),
                                  rxring->alloc,
                                  rxring->dmaalloc);
                rxring->alloc    = NULL;
@@ -765,9 +681,9 @@ jme_setup_rx_resources(struct jme_adapter *jme)
        struct jme_ring *rxring = &(jme->rxring[0]);
 
        rxring->alloc = dma_alloc_coherent(&(jme->pdev->dev),
-                                          RX_RING_ALLOC_SIZE,
-                                          &(rxring->dmaalloc),
-                                          GFP_ATOMIC);
+                                  RX_RING_ALLOC_SIZE(jme->rx_ring_size),
+                                  &(rxring->dmaalloc),
+                                  GFP_ATOMIC);
        if(!rxring->alloc) {
                rxring->desc = NULL;
                rxring->dmaalloc = 0;
@@ -787,7 +703,7 @@ jme_setup_rx_resources(struct jme_adapter *jme)
        /*
         * Initiallize Receive Descriptors
         */
-       for(i = 0 ; i < RING_DESC_NR ; ++i) {
+       for(i = 0 ; i < jme->rx_ring_size ; ++i) {
                if(unlikely(jme_make_new_rx_buf(jme, i))) {
                        jme_free_rx_resources(jme);
                        return -ENOMEM;
@@ -810,9 +726,9 @@ jme_enable_rx_engine(struct jme_adapter *jme)
        jwrite32(jme, JME_RXNDA, (__u64)jme->rxring[0].dma & 0xFFFFFFFFUL);
 
        /*
-        * Setup RX Descptor Count
+        * Setup RX Descriptor Count
         */
-       jwrite32(jme, JME_RXQDC, RING_DESC_NR);
+       jwrite32(jme, JME_RXQDC, jme->rx_ring_size);
 
        /*
         * Setup Unicast Filter
@@ -823,7 +739,7 @@ jme_enable_rx_engine(struct jme_adapter *jme)
         * Enable RX Engine
         */
        wmb();
-       jwrite32(jme, JME_RXCS, RXCS_DEFAULT |
+       jwrite32(jme, JME_RXCS, jme->reg_rxcs |
                                RXCS_QUEUESEL_Q0 |
                                RXCS_ENABLE |
                                RXCS_QST);
@@ -835,7 +751,7 @@ jme_restart_rx_engine(struct jme_adapter *jme)
        /*
         * Start RX Engine
         */
-       jwrite32(jme, JME_RXCS, RXCS_DEFAULT |
+       jwrite32(jme, JME_RXCS, jme->reg_rxcs |
                                RXCS_QUEUESEL_Q0 |
                                RXCS_ENABLE |
                                RXCS_QST);
@@ -851,14 +767,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);
        }
 
@@ -867,45 +781,31 @@ jme_disable_rx_engine(struct jme_adapter *jme)
 
 }
 
-static void
-jme_attempt_pcc(struct dynpcc_info *dpi, int atmp)
-{
-       if(dpi->attempt == atmp) {
-               ++(dpi->cnt);
-       }
-       else {
-               dpi->attempt = atmp;
-               dpi->cnt = 0;
-       }
-}
-
-static void
-jme_dynamic_pcc(struct jme_adapter *jme)
+static int
+jme_rxsum_ok(struct jme_adapter *jme, __u16 flags)
 {
-       register struct dynpcc_info *dpi = &(jme->dpi);
+       if(!(flags & (RXWBFLAG_TCPON | RXWBFLAG_UDPON | RXWBFLAG_IPV4)))
+               return false;
 
-       if(jiffies >= dpi->check_point) {
-               if(jiffies > (dpi->check_point + PCC_INTERVAL))
-                       jme_attempt_pcc(dpi, PCC_P1);
-               else if((NET_STAT(jme).rx_bytes - dpi->last_bytes) >
-                                                       PCC_P3_THRESHOLD)
-                       jme_attempt_pcc(dpi, PCC_P3);
-               else if((NET_STAT(jme).rx_bytes - dpi->last_bytes) >
-                                                       PCC_P2_THRESHOLD)
-                       jme_attempt_pcc(dpi, PCC_P2);
-               else
-                       jme_attempt_pcc(dpi, PCC_P1);
+       if(unlikely((flags & RXWBFLAG_TCPON) &&
+       !(flags & RXWBFLAG_TCPCS))) {
+               csum_dbg(jme->dev->name, "TCP Checksum error.\n");
+               return false;
+       }
 
-               if(unlikely(dpi->attempt != dpi->cur && dpi->cnt > 5)) {
-                       jme_set_rx_pcc(jme, dpi->attempt);
-                       dpi->cur = dpi->attempt;
-                       dpi->cnt = 0;
-               }
+       if(unlikely((flags & RXWBFLAG_UDPON) &&
+       !(flags & RXWBFLAG_UDPCS))) {
+               csum_dbg(jme->dev->name, "UDP Checksum error.\n");
+               return false;
+       }
 
-               dpi->last_bytes = NET_STAT(jme).rx_bytes;
-               dpi->last_pkts  = NET_STAT(jme).rx_packets;
-               dpi->check_point = jiffies + PCC_INTERVAL;
+       if(unlikely((flags & RXWBFLAG_IPV4) &&
+       !(flags & RXWBFLAG_IPCS))) {
+               csum_dbg(jme->dev->name, "IPv4 Checksum error.\n");
+               return false;
        }
+
+       return true;
 }
 
 static void
@@ -942,12 +842,29 @@ 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->reg_rxmcs & RXMCS_CHECKSUM)
+               if(jme_rxsum_ok(jme, rxdesc->descwb.flags))
                        skb->ip_summed = CHECKSUM_UNNECESSARY;
+               else
+                       skb->ip_summed = CHECKSUM_NONE;
+
+
+               if(rxdesc->descwb.flags & RXWBFLAG_TAGON) {
+                       vlan_dbg(jme->dev->name, "VLAN: %04x\n",
+                                       rxdesc->descwb.vlan);
+                       if(jme->vlgrp) {
+                               vlan_dbg(jme->dev->name,
+                                       "VLAN Passed to kernel.\n");
+                               vlan_hwaccel_rx(skb, jme->vlgrp,
+                                       le32_to_cpu(rxdesc->descwb.vlan));
+                               NET_STAT(jme).rx_bytes += 4;
+                       }
+               }
+               else {
+                       netif_rx(skb);
+               }
 
-               netif_rx(skb);
-
-               if(le16_to_cpu(rxdesc->descwb.flags) & RXWBFLAG_DEST_MUL)
+               if((le16_to_cpu(rxdesc->descwb.flags) & RXWBFLAG_DEST) ==
+                               RXWBFLAG_DEST_MUL)
                        ++(NET_STAT(jme).multicast);
 
                jme->dev->last_rx = jiffies;
@@ -957,34 +874,25 @@ jme_alloc_and_feed_skb(struct jme_adapter *jme, int idx)
 
        jme_set_clean_rxdesc(jme, idx);
 
-       jme_dynamic_pcc(jme);
-
 }
 
-static int
-jme_rxsum_bad(struct jme_adapter *jme, __u16 flags)
-{
-       if(jme->reg_rxmcs & RXMCS_CHECKSUM) {
-               return  ((flags & RXWBFLAG_IPV4) && 
-                               !(flags & RXWBFLAG_IPCS)) ||
-                       ((flags & RXWBFLAG_IPV6) && 
-                               !(flags & RXWBFLAG_IPCS)) ||
-                       ((flags & RXWBFLAG_TCPON) && 
-                               !(flags & RXWBFLAG_TCPCS)) ||
-                       ((flags & RXWBFLAG_UDPON) && 
-                               !(flags & RXWBFLAG_UDPCS));
-       }
-       else {
-               return 0;
-       }
-}
+
 
 static int
 jme_process_receive(struct jme_adapter *jme, int limit)
 {
        struct jme_ring *rxring = &(jme->rxring[0]);
        volatile struct rxdesc *rxdesc = rxring->desc;
-       int i, j, ccnt, desccnt;
+       int i, j, ccnt, desccnt, mask = jme->rx_ring_mask;
+
+       if(unlikely(!atomic_dec_and_test(&jme->rx_cleaning)))
+               goto out_inc;
+
+       if(unlikely(atomic_read(&jme->link_changing) != 1))
+               goto out_inc;
+
+       if(unlikely(!netif_carrier_ok(jme->dev)))
+               goto out_inc;
 
        i = rxring->next_to_clean;
        while( limit-- > 0 )
@@ -1001,8 +909,7 @@ jme_process_receive(struct jme_adapter *jme, int limit)
                rx_dbg(jme->dev->name, "RX: Cleaning %d\n", i);
 
                if(unlikely(desccnt > 1 ||
-               rxdesc->descwb.errstat & RXWBERR_ALLERR ||
-               jme_rxsum_bad(jme, rxdesc->descwb.flags))) {
+               rxdesc->descwb.errstat & RXWBERR_ALLERR)) {
 
                        if(rxdesc->descwb.errstat & RXWBERR_CRCERR)
                                ++(NET_STAT(jme).rx_crc_errors);
@@ -1011,14 +918,17 @@ jme_process_receive(struct jme_adapter *jme, int limit)
                        else
                                ++(NET_STAT(jme).rx_errors);
 
-                       if(desccnt > 1)
+                       if(desccnt > 1) {
+                               rx_dbg(jme->dev->name,
+                                       "RX: More than one(%d) descriptor, "
+                                       "framelen=%d\n",
+                                       desccnt, le16_to_cpu(rxdesc->descwb.framesize));
                                limit -= desccnt - 1;
+                       }
 
                        for(j = i, ccnt = desccnt ; ccnt-- ; ) {
                                jme_set_clean_rxdesc(jme, j);
-
-                               if(unlikely(++j == RING_DESC_NR))
-                                       j = 0;
+                               j = (j + 1) & (mask);
                        }
 
                }
@@ -1026,11 +936,10 @@ jme_process_receive(struct jme_adapter *jme, int limit)
                        jme_alloc_and_feed_skb(jme, i);
                }
 
-
-               if((i += desccnt) >= RING_DESC_NR)
-                       i -= RING_DESC_NR;
+               i = (i + desccnt) & (mask);
        }
 
+
 out:
        rx_dbg(jme->dev->name, "RX: Stop at %d\n", i);
        rx_dbg(jme->dev->name, "RX: RXNDA offset %d\n",
@@ -1039,10 +948,100 @@ out:
 
        rxring->next_to_clean = i;
 
+out_inc:
+       atomic_inc(&jme->rx_cleaning);
+
        return limit > 0 ? limit : 0;
 
 }
 
+static void
+jme_attempt_pcc(struct dynpcc_info *dpi, int atmp)
+{
+       if(likely(atmp == dpi->cur)) {
+               dpi->cnt = 0;
+               return;
+       }
+
+       if(dpi->attempt == atmp) {
+               ++(dpi->cnt);
+       }
+       else {
+               dpi->attempt = atmp;
+               dpi->cnt = 0;
+       }
+
+}
+
+static void
+jme_dynamic_pcc(struct jme_adapter *jme)
+{
+       register struct dynpcc_info *dpi = &(jme->dpi);
+
+       if((NET_STAT(jme).rx_bytes - dpi->last_bytes) > PCC_P3_THRESHOLD)
+               jme_attempt_pcc(dpi, PCC_P3);
+       else if((NET_STAT(jme).rx_packets - dpi->last_pkts) > PCC_P2_THRESHOLD
+       || dpi->intr_cnt > PCC_INTR_THRESHOLD)
+               jme_attempt_pcc(dpi, PCC_P2);
+       else
+               jme_attempt_pcc(dpi, PCC_P1);
+
+       if(unlikely(dpi->attempt != dpi->cur && dpi->cnt > 5)) {
+               jme_set_rx_pcc(jme, dpi->attempt);
+               dpi->cur = dpi->attempt;
+               dpi->cnt = 0;
+       }
+}
+
+static void
+jme_start_pcc_timer(struct jme_adapter *jme)
+{
+       struct dynpcc_info *dpi = &(jme->dpi);
+       dpi->last_bytes         = NET_STAT(jme).rx_bytes;
+       dpi->last_pkts          = NET_STAT(jme).rx_packets;
+       dpi->intr_cnt           = 0;
+       jwrite32(jme, JME_TMCSR,
+               TMCSR_EN | ((0xFFFFFF - PCC_INTERVAL_US) & TMCSR_CNT));
+}
+
+__always_inline 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(unlikely(!netif_carrier_ok(netdev) ||
+               (atomic_read(&jme->link_changing) != 1)
+       )) {
+               jme_stop_pcc_timer(jme);
+               return;
+       }
+
+       if(!(jme->flags & JME_FLAG_POLL))
+               jme_dynamic_pcc(jme);
+
+       jme_start_pcc_timer(jme);
+}
+
+__always_inline static void
+jme_polling_mode(struct jme_adapter *jme)
+{
+       jme_set_rx_pcc(jme, PCC_OFF);
+}
+
+__always_inline static void
+jme_interrupt_mode(struct jme_adapter *jme)
+{
+       jme_set_rx_pcc(jme, PCC_P1);
+}
+
 static void
 jme_link_change_tasklet(unsigned long arg)
 {
@@ -1054,9 +1053,10 @@ jme_link_change_tasklet(unsigned long arg)
        if(!atomic_dec_and_test(&jme->link_changing))
                goto out;
 
-       if(jme_check_link(netdev, 1))
+       if(jme_check_link(netdev, 1) && jme->old_mtu == netdev->mtu)
                goto out;
 
+       jme->old_mtu = netdev->mtu;
        netif_stop_queue(netdev);
 
        while(--timeout > 0 &&
@@ -1069,9 +1069,15 @@ 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);
+
+               if(jme->flags & JME_FLAG_POLL) {
+                       jme_polling_mode(jme);
+                       napi_disable(&jme->napi);
+               }
        }
 
        jme_check_link(netdev, 0);
@@ -1097,6 +1103,13 @@ jme_link_change_tasklet(unsigned long arg)
                jme_enable_tx_engine(jme);
 
                netif_start_queue(netdev);
+
+               if(jme->flags & JME_FLAG_POLL) {
+                       napi_enable(&jme->napi);
+                       jme_interrupt_mode(jme);
+               }
+
+               jme_start_pcc_timer(jme);
        }
 
        goto out;
@@ -1111,20 +1124,34 @@ static void
 jme_rx_clean_tasklet(unsigned long arg)
 {
        struct jme_adapter *jme = (struct jme_adapter*)arg;
+       struct dynpcc_info *dpi = &(jme->dpi);
 
-       if(!atomic_dec_and_test(&jme->rx_cleaning))
-               goto out;
-       
-       if(atomic_read(&jme->link_changing) != 1)
-               goto out;
+       jme_process_receive(jme, jme->rx_ring_size);
+       ++(dpi->intr_cnt);
 
-       if(unlikely(netif_queue_stopped(jme->dev)))
-               goto out;
+}
+
+static int
+jme_poll(struct napi_struct *napi, int budget)
+{
+       struct jme_adapter *jme = container_of(napi, struct jme_adapter, napi);
+       struct net_device *netdev = jme->dev;
+       int rest;
 
-       jme_process_receive(jme, RING_DESC_NR);
+       rest = jme_process_receive(jme, budget);
 
-out:
-       atomic_inc(&jme->rx_cleaning);
+       while(!atomic_dec_and_test(&jme->rx_empty)) {
+               ++(NET_STAT(jme).rx_dropped);
+               jme_restart_rx_engine(jme);
+       }
+       atomic_inc(&jme->rx_empty);
+
+       if(rest) {
+               netif_rx_complete(netdev, napi);
+               jme_interrupt_mode(jme);
+       }
+
+       return budget - rest;
 }
 
 static void
@@ -1132,16 +1159,34 @@ jme_rx_empty_tasklet(unsigned long arg)
 {
        struct jme_adapter *jme = (struct jme_adapter*)arg;
 
-       if(atomic_read(&jme->link_changing) != 1)
+       if(unlikely(atomic_read(&jme->link_changing) != 1))
                return;
 
-       if(unlikely(netif_queue_stopped(jme->dev)))
+       if(unlikely(!netif_carrier_ok(jme->dev)))
                return;
 
+       queue_dbg(jme->dev->name, "RX Queue Full!\n");
+
        jme_rx_clean_tasklet(arg);
        jme_restart_rx_engine(jme);
 }
 
+static void
+jme_wake_queue_if_stopped(struct jme_adapter *jme)
+{
+       struct jme_ring *txring = jme->txring;
+
+       smp_wmb();
+       if(unlikely(netif_queue_stopped(jme->dev) &&
+       atomic_read(&txring->nr_free) >= (jme->tx_wake_threshold))) {
+
+               queue_dbg(jme->dev->name, "TX Queue Waked.\n");
+               netif_wake_queue(jme->dev);
+
+       }
+
+}
+
 static void
 jme_tx_clean_tasklet(unsigned long arg)
 {
@@ -1149,20 +1194,19 @@ jme_tx_clean_tasklet(unsigned long arg)
        struct jme_ring *txring = &(jme->txring[0]);
        volatile struct txdesc *txdesc = txring->desc;
        struct jme_buffer_info *txbi = txring->bufinf, *ctxbi, *ttxbi;
-       int i, j, cnt = 0, max, err;
+       int i, j, cnt = 0, max, err, mask;
 
-       if(!atomic_dec_and_test(&jme->tx_cleaning))
+       if(unlikely(!atomic_dec_and_test(&jme->tx_cleaning)))
                goto out;
 
-       if(atomic_read(&jme->link_changing) != 1)
+       if(unlikely(atomic_read(&jme->link_changing) != 1))
                goto out;
 
-       if(unlikely(netif_queue_stopped(jme->dev)))
+       if(unlikely(!netif_carrier_ok(jme->dev)))
                goto out;
 
-       spin_lock(&jme->tx_lock);
-       max = RING_DESC_NR - txring->nr_free;
-       spin_unlock(&jme->tx_lock);
+       max = jme->tx_ring_size - atomic_read(&txring->nr_free);
+       mask = jme->tx_ring_mask;
 
        tx_dbg(jme->dev->name, "Tx Tasklet: In\n");
 
@@ -1170,7 +1214,8 @@ jme_tx_clean_tasklet(unsigned long arg)
 
                ctxbi = txbi + i;
 
-               if(ctxbi->skb && !(txdesc[i].descwb.flags & TXWBFLAG_OWN)) {
+               if(likely(ctxbi->skb &&
+               !(txdesc[i].descwb.flags & TXWBFLAG_OWN))) {
 
                        err = txdesc[i].descwb.flags & TXWBFLAG_ALLERR;
 
@@ -1179,45 +1224,45 @@ jme_tx_clean_tasklet(unsigned long arg)
                                i, ctxbi->nr_desc);
 
                        for(j = 1 ; j < ctxbi->nr_desc ; ++j) {
-                               ttxbi = txbi + ((i + j) & (RING_DESC_NR - 1));
-                               txdesc[(i+j)&(RING_DESC_NR-1)].dw[0] = 0;
+                               ttxbi = txbi + ((i + j) & (mask));
+                               txdesc[(i + j) & (mask)].dw[0] = 0;
 
-                               pci_unmap_single(jme->pdev,
+                               pci_unmap_page(jme->pdev,
                                                 ttxbi->mapping,
                                                 ttxbi->len,
                                                 PCI_DMA_TODEVICE);
 
-                               if(likely(!err))
-                                       NET_STAT(jme).tx_bytes += ttxbi->len;
-
                                ttxbi->mapping = 0;
                                ttxbi->len = 0;
                        }
 
                        dev_kfree_skb(ctxbi->skb);
-                       ctxbi->skb = NULL;
 
                        cnt += ctxbi->nr_desc;
 
                        if(unlikely(err))
                                ++(NET_STAT(jme).tx_carrier_errors);
-                       else
+                       else {
                                ++(NET_STAT(jme).tx_packets);
+                               NET_STAT(jme).tx_bytes += ctxbi->len;
+                       }
+
+                       ctxbi->skb = NULL;
+                       ctxbi->len = 0;
                }
                else {
                        if(!ctxbi->skb)
                                tx_dbg(jme->dev->name,
                                        "Tx Tasklet:"
-                                       " Stoped due to no skb.\n");
+                                       " Stopped due to no skb.\n");
                        else
                                tx_dbg(jme->dev->name,
                                        "Tx Tasklet:"
-                                       "Stoped due to not done.\n");
+                                       "Stopped due to not done.\n");
                        break;
                }
 
-               if(unlikely((i += ctxbi->nr_desc) >= RING_DESC_NR))
-                       i -= RING_DESC_NR;
+               i = (i + ctxbi->nr_desc) & mask;
 
                ctxbi->nr_desc = 0;
        }
@@ -1227,110 +1272,174 @@ jme_tx_clean_tasklet(unsigned long arg)
                i, jiffies);
        txring->next_to_clean = i;
 
-       spin_lock(&jme->tx_lock);
-       txring->nr_free += cnt;
-       spin_unlock(&jme->tx_lock);
+       atomic_add(cnt, &txring->nr_free);
+
+       jme_wake_queue_if_stopped(jme);
 
 out:
        atomic_inc(&jme->tx_cleaning);
 }
 
-static irqreturn_t
-jme_intr(int irq, void *dev_id)
+static void
+jme_intr_msi(struct jme_adapter *jme, __u32 intrstat)
 {
-        struct net_device *netdev = dev_id;
-        struct jme_adapter *jme = netdev_priv(netdev);
-       irqreturn_t rc = IRQ_HANDLED;
-       __u32 intrstat;
-
-#if USE_IEVE_SHADOW
-       pci_dma_sync_single_for_cpu(jme->pdev,
-                                   jme->shadow_dma,
-                                   sizeof(__u32) * SHADOW_REG_NR,
-                                   PCI_DMA_FROMDEVICE);
-       intrstat = jme->shadow_regs[SHADOW_IEVE];
-       jme->shadow_regs[SHADOW_IEVE] = 0;
-#else
-       intrstat = jread32(jme, JME_IEVE);
-#endif
-
-       /*
-        * Check if it's really an interrupt for us
-        */
-        if(intrstat == 0) {
-               rc = IRQ_NONE;
-               goto out;
-       }
-
        /*
-        * Check if the device still exist
+        * Disable interrupt
         */
-       if(unlikely(intrstat == ~((typeof(intrstat))0))) {
-                rc = IRQ_NONE;
-               goto out;
-       }
+       jwrite32f(jme, JME_IENC, INTR_ENABLE);
 
        /*
-        * Allow one interrupt handling at a time
+        * Write 1 clear interrupt status
         */
-        if(unlikely(!atomic_dec_and_test(&jme->intr_sem)))
-               goto out_inc;
-
-       /*
-        * Disable interrupt
-        */
-       jwrite32f(jme, JME_IENC, INTR_ENABLE);
+       jwrite32f(jme, JME_IEVE, intrstat);
 
-       if(intrstat & INTR_LINKCH) {
+       if(intrstat & (INTR_LINKCH | INTR_SWINTR)) {
                tasklet_schedule(&jme->linkch_task);
-               goto out_deassert;
+               goto out_reenable;
        }
 
-       if(intrstat & INTR_RX0EMP)
-               tasklet_schedule(&jme->rxempty_task);
-
-       if(intrstat & (INTR_PCCRX0TO | INTR_PCCRX0))
-               tasklet_schedule(&jme->rxclean_task);
+       if(intrstat & INTR_TMINTR)
+               tasklet_schedule(&jme->pcc_task);
 
        if(intrstat & (INTR_PCCTXTO | INTR_PCCTX))
                tasklet_schedule(&jme->txclean_task);
 
-        if((intrstat & ~INTR_ENABLE) != 0) {
-               /*
-                * Some interrupt not handled
-                * but not enabled also (for debug)
-                */
+       if(jme->flags & JME_FLAG_POLL) {
+               if(intrstat & INTR_RX0EMP)
+                       atomic_inc(&jme->rx_empty);
+
+               if((intrstat & (INTR_PCCRX0TO | INTR_PCCRX0 | INTR_RX0EMP))) {
+                       if(likely(
+                       netif_rx_schedule_prep(jme->dev, &jme->napi))) {
+                               jme_polling_mode(jme);
+                               __netif_rx_schedule(jme->dev, &jme->napi);
+                       }
+               }
        }
+       else {
+               if(intrstat & INTR_RX0EMP)
+                       tasklet_schedule(&jme->rxempty_task);
 
-out_deassert:
-       /*
-        * Deassert interrupts
-        */
-       jwrite32f(jme, JME_IEVE, intrstat);
+               if(intrstat & (INTR_PCCRX0TO | INTR_PCCRX0))
+                       tasklet_schedule(&jme->rxclean_task);
+       }
 
+out_reenable:
        /*
         * Re-enable interrupt
         */
        jwrite32f(jme, JME_IENS, INTR_ENABLE);
 
-out_inc:
+
+}
+
+static irqreturn_t
+jme_intr(int irq, void *dev_id)
+{
+        struct net_device *netdev = dev_id;
+        struct jme_adapter *jme = netdev_priv(netdev);
+       __u32 intrstat;
+
+       intrstat = jread32(jme, JME_IEVE);
+
        /*
-        * Enable next interrupt handling
+        * Check if it's really an interrupt for us
         */
-       atomic_inc(&jme->intr_sem);
+        if(unlikely(intrstat == 0))
+               return IRQ_NONE;
 
-out:
-        return rc;
+       /*
+        * Check if the device still exist
+        */
+       if(unlikely(intrstat == ~((typeof(intrstat))0)))
+                return IRQ_NONE;
+
+       jme_intr_msi(jme, intrstat);
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t
+jme_msi(int irq, void *dev_id)
+{
+        struct net_device *netdev = dev_id;
+        struct jme_adapter *jme = netdev_priv(netdev);
+       __u32 intrstat;
+
+       pci_dma_sync_single_for_cpu(jme->pdev,
+                                   jme->shadow_dma,
+                                   sizeof(__u32) * SHADOW_REG_NR,
+                                   PCI_DMA_FROMDEVICE);
+       intrstat = jme->shadow_regs[SHADOW_IEVE];
+       jme->shadow_regs[SHADOW_IEVE] = 0;
+
+       jme_intr_msi(jme, intrstat);
+
+        return IRQ_HANDLED;
+}
+
+
+static void
+jme_reset_link(struct jme_adapter *jme)
+{
+       jwrite32(jme, JME_TMCSR, TMCSR_SWIT);
 }
 
 static void
 jme_restart_an(struct jme_adapter *jme)
 {
        __u32 bmcr;
+       unsigned long flags;
 
+       spin_lock_irqsave(&jme->phy_lock, flags);
        bmcr = jme_mdio_read(jme->dev, jme->mii_if.phy_id, MII_BMCR);
        bmcr |= (BMCR_ANENABLE | BMCR_ANRESTART);
        jme_mdio_write(jme->dev, jme->mii_if.phy_id, MII_BMCR, bmcr);
+       spin_unlock_irqrestore(&jme->phy_lock, flags);
+}
+
+static int
+jme_request_irq(struct jme_adapter *jme)
+{
+       int rc;
+        struct net_device *netdev = jme->dev;
+        irq_handler_t handler = jme_intr;
+        int irq_flags = IRQF_SHARED;
+
+        if (!pci_enable_msi(jme->pdev)) {
+                jme->flags |= JME_FLAG_MSI;
+                handler = jme_msi;
+                irq_flags = 0;
+        }
+
+        rc = request_irq(jme->pdev->irq, handler, irq_flags, netdev->name,
+                          netdev);
+        if(rc) {
+                jeprintk(netdev->name,
+                       "Unable to request %s interrupt (return: %d)\n",
+                       jme->flags & JME_FLAG_MSI ? "MSI":"INTx", rc);
+
+                if(jme->flags & JME_FLAG_MSI) {
+                        pci_disable_msi(jme->pdev);
+                       jme->flags &= ~JME_FLAG_MSI;
+               }
+        }
+       else {
+               netdev->irq = jme->pdev->irq;
+       }
+
+        return rc;
+}
+
+static void
+jme_free_irq(struct jme_adapter *jme)
+{
+        free_irq(jme->pdev->irq, jme->dev);
+        if (jme->flags & JME_FLAG_MSI) {
+                pci_disable_msi(jme->pdev);
+               jme->flags &= ~JME_FLAG_MSI;
+               jme->dev->irq = jme->pdev->irq;
+        }
 }
 
 static int
@@ -1349,17 +1458,27 @@ jme_open(struct net_device *netdev)
        )
                msleep(10);
 
+       if(!timeout) {
+               rc = -EBUSY;
+               goto err_out;
+       }
+
+       jme_clear_pm(jme);
        jme_reset_mac_processor(jme);
 
-       rc = request_irq(jme->pdev->irq, jme_intr,
-                        IRQF_SHARED, netdev->name, netdev);
-       if(rc) {
-               printk(KERN_ERR PFX "Requesting IRQ error.\n");
+       rc = jme_request_irq(jme);
+       if(rc)
                goto err_out;
-       }
+
        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;
 
@@ -1369,6 +1488,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)
 {
@@ -1379,7 +1521,10 @@ jme_close(struct net_device *netdev)
 
        jme_stop_irq(jme);
        jme_disable_shadow(jme);
-       free_irq(jme->pdev->irq, jme->dev);
+       jme_free_irq(jme);
+
+       if(jme->flags & JME_FLAG_POLL)
+               napi_disable(&jme->napi);
 
        tasklet_kill(&jme->linkch_task);
        tasklet_kill(&jme->txclean_task);
@@ -1389,10 +1534,242 @@ jme_close(struct net_device *netdev)
        jme_reset_mac_processor(jme);
        jme_free_rx_resources(jme);
        jme_free_tx_resources(jme);
+       jme->phylink = 0;
+       jme_phy_off(jme);
 
        return 0;
 }
 
+static int
+jme_alloc_txdesc(struct jme_adapter *jme,
+                       struct sk_buff *skb)
+{
+       struct jme_ring *txring = jme->txring;
+       int idx, nr_alloc, mask = jme->tx_ring_mask;
+
+       idx = txring->next_to_use;
+       nr_alloc = skb_shinfo(skb)->nr_frags + 2;
+
+       if(unlikely(atomic_read(&txring->nr_free) < nr_alloc))
+               return -1;
+
+       atomic_sub(nr_alloc, &txring->nr_free);
+
+       txring->next_to_use = (txring->next_to_use + nr_alloc) & mask;
+
+       return idx;
+}
+
+static void
+jme_fill_tx_map(struct pci_dev *pdev,
+               volatile struct txdesc *txdesc,
+               struct jme_buffer_info *txbi,
+               struct page *page,
+               __u32 page_offset,
+               __u32 len,
+               __u8 hidma)
+{
+       dma_addr_t dmaaddr;
+
+       dmaaddr = pci_map_page(pdev,
+                               page,
+                               page_offset,
+                               len,
+                               PCI_DMA_TODEVICE);
+
+       pci_dma_sync_single_for_device(pdev,
+                                      dmaaddr,
+                                      len,
+                                      PCI_DMA_TODEVICE);
+
+       txdesc->dw[0] = 0;
+       txdesc->dw[1] = 0;
+       txdesc->desc2.flags     = TXFLAG_OWN;
+       txdesc->desc2.flags     |= (hidma)?TXFLAG_64BIT:0;
+       txdesc->desc2.datalen   = cpu_to_le16(len);
+       txdesc->desc2.bufaddrh  = cpu_to_le32((__u64)dmaaddr >> 32);
+       txdesc->desc2.bufaddrl  = cpu_to_le32(
+                                       (__u64)dmaaddr & 0xFFFFFFFFUL);
+
+       txbi->mapping = dmaaddr;
+       txbi->len = len;
+}
+
+static void
+jme_map_tx_skb(struct jme_adapter *jme, struct sk_buff *skb, int idx)
+{
+       struct jme_ring *txring = jme->txring;
+       volatile struct txdesc *txdesc = txring->desc, *ctxdesc;
+       struct jme_buffer_info *txbi = txring->bufinf, *ctxbi;
+       __u8 hidma = jme->dev->features & NETIF_F_HIGHDMA;
+       int i, nr_frags = skb_shinfo(skb)->nr_frags;
+       int mask = jme->tx_ring_mask;
+       struct skb_frag_struct *frag;
+       __u32 len;
+
+       for(i = 0 ; i < nr_frags ; ++i) {
+                frag = &skb_shinfo(skb)->frags[i];
+               ctxdesc = txdesc + ((idx + i + 2) & (mask));
+               ctxbi = txbi + ((idx + i + 2) & (mask));
+
+               jme_fill_tx_map(jme->pdev, ctxdesc, ctxbi, frag->page,
+                                frag->page_offset, frag->size, hidma);
+       }
+
+       len = skb_is_nonlinear(skb)?skb_headlen(skb):skb->len;
+       ctxdesc = txdesc + ((idx + 1) & (mask));
+       ctxbi = txbi + ((idx + 1) & (mask));
+       jme_fill_tx_map(jme->pdev, ctxdesc, ctxbi, virt_to_page(skb->data),
+                       offset_in_page(skb->data), len, hidma);
+
+}
+
+static int
+jme_expand_header(struct jme_adapter *jme, struct sk_buff *skb)
+{
+       if(unlikely(skb_shinfo(skb)->gso_size &&
+                       skb_header_cloned(skb) &&
+                       pskb_expand_head(skb, 0, 0, GFP_ATOMIC))) {
+               dev_kfree_skb(skb);
+               return -1;
+       }
+
+       return 0;
+}
+
+static int
+jme_tx_tso(struct sk_buff *skb,
+               volatile __u16 *mss, __u8 *flags)
+{
+       if((*mss = (skb_shinfo(skb)->gso_size << TXDESC_MSS_SHIFT))) {
+               *flags |= TXFLAG_LSEN;
+
+               if(skb->protocol == __constant_htons(ETH_P_IP)) {
+                       struct iphdr *iph = ip_hdr(skb);
+
+                       iph->check = 0;
+                        tcp_hdr(skb)->check = ~csum_tcpudp_magic(iph->saddr,
+                                                               iph->daddr, 0,
+                                                               IPPROTO_TCP,
+                                                               0);
+               }
+               else {
+                       struct ipv6hdr *ip6h = ipv6_hdr(skb);
+
+                        tcp_hdr(skb)->check = ~csum_ipv6_magic(&ip6h->saddr,
+                                                               &ip6h->daddr, 0,
+                                                               IPPROTO_TCP,
+                                                               0);
+               }
+
+               return 0;
+       }
+
+       return 1;
+}
+
+static void
+jme_tx_csum(struct sk_buff *skb, __u8 *flags)
+{
+       if(skb->ip_summed == CHECKSUM_PARTIAL) {
+               __u8 ip_proto;
+
+               switch (skb->protocol) {
+               case __constant_htons(ETH_P_IP):
+                       ip_proto = ip_hdr(skb)->protocol;
+                       break;
+               case __constant_htons(ETH_P_IPV6):
+                       ip_proto = ipv6_hdr(skb)->nexthdr;
+                       break;
+               default:
+                       ip_proto = 0;
+                       break;
+               }
+
+               switch(ip_proto) {
+               case IPPROTO_TCP:
+                       *flags |= TXFLAG_TCPCS;
+                       break;
+               case IPPROTO_UDP:
+                       *flags |= TXFLAG_UDPCS;
+                       break;
+               default:
+                       jeprintk("jme", "Error upper layer protocol.\n");
+                       break;
+               }
+       }
+}
+
+__always_inline static void
+jme_tx_vlan(struct sk_buff *skb, volatile __u16 *vlan, __u8 *flags)
+{
+       if(vlan_tx_tag_present(skb)) {
+               vlan_dbg("jme", "Tag found!(%04x)\n", vlan_tx_tag_get(skb));
+               *flags |= TXFLAG_TAGON;
+               *vlan = vlan_tx_tag_get(skb);
+       }
+}
+
+static int
+jme_fill_first_tx_desc(struct jme_adapter *jme, struct sk_buff *skb, int idx)
+{
+       struct jme_ring *txring = jme->txring;
+       volatile struct txdesc *txdesc;
+       struct jme_buffer_info *txbi;
+       __u8 flags;
+
+       txdesc = (volatile struct txdesc*)txring->desc + idx;
+       txbi = txring->bufinf + idx;
+
+       txdesc->dw[0] = 0;
+       txdesc->dw[1] = 0;
+       txdesc->dw[2] = 0;
+       txdesc->dw[3] = 0;
+       txdesc->desc1.pktsize = cpu_to_le16(skb->len);
+       /*
+        * Set OWN bit at final.
+        * When kernel transmit faster than NIC.
+        * And NIC trying to send this descriptor before we tell
+        * it to start sending this TX queue.
+        * Other fields are already filled correctly.
+        */
+       wmb();
+       flags = TXFLAG_OWN | TXFLAG_INT;
+       //Set checksum flags while not tso
+       if(jme_tx_tso(skb, &txdesc->desc1.mss, &flags))
+               jme_tx_csum(skb, &flags);
+       jme_tx_vlan(skb, &txdesc->desc1.vlan, &flags);
+       txdesc->desc1.flags = flags;
+       /*
+        * Set tx buffer info after telling NIC to send
+        * For better tx_clean timing
+        */
+       wmb();
+       txbi->nr_desc = skb_shinfo(skb)->nr_frags + 2;
+       txbi->skb = skb;
+       txbi->len = skb->len;
+
+       return 0;
+}
+
+static void
+jme_stop_queue_if_full(struct jme_adapter *jme)
+{
+       struct jme_ring *txring = jme->txring;
+
+       smp_wmb();
+       if(unlikely(atomic_read(&txring->nr_free) < (MAX_SKB_FRAGS+2))) {
+               netif_stop_queue(jme->dev);
+               queue_dbg(jme->dev->name, "TX Queue Paused.\n");
+               smp_wmb();
+               if (atomic_read(&txring->nr_free) >= (jme->tx_wake_threshold)) {
+                       netif_wake_queue(jme->dev);
+                       queue_dbg(jme->dev->name, "TX Queue Fast Waked.\n");
+               }
+       }
+
+}
+
 /*
  * This function is already protected by netif_tx_lock()
  */
@@ -1400,15 +1777,36 @@ static int
 jme_start_xmit(struct sk_buff *skb, struct net_device *netdev)
 {
         struct jme_adapter *jme = netdev_priv(netdev);
-       int rc;
+       int idx;
+
+       if(skb_shinfo(skb)->nr_frags) {
+               tx_dbg(netdev->name, "Frags: %d Headlen: %d Len: %d MSS: %d Sum:%d\n",
+                       skb_shinfo(skb)->nr_frags,
+                       skb_headlen(skb),
+                       skb->len,
+                       skb_shinfo(skb)->gso_size,
+                       skb->ip_summed);
+       }
+
+       if(unlikely(jme_expand_header(jme, skb))) {
+               ++(NET_STAT(jme).tx_dropped);
+               return NETDEV_TX_OK;
+       }
+
+       idx = jme_alloc_txdesc(jme, skb);
+
+       if(unlikely(idx<0)) {
+               netif_stop_queue(netdev);
+               jeprintk(netdev->name,
+                               "BUG! Tx ring full when queue awake!\n");
 
-       if(unlikely(netif_queue_stopped(jme->dev)))
-               return NETDEV_TX_BUSY;
+                return NETDEV_TX_BUSY;
+       }
 
-       rc = jme_set_new_txdesc(jme, skb);
+       jme_map_tx_skb(jme, skb, idx);
+       jme_fill_first_tx_desc(jme, skb, idx);
 
-       if(unlikely(rc != NETDEV_TX_OK))
-               return rc;
+       tx_dbg(jme->dev->name, "Xmit: %d+%d\n", idx, skb_shinfo(skb)->nr_frags + 2);
 
        jwrite32(jme, JME_TXCS, jme->reg_txcs |
                                TXCS_SELECT_QUEUE0 |
@@ -1416,6 +1814,8 @@ jme_start_xmit(struct sk_buff *skb, struct net_device *netdev)
                                TXCS_ENABLE);
        netdev->trans_start = jiffies;
 
+       jme_stop_queue_if_full(jme);
+
         return NETDEV_TX_OK;
 }
 
@@ -1489,10 +1889,42 @@ jme_set_multi(struct net_device *netdev)
 static int
 jme_change_mtu(struct net_device *netdev, int new_mtu)
 {
-       /*
-        * Not supporting MTU change for now.
-        */
-       return -EINVAL;
+        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) < IPV6_MIN_MTU))
+                return -EINVAL;
+
+       if(new_mtu > 4000) {
+               jme->reg_rxcs &= ~RXCS_FIFOTHNP;
+               jme->reg_rxcs |= RXCS_FIFOTHNP_64QW;
+               jme_restart_rx_engine(jme);
+       }
+       else {
+               jme->reg_rxcs &= ~RXCS_FIFOTHNP;
+               jme->reg_rxcs |= RXCS_FIFOTHNP_128QW;
+               jme_restart_rx_engine(jme);
+       }
+
+       if(new_mtu > 1900) {
+               netdev->features &= ~(NETIF_F_HW_CSUM |
+                               NETIF_F_TSO |
+                               NETIF_F_TSO6);
+       }
+       else {
+               if(jme->flags & JME_FLAG_TXCSUM)
+                       netdev->features |= NETIF_F_HW_CSUM;
+               if(jme->flags & JME_FLAG_TSO)
+                       netdev->features |= NETIF_F_TSO | NETIF_F_TSO6;
+       }
+
+        netdev->mtu = new_mtu;
+        jme_reset_link(jme);
+
+       return 0;
 }
 
 static void
@@ -1502,9 +1934,18 @@ jme_tx_timeout(struct net_device *netdev)
 
        /*
         * Reset the link
-        * And the link change will reinitiallize all RX/TX resources
+        * And the link change will reinitialize 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
@@ -1530,7 +1971,7 @@ mmapio_memcpy(struct jme_adapter *jme, __u32 *p, __u32 reg, int len)
        int i;
 
        for(i = 0 ; i < len ; i += 4)
-               p[i>>2] = jread32(jme, reg + i);
+               p[i >> 2] = jread32(jme, reg + i);
 
 }
 
@@ -1561,7 +2002,11 @@ jme_get_coalesce(struct net_device *netdev, struct ethtool_coalesce *ecmd)
 {
        struct jme_adapter *jme = netdev_priv(netdev);
 
-       ecmd->use_adaptive_rx_coalesce = true;
+       if(jme->flags & JME_FLAG_POLL)
+               ecmd->use_adaptive_rx_coalesce = false;
+       else
+               ecmd->use_adaptive_rx_coalesce = true;
+
        ecmd->tx_coalesce_usecs = PCC_TX_TO;
        ecmd->tx_max_coalesced_frames = PCC_TX_CNT;
 
@@ -1585,6 +2030,32 @@ jme_get_coalesce(struct net_device *netdev, struct ethtool_coalesce *ecmd)
        return 0;
 }
 
+static int
+jme_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *ecmd)
+{
+       struct jme_adapter *jme = netdev_priv(netdev);
+       struct dynpcc_info *dpi = &(jme->dpi);
+
+       if(ecmd->use_adaptive_rx_coalesce
+       && (jme->flags & JME_FLAG_POLL)) {
+               jme->flags &= ~JME_FLAG_POLL;
+               napi_disable(&jme->napi);
+               dpi->cur                = PCC_P1;
+               dpi->attempt            = PCC_P1;
+               dpi->cnt                = 0;
+               jme_set_rx_pcc(jme, PCC_P1);
+               jme_interrupt_mode(jme);
+       }
+       else if(!(ecmd->use_adaptive_rx_coalesce)
+       && !(jme->flags & JME_FLAG_POLL)) {
+               jme->flags |= JME_FLAG_POLL;
+               napi_enable(&jme->napi);
+               jme_interrupt_mode(jme);
+       }
+
+       return 0;
+}
+
 static void
 jme_get_pauseparam(struct net_device *netdev,
                        struct ethtool_pauseparam *ecmd)
@@ -1599,7 +2070,9 @@ jme_get_pauseparam(struct net_device *netdev,
        spin_lock_irqsave(&jme->phy_lock, flags);
         val = jme_mdio_read(jme->dev, jme->mii_if.phy_id, MII_ADVERTISE);
        spin_unlock_irqrestore(&jme->phy_lock, flags);
-       ecmd->autoneg = (val & (ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM)) != 0;
+
+       ecmd->autoneg =
+               (val & (ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM)) != 0;
 }
 
 static int
@@ -1636,7 +2109,7 @@ jme_set_pauseparam(struct net_device *netdev,
 
        spin_lock_irqsave(&jme->phy_lock, flags);
         val = jme_mdio_read(jme->dev, jme->mii_if.phy_id, MII_ADVERTISE);
-       if( ((val & (ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM)) != 0) != 
+       if( ((val & (ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM)) != 0) !=
                (ecmd->autoneg != 0)) {
 
                if(ecmd->autoneg)
@@ -1644,23 +2117,68 @@ jme_set_pauseparam(struct net_device *netdev,
                else
                        val &= ~(ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM);
 
-               jme_mdio_write(jme->dev, jme->mii_if.phy_id, MII_ADVERTISE, val);
+               jme_mdio_write(jme->dev, jme->mii_if.phy_id,
+                               MII_ADVERTISE, val);
        }
        spin_unlock_irqrestore(&jme->phy_lock, flags);
 
        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)
 {
        struct jme_adapter *jme = netdev_priv(netdev);
        int rc;
+       unsigned long flags;
 
-       spin_lock(&jme->phy_lock);
+       spin_lock_irqsave(&jme->phy_lock, flags);
        rc = mii_ethtool_gset(&(jme->mii_if), ecmd);
-       spin_unlock(&jme->phy_lock);
+       spin_unlock_irqrestore(&jme->phy_lock, flags);
        return rc;
 }
 
@@ -1669,16 +2187,29 @@ jme_set_settings(struct net_device *netdev,
                     struct ethtool_cmd *ecmd)
 {
        struct jme_adapter *jme = netdev_priv(netdev);
-       int rc;
+       int rc, fdc=0;
        unsigned long flags;
 
        if(ecmd->speed == SPEED_1000 && ecmd->autoneg != AUTONEG_ENABLE)
                return -EINVAL;
 
+       if(jme->mii_if.force_media &&
+       ecmd->autoneg != AUTONEG_ENABLE &&
+       (jme->mii_if.full_duplex != ecmd->duplex))
+               fdc = 1;
+
        spin_lock_irqsave(&jme->phy_lock, flags);
        rc = mii_ethtool_sset(&(jme->mii_if), ecmd);
        spin_unlock_irqrestore(&jme->phy_lock, flags);
 
+       if(!rc && fdc)
+               jme_reset_link(jme);
+
+       if(!rc) {
+               jme->flags |= JME_FLAG_SSET;
+               jme->old_ecmd = *ecmd;
+       }
+
        return rc;
 }
 
@@ -1702,7 +2233,7 @@ jme_set_rx_csum(struct net_device *netdev, u32 on)
 {
         struct jme_adapter *jme = netdev_priv(netdev);
        unsigned long flags;
-       
+
        spin_lock_irqsave(&jme->rxmcs_lock, flags);
        if(on)
                jme->reg_rxmcs |= RXMCS_CHECKSUM;
@@ -1717,14 +2248,39 @@ jme_set_rx_csum(struct net_device *netdev, u32 on)
 static int
 jme_set_tx_csum(struct net_device *netdev, u32 on)
 {
-       if(on)
-               netdev->features |= NETIF_F_HW_CSUM;
-       else
+        struct jme_adapter *jme = netdev_priv(netdev);
+
+       if(on) {
+               jme->flags |= JME_FLAG_TXCSUM;
+               if(netdev->mtu <= 1900)
+                       netdev->features |= NETIF_F_HW_CSUM;
+       }
+       else {
+               jme->flags &= ~JME_FLAG_TXCSUM;
                netdev->features &= ~NETIF_F_HW_CSUM;
+       }
 
        return 0;
 }
 
+static int
+jme_set_tso(struct net_device *netdev, u32 on)
+{
+        struct jme_adapter *jme = netdev_priv(netdev);
+
+        if (on) {
+               jme->flags |= JME_FLAG_TSO;
+               if(netdev->mtu <= 1900)
+                       netdev->features |= NETIF_F_TSO | NETIF_F_TSO6;
+       }
+        else {
+               jme->flags &= ~JME_FLAG_TSO;
+                netdev->features &= ~(NETIF_F_TSO | NETIF_F_TSO6);
+       }
+
+        return 0;
+}
+
 static int
 jme_nway_reset(struct net_device *netdev)
 {
@@ -1738,14 +2294,19 @@ static const struct ethtool_ops jme_ethtool_ops = {
        .get_regs_len           = jme_get_regs_len,
        .get_regs               = jme_get_regs,
        .get_coalesce           = jme_get_coalesce,
+       .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,
        .get_rx_csum            = jme_get_rx_csum,
        .set_rx_csum            = jme_set_rx_csum,
        .set_tx_csum            = jme_set_tx_csum,
+       .set_tso                = jme_set_tso,
+       .set_sg                 = ethtool_op_set_sg,
        .nway_reset             = jme_nway_reset,
 };
 
@@ -1753,20 +2314,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)
@@ -1810,21 +2383,27 @@ 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;
        }
        netdev->open                    = jme_open;
        netdev->stop                    = jme_close;
        netdev->hard_start_xmit         = jme_start_xmit;
-       netdev->irq                     = pdev->irq;
        netdev->set_mac_address         = jme_set_macaddr;
        netdev->set_multicast_list      = jme_set_multi;
        netdev->change_mtu              = jme_change_mtu;
        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_SG |
+                                               NETIF_F_TSO |
+                                               NETIF_F_TSO6 |
+                                               NETIF_F_HW_VLAN_TX |
+                                               NETIF_F_HW_VLAN_RX;
        if(using_dac)
                netdev->features        |=      NETIF_F_HIGHDMA;
 
@@ -1837,10 +2416,17 @@ jme_init_one(struct pci_dev *pdev,
        jme = netdev_priv(netdev);
        jme->pdev = pdev;
        jme->dev = netdev;
+       jme->old_mtu = netdev->mtu = 1500;
        jme->phylink = 0;
+       jme->tx_ring_size = 1 << 10;
+       jme->tx_ring_mask = jme->tx_ring_size - 1;
+       jme->tx_wake_threshold = 1 << 9;
+       jme->rx_ring_size = 1 << 9;
+       jme->rx_ring_mask = jme->rx_ring_size - 1;
        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;
        }
@@ -1848,20 +2434,25 @@ 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;
        }
 
-       spin_lock_init(&jme->tx_lock);
+       netif_napi_add(netdev, &jme->napi, jme_poll, jme->rx_ring_size >> 2);
+
        spin_lock_init(&jme->phy_lock);
        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);
+       atomic_set(&jme->rx_empty, 1);
 
+       tasklet_init(&jme->pcc_task,
+                    &jme_pcc_tasklet,
+                    (unsigned long) jme);
        tasklet_init(&jme->linkch_task,
                     &jme_link_change_tasklet,
                     (unsigned long) jme);
@@ -1883,8 +2474,12 @@ jme_init_one(struct pci_dev *pdev,
        jme->dpi.cur = PCC_P1;
 
        jme->reg_ghc = GHC_DPX | GHC_SPEED_1000M;
+       jme->reg_rxcs = RXCS_DEFAULT;
        jme->reg_rxmcs = RXMCS_DEFAULT;
        jme->reg_txpfc = 0;
+       jme->reg_pmcs = PMCS_LFEN | PMCS_LREN | PMCS_MFEN;
+       jme->flags = JME_FLAG_TXCSUM | JME_FLAG_TSO | JME_FLAG_POLL;
+
        /*
         * Get Max Read Req Size from PCI Config Space
         */
@@ -1906,12 +2501,13 @@ 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) {
                printk(KERN_ERR PFX
-                       "Rload eeprom for reading MAC Address error.\n");
+                       "Reload eeprom for reading MAC Address error.\n");
                goto err_out_free_shadow;
        }
        jme_load_macaddr(netdev);
@@ -1980,6 +2576,92 @@ 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;
+
+               if(jme->flags & JME_FLAG_POLL) {
+                       jme_polling_mode(jme);
+                       napi_disable(&jme->napi);
+               }
+       }
+
+
+       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) },
        { }
@@ -1990,12 +2672,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
@@ -2021,4 +2701,3 @@ MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
 MODULE_DEVICE_TABLE(pci, jme_pci_tbl);
 
-