Commit 1ae22c19 authored by Biju Das's avatar Biju Das Committed by David S. Miller
Browse files

ravb: Factorise ravb_ring_format function 



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: default avatarBiju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: default avatarLad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bf46b757

drivers/net/ethernet/renesas/ravb.h

+1 −0
Original line number Diff line number Diff line
@@ -981,6 +981,7 @@ struct ravb_ptp { 


struct ravb_hw_info {

	void (*rx_ring_free)(struct net_device *ndev, int q);

	void (*rx_ring_format)(struct net_device *ndev, int q);

	const char (*gstrings_stats)[ETH_GSTRING_LEN];

	size_t gstrings_size;

	netdev_features_t net_hw_features;

drivers/net/ethernet/renesas/ravb_main.c

+23 −12
Original line number Diff line number Diff line
@@ -282,25 +282,14 @@ static void ravb_ring_free(struct net_device *ndev, int q) 
	priv->tx_skb[q] = NULL;

}



/* Format skb and descriptor buffer for Ethernet AVB */

static void ravb_ring_format(struct net_device *ndev, int q)

static void ravb_rx_ring_format(struct net_device *ndev, int q)

{

	struct ravb_private *priv = netdev_priv(ndev);

	unsigned int num_tx_desc = priv->num_tx_desc;

	struct ravb_ex_rx_desc *rx_desc;

	struct ravb_tx_desc *tx_desc;

	struct ravb_desc *desc;

	unsigned int rx_ring_size = sizeof(*rx_desc) * priv->num_rx_ring[q];

	unsigned int tx_ring_size = sizeof(*tx_desc) * priv->num_tx_ring[q] *

				    num_tx_desc;

	dma_addr_t dma_addr;

	unsigned int i;



	priv->cur_rx[q] = 0;

	priv->cur_tx[q] = 0;

	priv->dirty_rx[q] = 0;

	priv->dirty_tx[q] = 0;



	memset(priv->rx_ring[q], 0, rx_ring_size);

	/* Build RX ring buffer */

	for (i = 0; i < priv->num_rx_ring[q]; i++) {
@@ -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 */
@@ -1949,6 +1958,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,

	.gstrings_stats = ravb_gstrings_stats,

	.gstrings_size = sizeof(ravb_gstrings_stats),

	.net_hw_features = NETIF_F_RXCSUM,
@@ -1963,6 +1973,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,

	.gstrings_stats = ravb_gstrings_stats,

	.gstrings_size = sizeof(ravb_gstrings_stats),

	.net_hw_features = NETIF_F_RXCSUM,