Commit 555419b2 authored by Niklas Söderlund's avatar Niklas Söderlund Committed by David S. Miller
Browse files

ravb: Move maximum Rx descriptor data usage to info struct 



To make it possible to merge the R-Car and RZ/G2L code paths move the
maximum usable size of a single Rx descriptor data slice into the
hardware information instead of using two different defines in the two
different code paths.

Signed-off-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: default avatarPaul Barker <paul.barker.ct@bp.renesas.com>
Reviewed-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 49686338

drivers/net/ethernet/renesas/ravb.h

+1 −4
Original line number Diff line number Diff line
@@ -1015,10 +1015,6 @@ enum CSR2_BIT { 
#define NUM_RX_QUEUE	2

#define NUM_TX_QUEUE	2



#define RX_BUF_SZ	(2048 - ETH_FCS_LEN + sizeof(__sum16))



#define GBETH_RX_DESC_DATA_SIZE 4080



struct ravb_tstamp_skb {

	struct list_head list;

	struct sk_buff *skb;
@@ -1058,6 +1054,7 @@ struct ravb_hw_info { 
	int stats_len;

	u32 tccr_mask;

	u32 rx_max_frame_size;

	u32 rx_max_desc_use;

	unsigned aligned_tx: 1;



	/* hardware features */

drivers/net/ethernet/renesas/ravb_main.c

+8 −4
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ static void ravb_rx_ring_format_gbeth(struct net_device *ndev, int q) 
	for (i = 0; i < priv->num_rx_ring[q]; i++) {

		/* RX descriptor */

		rx_desc = &priv->rx_ring[q].desc[i];

		rx_desc->ds_cc = cpu_to_le16(GBETH_RX_DESC_DATA_SIZE);

		rx_desc->ds_cc = cpu_to_le16(priv->info->rx_max_desc_use);

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

					  priv->info->rx_max_frame_size,

					  DMA_FROM_DEVICE);
@@ -381,7 +381,7 @@ static void ravb_rx_ring_format_rcar(struct net_device *ndev, int q) 
	for (i = 0; i < priv->num_rx_ring[q]; i++) {

		/* RX descriptor */

		rx_desc = &priv->rx_ring[q].ex_desc[i];

		rx_desc->ds_cc = cpu_to_le16(RX_BUF_SZ);

		rx_desc->ds_cc = cpu_to_le16(priv->info->rx_max_desc_use);

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

					  priv->info->rx_max_frame_size,

					  DMA_FROM_DEVICE);
@@ -921,7 +921,7 @@ static bool ravb_rx_gbeth(struct net_device *ndev, int *quota, int q) 
	for (; priv->cur_rx[q] - priv->dirty_rx[q] > 0; priv->dirty_rx[q]++) {

		entry = priv->dirty_rx[q] % priv->num_rx_ring[q];

		desc = &priv->rx_ring[q].desc[entry];

		desc->ds_cc = cpu_to_le16(GBETH_RX_DESC_DATA_SIZE);

		desc->ds_cc = cpu_to_le16(priv->info->rx_max_desc_use);



		if (!priv->rx_skb[q][entry]) {

			skb = ravb_alloc_skb(ndev, info, GFP_ATOMIC);
@@ -1036,7 +1036,7 @@ static bool ravb_rx_rcar(struct net_device *ndev, int *quota, int q) 
	for (; priv->cur_rx[q] - priv->dirty_rx[q] > 0; priv->dirty_rx[q]++) {

		entry = priv->dirty_rx[q] % priv->num_rx_ring[q];

		desc = &priv->rx_ring[q].ex_desc[entry];

		desc->ds_cc = cpu_to_le16(RX_BUF_SZ);

		desc->ds_cc = cpu_to_le16(priv->info->rx_max_desc_use);



		if (!priv->rx_skb[q][entry]) {

			skb = ravb_alloc_skb(ndev, info, GFP_ATOMIC);
@@ -2694,6 +2694,7 @@ static const struct ravb_hw_info ravb_gen3_hw_info = { 
	.stats_len = ARRAY_SIZE(ravb_gstrings_stats),

	.tccr_mask = TCCR_TSRQ0 | TCCR_TSRQ1 | TCCR_TSRQ2 | TCCR_TSRQ3,

	.rx_max_frame_size = SZ_2K,

	.rx_max_desc_use = SZ_2K - ETH_FCS_LEN + sizeof(__sum16),

	.internal_delay = 1,

	.tx_counters = 1,

	.multi_irqs = 1,
@@ -2719,6 +2720,7 @@ static const struct ravb_hw_info ravb_gen2_hw_info = { 
	.stats_len = ARRAY_SIZE(ravb_gstrings_stats),

	.tccr_mask = TCCR_TSRQ0 | TCCR_TSRQ1 | TCCR_TSRQ2 | TCCR_TSRQ3,

	.rx_max_frame_size = SZ_2K,

	.rx_max_desc_use = SZ_2K - ETH_FCS_LEN + sizeof(__sum16),

	.aligned_tx = 1,

	.gptp = 1,

	.nc_queues = 1,
@@ -2741,6 +2743,7 @@ static const struct ravb_hw_info ravb_rzv2m_hw_info = { 
	.stats_len = ARRAY_SIZE(ravb_gstrings_stats),

	.tccr_mask = TCCR_TSRQ0 | TCCR_TSRQ1 | TCCR_TSRQ2 | TCCR_TSRQ3,

	.rx_max_frame_size = SZ_2K,

	.rx_max_desc_use = SZ_2K - ETH_FCS_LEN + sizeof(__sum16),

	.multi_irqs = 1,

	.err_mgmt_irqs = 1,

	.gptp = 1,
@@ -2765,6 +2768,7 @@ static const struct ravb_hw_info gbeth_hw_info = { 
	.stats_len = ARRAY_SIZE(ravb_gstrings_stats_gbeth),

	.tccr_mask = TCCR_TSRQ0,

	.rx_max_frame_size = SZ_8K,

	.rx_max_desc_use = 4080,

	.aligned_tx = 1,

	.tx_counters = 1,

	.carrier_counters = 1,