On 7/22/21 5:13 PM, Biju Das wrote:
> The ravb_ring_init function uses extended descriptor in rx for
> R-Car and normal descriptor for RZ/G2L. Factorise rx ring buffer
> allocation so that it can support later SoC.
In this case I think you factored out the function in question... but my ENglish is possibly
too weak. :-)
> Signed-off-by: Biju Das <biju.das.jz@xxxxxxxxxxxxxx>
> Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@xxxxxxxxxxxxxx>
> ---
> drivers/net/ethernet/renesas/ravb.h | 1 +
> drivers/net/ethernet/renesas/ravb_main.c | 20 +++++++++++++++-----
> 2 files changed, 16 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
> index a3258c5d0c3d..d82bfa6e57c1 100644
> --- a/drivers/net/ethernet/renesas/ravb.h
> +++ b/drivers/net/ethernet/renesas/ravb.h
> @@ -991,6 +991,7 @@ enum ravb_chip_id {
> struct ravb_ops {
> void (*ring_free)(struct net_device *ndev, int q);
> void (*ring_format)(struct net_device *ndev, int q);
> + bool (*alloc_rx_desc)(struct net_device *ndev, int q);
Aha, rx_ appears at last! :-)
> diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
> index c23f0d420c70..3d0f6598b936 100644
> --- a/drivers/net/ethernet/renesas/ravb_main.c
> +++ b/drivers/net/ethernet/renesas/ravb_main.c
> @@ -384,6 +384,19 @@ static void ravb_ring_format(struct net_device *ndev, int q)
> }
>
> /* Init skb and descriptor buffer for Ethernet AVB */
> +static bool ravb_alloc_rx_desc(struct net_device *ndev, int q)
Why *bool*? I think we shold just return a pointer allocated.
> +{
> + struct ravb_private *priv = netdev_priv(ndev);
> + int ring_size;
> +
> + ring_size = sizeof(struct ravb_ex_rx_desc) * (priv->num_rx_ring[q] + 1);
> +
> + priv->rx_ring[q] = dma_alloc_coherent(ndev->dev.parent, ring_size,
> + &priv->rx_desc_dma[q],
> + GFP_KERNEL);
> + return priv->rx_ring[q];
> +}
> +
> static int ravb_ring_init(struct net_device *ndev, int q)
> {
> struct ravb_private *priv = netdev_priv(ndev);
> @@ -418,11 +431,7 @@ static int ravb_ring_init(struct net_device *ndev, int q)
> }
>
> /* Allocate all RX descriptors. */
> - ring_size = sizeof(struct ravb_ex_rx_desc) * (priv->num_rx_ring[q] + 1);
> - priv->rx_ring[q] = dma_alloc_coherent(ndev->dev.parent, ring_size,
> - &priv->rx_desc_dma[q],
> - GFP_KERNEL);
> - if (!priv->rx_ring[q])
> + if (!info->ravb_ops->alloc_rx_desc(ndev, q))
> goto error;
>
> priv->dirty_rx[q] = 0;
> @@ -2008,6 +2017,7 @@ static int ravb_mdio_release(struct ravb_private *priv)
> static const struct ravb_ops ravb_gen3_ops = {
> .ring_free = ravb_ring_free_rx,
> .ring_format = ravb_ring_format_rx,
> + .alloc_rx_desc = ravb_alloc_rx_desc,
> };
>
> static const struct ravb_drv_data ravb_gen3_data = {
>
