Skip to contentSkip to conversation

net: sh_eth: fix incorrect RX length error if R8A7740

PATCH Applied Shimoda, Yoshihiro 4 participants 4 messages Jun 13, 2013 – Jun 14, 2013

Subsystems (4)
Networking Network drivers SuperH Renesas SuperH Ethernet driver
lore
Share & tools
lore

Shimoda, Yoshihiro

author
#0 lore raw

PATCH v2 1/1 net: sh_eth: fix incorrect RX length error if R8A7740

This patch fixes an issue that the driver increments the "RX length error" on every buffer in sh_eth_rx() if the R8A7740.
This patch also adds a description about the Receive Frame Status bits.

Signed-off-by Yoshihiro Shimoda <[email protected]>

---
About v2:
- This patch is based on the latest net.git.
- Fix the description.

 drivers/net/ethernet/renesas/sh_eth.c |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)
drivers/net/ethernet/renesas/sh_eth.c +11 -4
index b4479b5..5e3982f 100644
@@ -1401,16 +1401,23 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status)
 		desc_status = edmac_to_cpu(mdp, rxdesc->status);
 		pkt_len = rxdesc->frame_length;
 
-#if defined(CONFIG_ARCH_R8A7740)
-		desc_status >>= 16;
-#endif
-
 		if (--boguscnt < 0)
 			break;
 
 		if (!(desc_status & RDFEND))
 			ndev->stats.rx_length_errors++;
 
+#if defined(CONFIG_ARCH_R8A7740)
+		/*
+		 * In case of almost all GETHER/ETHERs, the Receive Frame State
+		 * (RFS) bits in the Receive Descriptor 0 are from bit 9 to
+		 * bit 0. However, in case of the R8A7740's GETHER, the RFS
+		 * bits are from bit 25 to bit 16. So, the driver needs right
+		 * shifting by 16.
+		 */
+		desc_status >>= 16;
+#endif
+
 		if (desc_status & (RD_RFS1 | RD_RFS2 | RD_RFS3 | RD_RFS4 |
 				   RD_RFS5 | RD_RFS6 | RD_RFS10)) {
 			ndev->stats.rx_errors++;
Signature · 1 line
1.7.1
maintainer Applied
#1 lore raw

From: "Shimoda, Yoshihiro" <[email protected]>
Date: Thu, 13 Jun 2013 10:15:45 +0900

Quoted 5 lines

This patch fixes an issue that the driver increments the "RX length error" on every buffer in sh_eth_rx() if the R8A7740.
This patch also adds a description about the Receive Frame Status bits.

Signed-off-by Yoshihiro Shimoda <[email protected]>

Applied, thanks.

#2 lore raw

Hello.

Quoted 7 lines · David Miller
Quoted 5 lines

This patch fixes an issue that the driver increments the "RX length error" on every buffer in sh_eth_rx() if the R8A7740.
This patch also adds a description about the Receive Frame Status bits.

Signed-off-by Yoshihiro Shimoda <[email protected]>

Applied, thanks.

I've already asked to do this but will you queue this for stable now?

WBR, Sergei

#3 lore raw

From: Sergei Shtylyov <[email protected]>
Date: Thu, 13 Jun 2013 21:45:16 +0400

Quoted 10 lines

Hello.

Quoted 5 lines · David Miller
Quoted 5 lines

This patch fixes an issue that the driver increments the "RX length error"
on every buffer in sh_eth_rx() if the R8A7740.
This patch also adds a description about the Receive Frame Status bits.

Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Yoshihiro Shimoda <[email protected]>

Applied, thanks.

I've already asked to do this but will you queue this for stable now?

Done.