net: ravb: Move PTP initialization in the driver's ndo_open API for ccc_gac platorms

The initialization sequence for PTP is the same for platforms with ccc_gac
and gptp (according to "Figure 50.71 Flow of gPTP Initialization (Normal,
Common to All Modes)" of the R-Car Series, 3rd generation hardware
manual and "Figure 37A.53 Flow of gPTP Initialization (Normal, Common to
All Modes)" of the RZ/G Series hardware manual).

As some IP variants switch to reset mode (and thus the registers content is
lost) when setting clocks (due to module standby functionality) to be able
to implement runtime PM, move the PTP initialization to the driver's
ndo_open API.

This commit prepares the code for the addition of runtime PM.

Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 318ab27635bb2472a44f4681f85c391d95e3697c..54099fef946ef1b607cdcee474170212d4e44438 100644 (file)
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -1876,7 +1876,7 @@ static int ravb_open(struct net_device *ndev)
        ravb_set_gti(ndev);
 
        /* Initialise PTP Clock driver */
-       if (info->gptp)
+       if (info->gptp || info->ccc_gac)
                ravb_ptp_init(ndev, priv->pdev);
 
        /* PHY control start */
@@ -1890,7 +1890,7 @@ static int ravb_open(struct net_device *ndev)
 
 out_ptp_stop:
        /* Stop PTP Clock driver */
-       if (info->gptp)
+       if (info->gptp || info->ccc_gac)
                ravb_ptp_stop(ndev);
        ravb_stop_dma(ndev);
 out_napi_off:
@@ -2200,7 +2200,7 @@ static int ravb_close(struct net_device *ndev)
        ravb_write(ndev, 0, TIC);
 
        /* Stop PTP Clock driver */
-       if (info->gptp)
+       if (info->gptp || info->ccc_gac)
                ravb_ptp_stop(ndev);
 
        /* Set the config mode to stop the AVB-DMAC's processes */
@@ -2813,10 +2813,6 @@ static int ravb_probe(struct platform_device *pdev)
        /* Initialise HW timestamp list */
        INIT_LIST_HEAD(&priv->ts_skb_list);
 
-       /* Initialise PTP Clock driver */
-       if (info->ccc_gac)
-               ravb_ptp_init(ndev, pdev);
-
        /* Debug message level */
        priv->msg_enable = RAVB_DEF_MSG_ENABLE;
 
@@ -2861,10 +2857,6 @@ out_napi_del:
 out_dma_free:
        dma_free_coherent(ndev->dev.parent, priv->desc_bat_size, priv->desc_bat,
                          priv->desc_bat_dma);
-
-       /* Stop PTP Clock driver */
-       if (info->ccc_gac)
-               ravb_ptp_stop(ndev);
 out_rpm_put:
        pm_runtime_put(&pdev->dev);
 out_rpm_disable:
@@ -2890,10 +2882,6 @@ static void ravb_remove(struct platform_device *pdev)
 
        ravb_mdio_release(priv);
 
-       /* Stop PTP Clock driver */
-       if (info->ccc_gac)
-               ravb_ptp_stop(ndev);
-
        dma_free_coherent(ndev->dev.parent, priv->desc_bat_size, priv->desc_bat,
                          priv->desc_bat_dma);