* [PATCH] net: sh_eth: fix the rxdesc pointer when rx descriptor empty happens @ 2012-05-29 9:07 Shimoda, Yoshihiro 2012-05-29 21:23 ` David Miller 2012-06-20 13:10 ` Guennadi Liakhovetski 0 siblings, 2 replies; 6+ messages in thread From: Shimoda, Yoshihiro @ 2012-05-29 9:07 UTC (permalink / raw) To: netdev; +Cc: SH-Linux When Receive Descriptor Empty happens, rxdesc pointer of the driver and actual next descriptor of the controller may be mismatch. This patch fixes it. Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> --- drivers/net/ethernet/renesas/sh_eth.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index be3c221..667169b 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -1101,8 +1101,12 @@ static int sh_eth_rx(struct net_device *ndev) /* Restart Rx engine if stopped. */ /* If we don't need to check status, don't. -KDU */ - if (!(sh_eth_read(ndev, EDRRR) & EDRRR_R)) + if (!(sh_eth_read(ndev, EDRRR) & EDRRR_R)) { + /* fix the values for the next receiving */ + mdp->cur_rx = mdp->dirty_rx = (sh_eth_read(ndev, RDFAR) - + sh_eth_read(ndev, RDLAR)) >> 4; sh_eth_write(ndev, EDRRR_R, EDRRR); + } return 0; } @@ -1199,8 +1203,6 @@ static void sh_eth_error(struct net_device *ndev, int intr_status) /* Receive Descriptor Empty int */ ndev->stats.rx_over_errors++; - if (sh_eth_read(ndev, EDRRR) ^ EDRRR_R) - sh_eth_write(ndev, EDRRR_R, EDRRR); if (netif_msg_rx_err(mdp)) dev_err(&ndev->dev, "Receive Descriptor Empty\n"); } -- 1.7.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] net: sh_eth: fix the rxdesc pointer when rx descriptor empty happens 2012-05-29 9:07 [PATCH] net: sh_eth: fix the rxdesc pointer when rx descriptor empty happens Shimoda, Yoshihiro @ 2012-05-29 21:23 ` David Miller 2012-06-20 13:10 ` Guennadi Liakhovetski 1 sibling, 0 replies; 6+ messages in thread From: David Miller @ 2012-05-29 21:23 UTC (permalink / raw) To: yoshihiro.shimoda.uh; +Cc: netdev, linux-sh From: "Shimoda, Yoshihiro" <yoshihiro.shimoda.uh@renesas.com> Date: Tue, 29 May 2012 18:07:55 +0900 > When Receive Descriptor Empty happens, rxdesc pointer of the driver > and actual next descriptor of the controller may be mismatch. > This patch fixes it. > > Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Applied. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] net: sh_eth: fix the rxdesc pointer when rx descriptor empty happens 2012-05-29 9:07 [PATCH] net: sh_eth: fix the rxdesc pointer when rx descriptor empty happens Shimoda, Yoshihiro 2012-05-29 21:23 ` David Miller @ 2012-06-20 13:10 ` Guennadi Liakhovetski 2012-06-21 1:26 ` Shimoda, Yoshihiro 1 sibling, 1 reply; 6+ messages in thread From: Guennadi Liakhovetski @ 2012-06-20 13:10 UTC (permalink / raw) To: Shimoda, Yoshihiro; +Cc: netdev, SH-Linux Hello Shimoda-san On Tue, 29 May 2012, Shimoda, Yoshihiro wrote: > When Receive Descriptor Empty happens, rxdesc pointer of the driver > and actual next descriptor of the controller may be mismatch. > This patch fixes it. Unfortunately, this patch breaks networking on ecovec (sh7724). Booting with dhcp and NFS-root progresses very slowly with lots of "nfs: server not responding / Ok" messages and never completes. Reverting it in current Linus' tree fixes the problem. Thanks Guennadi > > Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> > --- > drivers/net/ethernet/renesas/sh_eth.c | 8 +++++--- > 1 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c > index be3c221..667169b 100644 > --- a/drivers/net/ethernet/renesas/sh_eth.c > +++ b/drivers/net/ethernet/renesas/sh_eth.c > @@ -1101,8 +1101,12 @@ static int sh_eth_rx(struct net_device *ndev) > > /* Restart Rx engine if stopped. */ > /* If we don't need to check status, don't. -KDU */ > - if (!(sh_eth_read(ndev, EDRRR) & EDRRR_R)) > + if (!(sh_eth_read(ndev, EDRRR) & EDRRR_R)) { > + /* fix the values for the next receiving */ > + mdp->cur_rx = mdp->dirty_rx = (sh_eth_read(ndev, RDFAR) - > + sh_eth_read(ndev, RDLAR)) >> 4; > sh_eth_write(ndev, EDRRR_R, EDRRR); > + } > > return 0; > } > @@ -1199,8 +1203,6 @@ static void sh_eth_error(struct net_device *ndev, int intr_status) > /* Receive Descriptor Empty int */ > ndev->stats.rx_over_errors++; > > - if (sh_eth_read(ndev, EDRRR) ^ EDRRR_R) > - sh_eth_write(ndev, EDRRR_R, EDRRR); > if (netif_msg_rx_err(mdp)) > dev_err(&ndev->dev, "Receive Descriptor Empty\n"); > } > -- > 1.7.1 > -- > To unsubscribe from this list: send the line "unsubscribe linux-sh" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/ ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] net: sh_eth: fix the rxdesc pointer when rx descriptor empty happens 2012-06-20 13:10 ` Guennadi Liakhovetski @ 2012-06-21 1:26 ` Shimoda, Yoshihiro 2012-06-22 14:16 ` Guennadi Liakhovetski 0 siblings, 1 reply; 6+ messages in thread From: Shimoda, Yoshihiro @ 2012-06-21 1:26 UTC (permalink / raw) To: Guennadi Liakhovetski; +Cc: netdev, SH-Linux Hello Guennadi-san, 2012/06/20 22:10, Guennadi Liakhovetski wrote: > Hello Shimoda-san > > On Tue, 29 May 2012, Shimoda, Yoshihiro wrote: > >> When Receive Descriptor Empty happens, rxdesc pointer of the driver >> and actual next descriptor of the controller may be mismatch. >> This patch fixes it. > > Unfortunately, this patch breaks networking on ecovec (sh7724). Booting > with dhcp and NFS-root progresses very slowly with lots of "nfs: server > not responding / Ok" messages and never completes. Reverting it in current > Linus' tree fixes the problem. Thank you very much for the report. The SH7724 doesn't set the RMCR register. So, the EDRRR will be clear after the controller receives a freme every time. So, the "fix the rxdesc pointer" had to check a condition. I wrote a patch for the issue as the following. If possible, would you try the patch? Best regards, Yoshihiro Shimoda --- Subject: [PATCH] net: sh_eth: fix the condition to fix the cur_tx/dirty_rx The following commit couldn't work if the RMCR is not set to 1. "net: sh_eth: fix the rxdesc pointer when rx descriptor empty happens" commit id 79fba9f51755c704c0a7d7b7f0df10874dc0a744 If RMCR is not set, the controller will clear the EDRRR after it received a frame. In this case, the driver doesn't need to fix the value of cur_rx/dirty_rx. The driver only needs it when the controll detects receive descriptors are empty. Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> --- drivers/net/ethernet/renesas/sh_eth.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index 667169b..79bf09b 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -1011,7 +1011,7 @@ static int sh_eth_txfree(struct net_device *ndev) } /* Packet receive function */ -static int sh_eth_rx(struct net_device *ndev) +static int sh_eth_rx(struct net_device *ndev, u32 intr_status) { struct sh_eth_private *mdp = netdev_priv(ndev); struct sh_eth_rxdesc *rxdesc; @@ -1102,9 +1102,11 @@ static int sh_eth_rx(struct net_device *ndev) /* Restart Rx engine if stopped. */ /* If we don't need to check status, don't. -KDU */ if (!(sh_eth_read(ndev, EDRRR) & EDRRR_R)) { - /* fix the values for the next receiving */ - mdp->cur_rx = mdp->dirty_rx = (sh_eth_read(ndev, RDFAR) - - sh_eth_read(ndev, RDLAR)) >> 4; + /* fix the values for the next receiving if RDE is set */ + if (intr_status & EESR_RDE) + mdp->cur_rx = mdp->dirty_rx = + (sh_eth_read(ndev, RDFAR) - + sh_eth_read(ndev, RDLAR)) >> 4; sh_eth_write(ndev, EDRRR_R, EDRRR); } @@ -1273,7 +1275,7 @@ static irqreturn_t sh_eth_interrupt(int irq, void *netdev) EESR_RTSF | /* short frame recv */ EESR_PRE | /* PHY-LSI recv error */ EESR_CERF)){ /* recv frame CRC error */ - sh_eth_rx(ndev); + sh_eth_rx(ndev, intr_status); } /* Tx Check */ -- 1.7.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] net: sh_eth: fix the rxdesc pointer when rx descriptor empty happens 2012-06-21 1:26 ` Shimoda, Yoshihiro @ 2012-06-22 14:16 ` Guennadi Liakhovetski 2012-06-23 4:51 ` David Miller 0 siblings, 1 reply; 6+ messages in thread From: Guennadi Liakhovetski @ 2012-06-22 14:16 UTC (permalink / raw) To: Shimoda, Yoshihiro; +Cc: netdev, SH-Linux Hi Shimoda-san On Thu, 21 Jun 2012, Shimoda, Yoshihiro wrote: > Hello Guennadi-san, > > 2012/06/20 22:10, Guennadi Liakhovetski wrote: > > Hello Shimoda-san > > > > On Tue, 29 May 2012, Shimoda, Yoshihiro wrote: > > > >> When Receive Descriptor Empty happens, rxdesc pointer of the driver > >> and actual next descriptor of the controller may be mismatch. > >> This patch fixes it. > > > > Unfortunately, this patch breaks networking on ecovec (sh7724). Booting > > with dhcp and NFS-root progresses very slowly with lots of "nfs: server > > not responding / Ok" messages and never completes. Reverting it in current > > Linus' tree fixes the problem. > > Thank you very much for the report. > The SH7724 doesn't set the RMCR register. So, the EDRRR will be clear after > the controller receives a freme every time. > So, the "fix the rxdesc pointer" had to check a condition. > > I wrote a patch for the issue as the following. > If possible, would you try the patch? Yes, it does seem to fix the problem. Tested-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Thanks Guennadi > > Best regards, > Yoshihiro Shimoda > --- > Subject: [PATCH] net: sh_eth: fix the condition to fix the cur_tx/dirty_rx > > The following commit couldn't work if the RMCR is not set to 1. > > "net: sh_eth: fix the rxdesc pointer when rx descriptor empty happens" > commit id 79fba9f51755c704c0a7d7b7f0df10874dc0a744 > > If RMCR is not set, the controller will clear the EDRRR after it received > a frame. In this case, the driver doesn't need to fix the value of > cur_rx/dirty_rx. The driver only needs it when the controll detects > receive descriptors are empty. > > Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> > --- > drivers/net/ethernet/renesas/sh_eth.c | 12 +++++++----- > 1 files changed, 7 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c > index 667169b..79bf09b 100644 > --- a/drivers/net/ethernet/renesas/sh_eth.c > +++ b/drivers/net/ethernet/renesas/sh_eth.c > @@ -1011,7 +1011,7 @@ static int sh_eth_txfree(struct net_device *ndev) > } > > /* Packet receive function */ > -static int sh_eth_rx(struct net_device *ndev) > +static int sh_eth_rx(struct net_device *ndev, u32 intr_status) > { > struct sh_eth_private *mdp = netdev_priv(ndev); > struct sh_eth_rxdesc *rxdesc; > @@ -1102,9 +1102,11 @@ static int sh_eth_rx(struct net_device *ndev) > /* Restart Rx engine if stopped. */ > /* If we don't need to check status, don't. -KDU */ > if (!(sh_eth_read(ndev, EDRRR) & EDRRR_R)) { > - /* fix the values for the next receiving */ > - mdp->cur_rx = mdp->dirty_rx = (sh_eth_read(ndev, RDFAR) - > - sh_eth_read(ndev, RDLAR)) >> 4; > + /* fix the values for the next receiving if RDE is set */ > + if (intr_status & EESR_RDE) > + mdp->cur_rx = mdp->dirty_rx = > + (sh_eth_read(ndev, RDFAR) - > + sh_eth_read(ndev, RDLAR)) >> 4; > sh_eth_write(ndev, EDRRR_R, EDRRR); > } > > @@ -1273,7 +1275,7 @@ static irqreturn_t sh_eth_interrupt(int irq, void *netdev) > EESR_RTSF | /* short frame recv */ > EESR_PRE | /* PHY-LSI recv error */ > EESR_CERF)){ /* recv frame CRC error */ > - sh_eth_rx(ndev); > + sh_eth_rx(ndev, intr_status); > } > > /* Tx Check */ > -- > 1.7.1 > --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/ ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] net: sh_eth: fix the rxdesc pointer when rx descriptor empty happens 2012-06-22 14:16 ` Guennadi Liakhovetski @ 2012-06-23 4:51 ` David Miller 0 siblings, 0 replies; 6+ messages in thread From: David Miller @ 2012-06-23 4:51 UTC (permalink / raw) To: g.liakhovetski; +Cc: yoshihiro.shimoda.uh, netdev, linux-sh From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Date: Fri, 22 Jun 2012 16:16:38 +0200 (CEST) > Hi Shimoda-san > > On Thu, 21 Jun 2012, Shimoda, Yoshihiro wrote: > >> Hello Guennadi-san, >> >> 2012/06/20 22:10, Guennadi Liakhovetski wrote: >> > Hello Shimoda-san >> > >> > On Tue, 29 May 2012, Shimoda, Yoshihiro wrote: >> > >> >> When Receive Descriptor Empty happens, rxdesc pointer of the driver >> >> and actual next descriptor of the controller may be mismatch. >> >> This patch fixes it. >> > >> > Unfortunately, this patch breaks networking on ecovec (sh7724). Booting >> > with dhcp and NFS-root progresses very slowly with lots of "nfs: server >> > not responding / Ok" messages and never completes. Reverting it in current >> > Linus' tree fixes the problem. >> >> Thank you very much for the report. >> The SH7724 doesn't set the RMCR register. So, the EDRRR will be clear after >> the controller receives a freme every time. >> So, the "fix the rxdesc pointer" had to check a condition. >> >> I wrote a patch for the issue as the following. >> If possible, would you try the patch? > > Yes, it does seem to fix the problem. > > Tested-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Applied, thanks. ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-06-23 4:51 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-05-29 9:07 [PATCH] net: sh_eth: fix the rxdesc pointer when rx descriptor empty happens Shimoda, Yoshihiro 2012-05-29 21:23 ` David Miller 2012-06-20 13:10 ` Guennadi Liakhovetski 2012-06-21 1:26 ` Shimoda, Yoshihiro 2012-06-22 14:16 ` Guennadi Liakhovetski 2012-06-23 4:51 ` David Miller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).