linux-mips
[Top] [All Lists]

Re: [PATCH] Fix for Au1x00 ethernet tx stats

To: linux-mips@linux-mips.org
Subject: Re: [PATCH] Fix for Au1x00 ethernet tx stats
From: Sergei Shtylylov <sshtylyov@ru.mvista.com>
Date: Tue, 14 Mar 2006 05:21:35 +0300
Cc: Jordan Crouse <jordan.crouse@amd.com>
In-reply-to: <41F11AB7.3010105@corelatus.se>
Organization: MontaVista Software Inc.
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <41F11AB7.3010105@corelatus.se>
Sender: linux-mips-bounce@linux-mips.org
User-agent: Mozilla/5.0 (X11; U; Linux i686; rv:1.7.2) Gecko/20040803
Hello.

Thomas Lange wrote:
With current CVS head, ethernet TX bytes always remain zero.

The problem seems to be that when packet has been transmitted,
the len word in DMA buffer is zero.

Attached is a patch against 2_4 HEAD that updates the stats when
DMA buffer is written to fix this.

* Patch by Thomas Lange, 21 Jan 2005:
 Fix update of ethernet tx bytes stats for au1x00

     More than a year ago, this is still an issue with both 2.4 and 2.6 driver.
Here's the 2.6 patch...

/Thomas

WBR, Sergei

Signed-off-by: Thomas Lange <thomas@corelatus.se>
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>

diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
index cd0b1dc..a4df316 100644
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -90,7 +90,7 @@ static void au1000_tx_timeout(struct net
 static int au1000_set_config(struct net_device *dev, struct ifmap *map);
 static void set_rx_mode(struct net_device *);
 static struct net_device_stats *au1000_get_stats(struct net_device *);
-static inline void update_tx_stats(struct net_device *, u32, u32);
+static inline void update_tx_stats(struct net_device *, u32);
 static inline void update_rx_stats(struct net_device *, u32);
 static void au1000_timer(unsigned long);
 static int au1000_ioctl(struct net_device *, struct ifreq *, int);
@@ -1827,14 +1827,11 @@ static void __exit au1000_cleanup_module
 
 
 static inline void 
-update_tx_stats(struct net_device *dev, u32 status, u32 pkt_len)
+update_tx_stats(struct net_device *dev, u32 status)
 {
        struct au1000_private *aup = (struct au1000_private *) dev->priv;
        struct net_device_stats *ps = &aup->stats;
 
-       ps->tx_packets++;
-       ps->tx_bytes += pkt_len;
-
        if (status & TX_FRAME_ABORTED) {
                if (dev->if_port == IF_PORT_100BASEFX) {
                        if (status & (TX_JAB_TIMEOUT | TX_UNDERRUN)) {
@@ -1867,7 +1864,7 @@ static void au1000_tx_ack(struct net_dev
        ptxd = aup->tx_dma_ring[aup->tx_tail];
 
        while (ptxd->buff_stat & TX_T_DONE) {
-               update_tx_stats(dev, ptxd->status, ptxd->len & 0x3ff);
+               update_tx_stats(dev, ptxd->status);
                ptxd->buff_stat &= ~TX_T_DONE;
                ptxd->len = 0;
                au_sync();
@@ -1889,6 +1886,7 @@ static void au1000_tx_ack(struct net_dev
 static int au1000_tx(struct sk_buff *skb, struct net_device *dev)
 {
        struct au1000_private *aup = (struct au1000_private *) dev->priv;
+       struct net_device_stats *ps = &aup->stats;
        volatile tx_dma_t *ptxd;
        u32 buff_stat;
        db_dest_t *pDB;
@@ -1908,7 +1906,7 @@ static int au1000_tx(struct sk_buff *skb
                return 1;
        }
        else if (buff_stat & TX_T_DONE) {
-               update_tx_stats(dev, ptxd->status, ptxd->len & 0x3ff);
+               update_tx_stats(dev, ptxd->status);
                ptxd->len = 0;
        }
 
@@ -1928,6 +1926,9 @@ static int au1000_tx(struct sk_buff *skb
        else
                ptxd->len = skb->len;
 
+       ps->tx_packets++;
+       ps->tx_bytes += ptxd->len;
+
        ptxd->buff_stat = pDB->dma_addr | TX_DMA_ENABLE;
        au_sync();
        dev_kfree_skb(skb);

<Prev in Thread] Current Thread [Next in Thread>