On 8/25/21 10:01 AM, Biju Das wrote:
> The ravb_ring_format function uses an extended descriptor in RX
> for R-Car compared to the normal descriptor for RZ/G2L. Factorise
> RX ring buffer buildup to extend the support for later SoC.
>
> Signed-off-by: Biju Das <biju.das.jz@xxxxxxxxxxxxxx>
> Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@xxxxxxxxxxxxxx>
[...]
> diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
> index dc388a32496a..e52e36ccd1c6 100644
> --- a/drivers/net/ethernet/renesas/ravb_main.c
> +++ b/drivers/net/ethernet/renesas/ravb_main.c
[...]
> @@ -321,6 +310,26 @@ static void ravb_ring_format(struct net_device *ndev, int q)
> rx_desc = &priv->rx_ring[q][i];
> rx_desc->dptr = cpu_to_le32((u32)priv->rx_desc_dma[q]);
> rx_desc->die_dt = DT_LINKFIX; /* type */
> +}
> +
> +/* Format skb and descriptor buffer for Ethernet AVB */
> +static void ravb_ring_format(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;
> + struct ravb_tx_desc *tx_desc;
> + struct ravb_desc *desc;
> + unsigned int tx_ring_size = sizeof(*tx_desc) * priv->num_tx_ring[q] *
> + num_tx_desc;
> + unsigned int i;
> +
> + priv->cur_rx[q] = 0;
> + priv->cur_tx[q] = 0;
> + priv->dirty_rx[q] = 0;
> + priv->dirty_tx[q] = 0;
> +
> + info->rx_ring_format(ndev, q);
>
> memset(priv->tx_ring[q], 0, tx_ring_size);
> /* Build TX ring buffer */
That's all fine but the fragment that sets up TX descriptor ring base address was left in ravb_rx_ring_formet()...
[...]
MBR, Sergey
