Skip to content

Commit 9b4a636

Browse files
bwh-ctdavem330
authored andcommitted
Revert "sh_eth: Enable Rx descriptor word 0 shift for r8a7790"
This reverts commit fd9af07. The hardware manual states that the frame error and multicast bits are copied to bits 9:0 of RD0, not bits 25:16. I've tested that this is true for RFS1 (CRC error), RFS3 (frame too short), RFS4 (frame too long) and RFS8 (multicast). Also adjust a comment to agree with this. Signed-off-by: Ben Hutchings <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 6ded286 commit 9b4a636

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

drivers/net/ethernet/renesas/sh_eth.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,6 @@ static struct sh_eth_cpu_data r8a779x_data = {
508508
.tpauser = 1,
509509
.hw_swap = 1,
510510
.rmiimode = 1,
511-
.shift_rd0 = 1,
512511
};
513512

514513
static void sh_eth_set_rate_sh7724(struct net_device *ndev)
@@ -1462,8 +1461,8 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota)
14621461

14631462
/* In case of almost all GETHER/ETHERs, the Receive Frame State
14641463
* (RFS) bits in the Receive Descriptor 0 are from bit 9 to
1465-
* bit 0. However, in case of the R8A7740, R8A779x, and
1466-
* R7S72100 the RFS bits are from bit 25 to bit 16. So, the
1464+
* bit 0. However, in case of the R8A7740 and R7S72100
1465+
* the RFS bits are from bit 25 to bit 16. So, the
14671466
* driver needs right shifting by 16.
14681467
*/
14691468
if (mdp->cd->shift_rd0)

0 commit comments

Comments
 (0)