ravb: ptp: Add CONFIG mode support

This patch makes PTP support active in CONFIG mode on R-Car Gen3.

Signed-off-by: Kazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com>
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
index f9dee7436e81858e66fab476ac70f84ef63d8422..9fbe92ac225b00f93ed33d187f03f3db2f879f2e 100644 (file)
--- a/drivers/net/ethernet/renesas/ravb.h
+++ b/drivers/net/ethernet/renesas/ravb.h
@@ -206,6 +206,7 @@ enum CCC_BIT {
        CCC_OPC_RESET   = 0x00000000,
        CCC_OPC_CONFIG  = 0x00000001,
        CCC_OPC_OPERATION = 0x00000002,
+       CCC_GAC         = 0x00000080,
        CCC_DTSR        = 0x00000100,
        CCC_CSEL        = 0x00030000,
        CCC_CSEL_HPB    = 0x00010000,

diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 990dc55cdadabb66504e6c2fe1ea8996321c0d53..293046d30b3bfd75ae105d445071f928936568dd 100644 (file)
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -1231,7 +1231,8 @@ static int ravb_open(struct net_device *ndev)
        ravb_emac_init(ndev);
 
        /* Initialise PTP Clock driver */
-       ravb_ptp_init(ndev, priv->pdev);
+       if (priv->chip_id == RCAR_GEN2)
+               ravb_ptp_init(ndev, priv->pdev);
 
        netif_tx_start_all_queues(ndev);
 
@@ -1244,7 +1245,8 @@ static int ravb_open(struct net_device *ndev)
 
 out_ptp_stop:
        /* Stop PTP Clock driver */
-       ravb_ptp_stop(ndev);
+       if (priv->chip_id == RCAR_GEN2)
+               ravb_ptp_stop(ndev);
 out_free_irq:
        free_irq(ndev->irq, ndev);
        free_irq(priv->emac_irq, ndev);
@@ -1476,7 +1478,8 @@ static int ravb_close(struct net_device *ndev)
        ravb_write(ndev, 0, TIC);
 
        /* Stop PTP Clock driver */
-       ravb_ptp_stop(ndev);
+       if (priv->chip_id == RCAR_GEN2)
+               ravb_ptp_stop(ndev);
 
        /* Set the config mode to stop the AVB-DMAC's processes */
        if (ravb_stop_dma(ndev) < 0)
@@ -1781,8 +1784,16 @@ static int ravb_probe(struct platform_device *pdev)
        ndev->ethtool_ops = &ravb_ethtool_ops;
 
        /* Set AVB config mode */
-       ravb_write(ndev, (ravb_read(ndev, CCC) & ~CCC_OPC) | CCC_OPC_CONFIG,
-                  CCC);
+       if (chip_id == RCAR_GEN2) {
+               ravb_write(ndev, (ravb_read(ndev, CCC) & ~CCC_OPC) |
+                          CCC_OPC_CONFIG, CCC);
+               /* Set CSEL value */
+               ravb_write(ndev, (ravb_read(ndev, CCC) & ~CCC_CSEL) |
+                          CCC_CSEL_HPB, CCC);
+       } else {
+               ravb_write(ndev, (ravb_read(ndev, CCC) & ~CCC_OPC) |
+                          CCC_OPC_CONFIG | CCC_GAC | CCC_CSEL_HPB, CCC);
+       }
 
        /* Set CSEL value */
        ravb_write(ndev, (ravb_read(ndev, CCC) & ~CCC_CSEL) | CCC_CSEL_HPB,
@@ -1814,6 +1825,10 @@ static int ravb_probe(struct platform_device *pdev)
        /* Initialise HW timestamp list */
        INIT_LIST_HEAD(&priv->ts_skb_list);
 
+       /* Initialise PTP Clock driver */
+       if (chip_id != RCAR_GEN2)
+               ravb_ptp_init(ndev, pdev);
+
        /* Debug message level */
        priv->msg_enable = RAVB_DEF_MSG_ENABLE;
 
@@ -1855,6 +1870,10 @@ 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 (chip_id != RCAR_GEN2)
+               ravb_ptp_stop(ndev);
 out_release:
        if (ndev)
                free_netdev(ndev);
@@ -1869,6 +1888,10 @@ static int ravb_remove(struct platform_device *pdev)
        struct net_device *ndev = platform_get_drvdata(pdev);
        struct ravb_private *priv = netdev_priv(ndev);
 
+       /* Stop PTP Clock driver */
+       if (priv->chip_id != RCAR_GEN2)
+               ravb_ptp_stop(ndev);
+
        dma_free_coherent(ndev->dev.parent, priv->desc_bat_size, priv->desc_bat,
                          priv->desc_bat_dma);
        /* Set reset mode */