[PATCH net-next 0/2] sh_eth Updates

[PATCH net-next 0/2] sh_eth Updates

[Simon Horman]

Hi,

please consider the following updates to the sh_eth driver
by Abe-san. They were developed during his testing of the
driver on the r8a7790/lager board.

Kouei Abe (2):
  sh_eth: Fix cache invalidation omission of receive buffer
  sh_eth: Enable Rx descriptor word 0 shift for r8a7790

 drivers/net/ethernet/renesas/sh_eth.c | 3 +++
 1 file changed, 3 insertions(+)

-- 
1.8.3.2

[PATCH net-next 1/2] sh_eth: Fix cache invalidation omission of receive buffer

[Simon Horman]

From: Kouei Abe <kouei.abe.cp@renesas.com>

Signed-off-by: Kouei Abe <kouei.abe.cp@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 drivers/net/ethernet/renesas/sh_eth.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index c357076..f386a8f 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -1342,6 +1342,8 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota)
 			mdp->rx_skbuff[entry] = NULL;
 			if (mdp->cd->rpadir)
 				skb_reserve(skb, NET_IP_ALIGN);
+			dma_sync_single_for_cpu(&ndev->dev, rxdesc->addr,
+				mdp->rx_buf_sz,	DMA_FROM_DEVICE);
 			skb_put(skb, pkt_len);
 			skb->protocol = eth_type_trans(skb, ndev);
 			netif_rx(skb);
-- 
1.8.3.2

Re: [PATCH net-next 1/2] sh_eth: Fix cache invalidation omission of receive buffer

[David Miller]

From: Simon Horman <horms+renesas@verge.net.au>
Date: Wed, 28 Aug 2013 09:43:08 +0900

> From: Kouei Abe <kouei.abe.cp@renesas.com>
> 
> Signed-off-by: Kouei Abe <kouei.abe.cp@renesas.com>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> ---
>  drivers/net/ethernet/renesas/sh_eth.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
> index c357076..f386a8f 100644
> --- a/drivers/net/ethernet/renesas/sh_eth.c
> +++ b/drivers/net/ethernet/renesas/sh_eth.c
> @@ -1342,6 +1342,8 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota)
>  			mdp->rx_skbuff[entry] = NULL;
>  			if (mdp->cd->rpadir)
>  				skb_reserve(skb, NET_IP_ALIGN);
> +			dma_sync_single_for_cpu(&ndev->dev, rxdesc->addr,
> +				mdp->rx_buf_sz,	DMA_FROM_DEVICE);

Please indent the second line of the dma sync call properly.

The arguments should start at the first column after the openning
parenthesis of the function call on the first line, using the
appropriate number of TAB then space characters (as needed).

Thanks.

Re: [PATCH net-next 1/2] sh_eth: Fix cache invalidation omission of receive buffer

[Simon Horman]

On Thu, Aug 29, 2013 at 04:15:53PM -0400, David Miller wrote:
> From: Simon Horman <horms+renesas@verge.net.au>
> Date: Wed, 28 Aug 2013 09:43:08 +0900
> 
> > From: Kouei Abe <kouei.abe.cp@renesas.com>
> > 
> > Signed-off-by: Kouei Abe <kouei.abe.cp@renesas.com>
> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> > ---
> >  drivers/net/ethernet/renesas/sh_eth.c | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
> > index c357076..f386a8f 100644
> > --- a/drivers/net/ethernet/renesas/sh_eth.c
> > +++ b/drivers/net/ethernet/renesas/sh_eth.c
> > @@ -1342,6 +1342,8 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota)
> >  			mdp->rx_skbuff[entry] = NULL;
> >  			if (mdp->cd->rpadir)
> >  				skb_reserve(skb, NET_IP_ALIGN);
> > +			dma_sync_single_for_cpu(&ndev->dev, rxdesc->addr,
> > +				mdp->rx_buf_sz,	DMA_FROM_DEVICE);
> 
> Please indent the second line of the dma sync call properly.
> 
> The arguments should start at the first column after the openning
> parenthesis of the function call on the first line, using the
> appropriate number of TAB then space characters (as needed).

Sorry for missing that. I'll fix it up and re-post.

[PATCH net-next 2/2] sh_eth: Enable Rx descriptor word 0 shift for r8a7790

[Simon Horman]

From: Kouei Abe <kouei.abe.cp@renesas.com>

This corrects an oversight when r8a7790 support was added to sh_eth.

Signed-off-by: Kouei Abe <kouei.abe.cp@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 drivers/net/ethernet/renesas/sh_eth.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index f386a8f..095ca8e 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -416,6 +416,7 @@ static struct sh_eth_cpu_data r8a7790_data = {
 	.tpauser	= 1,
 	.hw_swap	= 1,
 	.rmiimode	= 1,
+	.shift_rd0	= 1,
 };
 
 static void sh_eth_set_rate_sh7724(struct net_device *ndev)
-- 
1.8.3.2

Re: [PATCH net-next 2/2] sh_eth: Enable Rx descriptor word 0 shift for r8a7790

[Sergei Shtylyov]

Hello.

On 08/28/2013 04:43 AM, Simon Horman wrote:

> From: Kouei Abe <kouei.abe.cp@renesas.com>

> This corrects an oversight when r8a7790 support was added to sh_eth.

    No wonder it was overseen -- it's undocumented as of version 0.60 of the 
manual.

> Signed-off-by: Kouei Abe <kouei.abe.cp@renesas.com>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> ---
>   drivers/net/ethernet/renesas/sh_eth.c | 1 +
>   1 file changed, 1 insertion(+)

> diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
> index f386a8f..095ca8e 100644
> --- a/drivers/net/ethernet/renesas/sh_eth.c
> +++ b/drivers/net/ethernet/renesas/sh_eth.c
> @@ -416,6 +416,7 @@ static struct sh_eth_cpu_data r8a7790_data = {
>   	.tpauser	= 1,
>   	.hw_swap	= 1,
>   	.rmiimode	= 1,
> +	.shift_rd0	= 1,

    I've seen the corresponding code in a Renesas BSP but wanted to double 
check before sending...

WBR, Sergei

Re: [PATCH net-next 2/2] sh_eth: Enable Rx descriptor word 0 shift for r8a7790

[Simon Horman]

On Wed, Aug 28, 2013 at 07:05:46PM +0400, Sergei Shtylyov wrote:
> Hello.
> 
> On 08/28/2013 04:43 AM, Simon Horman wrote:
> 
> >From: Kouei Abe <kouei.abe.cp@renesas.com>
> 
> >This corrects an oversight when r8a7790 support was added to sh_eth.
> 
>    No wonder it was overseen -- it's undocumented as of version 0.60
> of the manual.
> 
> >Signed-off-by: Kouei Abe <kouei.abe.cp@renesas.com>
> >Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> >---
> >  drivers/net/ethernet/renesas/sh_eth.c | 1 +
> >  1 file changed, 1 insertion(+)
> 
> >diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
> >index f386a8f..095ca8e 100644
> >--- a/drivers/net/ethernet/renesas/sh_eth.c
> >+++ b/drivers/net/ethernet/renesas/sh_eth.c
> >@@ -416,6 +416,7 @@ static struct sh_eth_cpu_data r8a7790_data = {
> >  	.tpauser	= 1,
> >  	.hw_swap	= 1,
> >  	.rmiimode	= 1,
> >+	.shift_rd0	= 1,
> 
>    I've seen the corresponding code in a Renesas BSP but wanted to
> double check before sending...

That is entirely reasonable.

I think that this email from Abe-san can count as a double-check.