ravb: Factorise ravb_ring_free function

R-Car uses extended descriptor in RX, whereas RZ/G2L uses normal
descriptor. Factorise ravb_ring_free function so that it can
support later SoC.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.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 209e030935aaeb35a2aff8909dd893d95c74a06d..7cb30319524afdb9a7a44d3ea9e9d4c1568396d5 100644 (file)
--- a/drivers/net/ethernet/renesas/ravb.h
+++ b/drivers/net/ethernet/renesas/ravb.h
@@ -980,6 +980,7 @@ struct ravb_ptp {
 };
 
 struct ravb_hw_info {
+       void (*rx_ring_free)(struct net_device *ndev, int q);
        const char (*gstrings_stats)[ETH_GSTRING_LEN];
        size_t gstrings_size;
        netdev_features_t net_hw_features;

diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 883db1049882e2b690d8e3499b0f0275380b40ff..dc388a32496aa4745d7b8c99bc4123bcbc1938d2 100644 (file)
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -216,31 +216,42 @@ static int ravb_tx_free(struct net_device *ndev, int q, bool free_txed_only)
        return free_num;
 }
 
+static void ravb_rx_ring_free(struct net_device *ndev, int q)
+{
+       struct ravb_private *priv = netdev_priv(ndev);
+       unsigned int ring_size;
+       unsigned int i;
+
+       if (!priv->rx_ring[q])
+               return;
+
+       for (i = 0; i < priv->num_rx_ring[q]; i++) {
+               struct ravb_ex_rx_desc *desc = &priv->rx_ring[q][i];
+
+               if (!dma_mapping_error(ndev->dev.parent,
+                                      le32_to_cpu(desc->dptr)))
+                       dma_unmap_single(ndev->dev.parent,
+                                        le32_to_cpu(desc->dptr),
+                                        RX_BUF_SZ,
+                                        DMA_FROM_DEVICE);
+       }
+       ring_size = sizeof(struct ravb_ex_rx_desc) *
+                   (priv->num_rx_ring[q] + 1);
+       dma_free_coherent(ndev->dev.parent, ring_size, priv->rx_ring[q],
+                         priv->rx_desc_dma[q]);
+       priv->rx_ring[q] = NULL;
+}
+
 /* Free skb's and DMA buffers for Ethernet AVB */
 static void ravb_ring_free(struct net_device *ndev, int q)
 {
        struct ravb_private *priv = netdev_priv(ndev);
+       const struct ravb_hw_info *info = priv->info;
        unsigned int num_tx_desc = priv->num_tx_desc;
        unsigned int ring_size;
        unsigned int i;
 
-       if (priv->rx_ring[q]) {
-               for (i = 0; i < priv->num_rx_ring[q]; i++) {
-                       struct ravb_ex_rx_desc *desc = &priv->rx_ring[q][i];
-
-                       if (!dma_mapping_error(ndev->dev.parent,
-                                              le32_to_cpu(desc->dptr)))
-                               dma_unmap_single(ndev->dev.parent,
-                                                le32_to_cpu(desc->dptr),
-                                                RX_BUF_SZ,
-                                                DMA_FROM_DEVICE);
-               }
-               ring_size = sizeof(struct ravb_ex_rx_desc) *
-                           (priv->num_rx_ring[q] + 1);
-               dma_free_coherent(ndev->dev.parent, ring_size, priv->rx_ring[q],
-                                 priv->rx_desc_dma[q]);
-               priv->rx_ring[q] = NULL;
-       }
+       info->rx_ring_free(ndev, q);
 
        if (priv->tx_ring[q]) {
                ravb_tx_free(ndev, q, false);
@@ -1937,6 +1948,7 @@ static int ravb_mdio_release(struct ravb_private *priv)
 }
 
 static const struct ravb_hw_info ravb_gen3_hw_info = {
+       .rx_ring_free = ravb_rx_ring_free,
        .gstrings_stats = ravb_gstrings_stats,
        .gstrings_size = sizeof(ravb_gstrings_stats),
        .net_hw_features = NETIF_F_RXCSUM,
@@ -1950,6 +1962,7 @@ static const struct ravb_hw_info ravb_gen3_hw_info = {
 };
 
 static const struct ravb_hw_info ravb_gen2_hw_info = {
+       .rx_ring_free = ravb_rx_ring_free,
        .gstrings_stats = ravb_gstrings_stats,
        .gstrings_size = sizeof(ravb_gstrings_stats),
        .net_hw_features = NETIF_F_RXCSUM,