ravb: Fillup ravb_alloc_rx_desc_gbeth() stub

Fillup ravb_alloc_rx_desc_gbeth() function to support RZ/G2L.

This patch also renames ravb_alloc_rx_desc to ravb_alloc_rx_desc_rcar
to be consistent with the naming convention used in sh_eth driver.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
index b147c4a0dc0b15df512d910152ece583f3596db1..ed771ead61b9c78c1ec8f4f4a2418c919476d8c2 100644 (file)
--- a/drivers/net/ethernet/renesas/ravb.h
+++ b/drivers/net/ethernet/renesas/ravb.h
@@ -1038,6 +1038,7 @@ struct ravb_private {
        struct ravb_desc *desc_bat;
        dma_addr_t rx_desc_dma[NUM_RX_QUEUE];
        dma_addr_t tx_desc_dma[NUM_TX_QUEUE];
+       struct ravb_rx_desc *gbeth_rx_ring;
        struct ravb_ex_rx_desc *rx_ring[NUM_RX_QUEUE];
        struct ravb_tx_desc *tx_ring[NUM_TX_QUEUE];
        void *tx_align[NUM_TX_QUEUE];

diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index fe3449fb413545115bda680d3bdf2038d5d58d1f..c6bab0dfd3bc29ba491f629b3dcac2e87a841b39 100644 (file)
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -385,11 +385,18 @@ static void ravb_ring_format(struct net_device *ndev, int q)
 
 static void *ravb_alloc_rx_desc_gbeth(struct net_device *ndev, int q)
 {
-       /* Place holder */
-       return NULL;
+       struct ravb_private *priv = netdev_priv(ndev);
+       unsigned int ring_size;
+
+       ring_size = sizeof(struct ravb_rx_desc) * (priv->num_rx_ring[q] + 1);
+
+       priv->gbeth_rx_ring = dma_alloc_coherent(ndev->dev.parent, ring_size,
+                                                &priv->rx_desc_dma[q],
+                                                GFP_KERNEL);
+       return priv->gbeth_rx_ring;
 }
 
-static void *ravb_alloc_rx_desc(struct net_device *ndev, int q)
+static void *ravb_alloc_rx_desc_rcar(struct net_device *ndev, int q)
 {
        struct ravb_private *priv = netdev_priv(ndev);
        unsigned int ring_size;
@@ -1084,16 +1091,25 @@ static int ravb_poll(struct napi_struct *napi, int budget)
        struct net_device *ndev = napi->dev;
        struct ravb_private *priv = netdev_priv(ndev);
        const struct ravb_hw_info *info = priv->info;
+       bool gptp = info->gptp || info->ccc_gac;
+       struct ravb_rx_desc *desc;
        unsigned long flags;
        int q = napi - priv->napi;
        int mask = BIT(q);
        int quota = budget;
+       unsigned int entry;
 
+       if (!gptp) {
+               entry = priv->cur_rx[q] % priv->num_rx_ring[q];
+               desc = &priv->gbeth_rx_ring[entry];
+       }
        /* Processing RX Descriptor Ring */
        /* Clear RX interrupt */
        ravb_write(ndev, ~(mask | RIS0_RESERVED), RIS0);
-       if (ravb_rx(ndev, &quota, q))
-               goto out;
+       if (gptp || desc->die_dt != DT_FEMPTY) {
+               if (ravb_rx(ndev, &quota, q))
+                       goto out;
+       }
 
        /* Processing TX Descriptor Ring */
        spin_lock_irqsave(&priv->lock, flags);
@@ -2175,7 +2191,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,
        .rx_ring_format = ravb_rx_ring_format,
-       .alloc_rx_desc = ravb_alloc_rx_desc,
+       .alloc_rx_desc = ravb_alloc_rx_desc_rcar,
        .receive = ravb_rcar_rx,
        .set_rate = ravb_set_rate_rcar,
        .set_feature = ravb_set_features_rcar,
@@ -2200,7 +2216,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,
        .rx_ring_format = ravb_rx_ring_format,
-       .alloc_rx_desc = ravb_alloc_rx_desc,
+       .alloc_rx_desc = ravb_alloc_rx_desc_rcar,
        .receive = ravb_rcar_rx,
        .set_rate = ravb_set_rate_rcar,
        .set_feature = ravb_set_features_rcar,