Commit 16a6e245 authored by Biju Das's avatar Biju Das Committed by Jakub Kicinski
Browse files

ravb: Fillup ravb_rx_ring_format_gbeth() stub 



Fillup ravb_rx_ring_format_gbeth() function to support RZ/G2L.

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

Signed-off-by: default avatarBiju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: default avatarLad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Reviewed-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 2458b8ed

drivers/net/ethernet/renesas/ravb.h

+1 −0
Original line number Diff line number Diff line
@@ -970,6 +970,7 @@ enum CXR31_BIT { 
#define RX_BUF_SZ	(2048 - ETH_FCS_LEN + sizeof(__sum16))



#define GBETH_RX_BUFF_MAX 8192

#define GBETH_RX_DESC_DATA_SIZE 4080



struct ravb_tstamp_skb {

	struct list_head list;

drivers/net/ethernet/renesas/ravb_main.c

+30 −4
Original line number Diff line number Diff line
@@ -327,10 +327,36 @@ static void ravb_ring_free(struct net_device *ndev, int q) 


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

{

	/* Place holder */

	struct ravb_private *priv = netdev_priv(ndev);

	struct ravb_rx_desc *rx_desc;

	unsigned int rx_ring_size;

	dma_addr_t dma_addr;

	unsigned int i;



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

	memset(priv->gbeth_rx_ring, 0, rx_ring_size);

	/* Build RX ring buffer */

	for (i = 0; i < priv->num_rx_ring[q]; i++) {

		/* RX descriptor */

		rx_desc = &priv->gbeth_rx_ring[i];

		rx_desc->ds_cc = cpu_to_le16(GBETH_RX_DESC_DATA_SIZE);

		dma_addr = dma_map_single(ndev->dev.parent, priv->rx_skb[q][i]->data,

					  GBETH_RX_BUFF_MAX,

					  DMA_FROM_DEVICE);

		/* We just set the data size to 0 for a failed mapping which

		 * should prevent DMA from happening...

		 */

		if (dma_mapping_error(ndev->dev.parent, dma_addr))

			rx_desc->ds_cc = cpu_to_le16(0);

		rx_desc->dptr = cpu_to_le32(dma_addr);

		rx_desc->die_dt = DT_FEMPTY;

	}

	rx_desc = &priv->gbeth_rx_ring[i];

	rx_desc->dptr = cpu_to_le32((u32)priv->rx_desc_dma[q]);

	rx_desc->die_dt = DT_LINKFIX; /* type */

}



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

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

{

	struct ravb_private *priv = netdev_priv(ndev);

	struct ravb_ex_rx_desc *rx_desc;
@@ -2210,7 +2236,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_rcar,

	.rx_ring_format = ravb_rx_ring_format,

	.rx_ring_format = ravb_rx_ring_format_rcar,

	.alloc_rx_desc = ravb_alloc_rx_desc_rcar,

	.receive = ravb_rcar_rx,

	.set_rate = ravb_set_rate_rcar,
@@ -2235,7 +2261,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_rcar,

	.rx_ring_format = ravb_rx_ring_format,

	.rx_ring_format = ravb_rx_ring_format_rcar,

	.alloc_rx_desc = ravb_alloc_rx_desc_rcar,

	.receive = ravb_rcar_rx,

	.set_rate = ravb_set_rate_rcar,