Skip to contentSkip to conversation

Fix for Au1x00 ethernet tx stats

PATCH In review Thomas Lange 2 participants 3 messages Jan 21, 2005 – Mar 24, 2006

Subsystems (2)
Network drivers MIPS
lore
Share & tools
lore

Thomas Lange

author
#0 lore raw

PATCH 1/1 Fix for Au1x00 ethernet tx stats

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

/Thomas

Index: au1000_eth.c
===================================================================
RCS file: /home/cvs/linux/drivers/net/au1000_eth.c,v retrieving revision 1.5.2.33

au1000_eth.c +8 -7
diff -p -u -r1.5.2.33 au1000_eth.c
@@ -83,7 +83,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);

@@ -1542,14 +1542,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)) {

@@ -1582,7 +1579,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();

@@ -1604,6 +1601,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;

@@ -1623,7 +1621,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;
 	}
 

@@ -1643,6 +1641,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);
#1 lore raw

Hello.

Quoted 10 lines · Thomas Lange

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...

Quoted 1 line

/Thomas

WBR, Sergei

Signed-off-by Thomas Lange <[email protected]>
Signed-off-by Sergei Shtylyov <[email protected]>
drivers/net/au1000_eth.c +8 -7
index cd0b1dc..a4df316 100644
@@ -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);
#2 lore raw

Hello.

Quoted 10 lines · Sergei Shtylylov
Quoted 8 lines · Thomas Lange

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.

Quoted 7 lines
Quoted 2 lines

* 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...

It's in the Linus' tree now. Will send 2.4 patch to Marcelo...

Quoted 1 line
Quoted 1 line

/Thomas

WBR, Sergei