Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93f0fa75 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by David S. Miller
Browse files

sh_eth: add EDMR.NBST support 



The R-Car V3H (AKA R8A77980) GEther controller adds the DMA burst mode bit
(NBST) in EDMR and the manual tells to always set it before doing any DMA.

Based on the original (and large) patch by Vladimir Barinov.

Signed-off-by: default avatarVladimir Barinov <vladimir.barinov@cogentembedded.com>
Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 230c1846

drivers/net/ethernet/renesas/sh_eth.c

+4 −0
Original line number Diff line number Diff line
@@ -1434,6 +1434,10 @@ static int sh_eth_dev_init(struct net_device *ndev) 


	sh_eth_write(ndev, mdp->cd->trscer_err_mask, TRSCER);



	/* DMA transfer burst mode */

	if (mdp->cd->nbst)

		sh_eth_modify(ndev, EDMR, EDMR_NBST, EDMR_NBST);



	if (mdp->cd->bculr)

		sh_eth_write(ndev, 0x800, BCULR);	/* Burst sycle set */

drivers/net/ethernet/renesas/sh_eth.h

+2 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ enum GECMR_BIT { 


/* EDMR */

enum DMAC_M_BIT {

	EDMR_NBST = 0x80,

	EDMR_EL = 0x40, /* Litte endian */

	EDMR_DL1 = 0x20, EDMR_DL0 = 0x10,

	EDMR_SRST_GETHER = 0x03,
@@ -505,6 +506,7 @@ struct sh_eth_cpu_data { 
	unsigned bculr:1;	/* EtherC have BCULR */

	unsigned tsu:1;		/* EtherC have TSU */

	unsigned hw_swap:1;	/* E-DMAC have DE bit in EDMR */

	unsigned nbst:1;	/* E-DMAC has NBST bit in EDMR */

	unsigned rpadir:1;	/* E-DMAC have RPADIR */

	unsigned no_trimd:1;	/* E-DMAC DO NOT have TRIMD */

	unsigned no_ade:1;	/* E-DMAC DO NOT have ADE bit in EESR */