[PATCH] jme: Fix FIFO flush issue master
authorGuo-Fu Tseng <cooldavid@cooldavid.org>
Wed, 22 Feb 2012 18:29:34 +0000 (02:29 +0800)
committerGuo-Fu Tseng <cooldavid@cooldavid.org>
Wed, 22 Feb 2012 18:29:34 +0000 (02:29 +0800)
Set the RX FIFO flush watermark lower.
According to Federico and JMicron's reply,
setting it to 16QW would be stable on most platforms.
Otherwise, user might experience packet drop issue.

CC: stable@kernel.org
Reported-by: Federico Quagliata <federico@quagliata.org>
Fixed-by: Federico Quagliata <federico@quagliata.org>
Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org>
jme.c
jme.h

diff --git a/jme.c b/jme.c
index 904dadb62237f4fc6d06baf95cf61b20e6e3e8f1..6ab8a2e30838ed0a9ff61ad6de9b2bf2ce5a031c 100644 (file)
--- a/jme.c
+++ b/jme.c
@@ -2328,19 +2328,11 @@ jme_change_mtu(struct net_device *netdev, int new_mtu)
                ((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);
-       }
 
        netdev->mtu = new_mtu;
        netdev_update_features(netdev);
 
+       jme_restart_rx_engine(jme);
        jme_reset_link(jme);
 
        return 0;
diff --git a/jme.h b/jme.h
index 4304072bd3c536e852a38cf6c37716df8500ed66..3efc897c991310c637353aaed01c9516575a02d9 100644 (file)
--- a/jme.h
+++ b/jme.h
@@ -730,7 +730,7 @@ enum jme_rxcs_values {
        RXCS_RETRYCNT_60        = 0x00000F00,
 
        RXCS_DEFAULT            = RXCS_FIFOTHTP_128T |
-                                 RXCS_FIFOTHNP_128QW |
+                                 RXCS_FIFOTHNP_16QW |
                                  RXCS_DMAREQSZ_128B |
                                  RXCS_RETRYGAP_256ns |
                                  RXCS_RETRYCNT_32,