Message ID | 20180417085030.32650-3-horms+renesas@verge.net.au (mailing list archive) |
---|---|
State | Under Review |
Delegated to: | Geert Uytterhoeven |
Headers | show |
> @@ -2302,6 +2305,7 @@ static int __maybe_unused ravb_resume(struct device *dev) > { > struct net_device *ndev = dev_get_drvdata(dev); > struct ravb_private *priv = netdev_priv(ndev); > + struct platform_device *pdev = priv->pdev; Minor nit: I'd save this line... > + if (priv->chip_id != RCAR_GEN2) > + ravb_ptp_init(ndev, pdev); ... and use ravb_ptp_init(ndev, priv->pdev); here. But well, maybe just bike-shedding...
On 04/17/2018 01:05 PM, Wolfram Sang wrote: >> @@ -2302,6 +2305,7 @@ static int __maybe_unused ravb_resume(struct device *dev) >> { >> struct net_device *ndev = dev_get_drvdata(dev); >> struct ravb_private *priv = netdev_priv(ndev); >> + struct platform_device *pdev = priv->pdev; Could infer 'pdev' from 'dev' (avoiding the dereference)... > Minor nit: I'd save this line... > >> + if (priv->chip_id != RCAR_GEN2) >> + ravb_ptp_init(ndev, pdev); > > ... and use ravb_ptp_init(ndev, priv->pdev); here. Agreed, no dire need for the new variable used only once. MBR, Sergei
Hello! s/failure/fail/ in the subject. On 04/17/2018 11:50 AM, Simon Horman wrote: > From: Kazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com> > > This patch fixes the problem that ptp4l command does not work after > suspend and resume. > Add the initial setting in ravb_suspend() and ravb_resume(), > because ptp does not work. > > Fixes: a0d2f20650e8 ("Renesas Ethernet AVB PTP clock driver") > Signed-off-by: Kazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> [...] Other than the earlier comments, this seems good: Reviewed-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> MBR, Sergei
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index b311b1ac1286..dbde3d11458b 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -2295,6 +2295,9 @@ static int __maybe_unused ravb_suspend(struct device *dev) else ret = ravb_close(ndev); + if (priv->chip_id != RCAR_GEN2) + ravb_ptp_stop(ndev); + return ret; } @@ -2302,6 +2305,7 @@ static int __maybe_unused ravb_resume(struct device *dev) { struct net_device *ndev = dev_get_drvdata(dev); struct ravb_private *priv = netdev_priv(ndev); + struct platform_device *pdev = priv->pdev; int ret = 0; /* If WoL is enabled set reset mode to rearm the WoL logic */ @@ -2330,6 +2334,9 @@ static int __maybe_unused ravb_resume(struct device *dev) /* Restore descriptor base address table */ ravb_write(ndev, priv->desc_bat_dma, DBAT); + if (priv->chip_id != RCAR_GEN2) + ravb_ptp_init(ndev, pdev); + if (netif_running(ndev)) { if (priv->wol_enabled) { ret = ravb_wol_restore(ndev);