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

ravb: Add nc_queue to struct ravb_hw_info 



R-Car supports network control queue whereas RZ/G2L does not support
it. Add nc_queue to struct ravb_hw_info, so that NC queue is handled
only by R-Car.

This patch also renames ravb_rcar_dmac_init to ravb_dmac_init_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>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2b061b54

drivers/net/ethernet/renesas/ravb.h

+2 −1
Original line number Diff line number Diff line
@@ -986,7 +986,7 @@ struct ravb_hw_info { 
	bool (*receive)(struct net_device *ndev, int *quota, int q);

	void (*set_rate)(struct net_device *ndev);

	int (*set_feature)(struct net_device *ndev, netdev_features_t features);

	void (*dmac_init)(struct net_device *ndev);

	int (*dmac_init)(struct net_device *ndev);

	void (*emac_init)(struct net_device *ndev);

	const char (*gstrings_stats)[ETH_GSTRING_LEN];

	size_t gstrings_size;
@@ -1002,6 +1002,7 @@ struct ravb_hw_info { 
	unsigned multi_irqs:1;		/* AVB-DMAC and E-MAC has multiple irqs */

	unsigned gptp:1;		/* AVB-DMAC has gPTP support */

	unsigned ccc_gac:1;		/* AVB-DMAC has gPTP support active in config mode */

	unsigned nc_queue:1;		/* AVB-DMAC has NC queue */

};



struct ravb_private {

drivers/net/ethernet/renesas/ravb_main.c

+92 −48
Original line number Diff line number Diff line
@@ -461,10 +461,24 @@ static void ravb_emac_init(struct net_device *ndev) 
	info->emac_init(ndev);

}



static void ravb_rcar_dmac_init(struct net_device *ndev)

static int ravb_dmac_init_rcar(struct net_device *ndev)

{

	struct ravb_private *priv = netdev_priv(ndev);

	const struct ravb_hw_info *info = priv->info;

	int error;



	error = ravb_ring_init(ndev, RAVB_BE);

	if (error)

		return error;

	error = ravb_ring_init(ndev, RAVB_NC);

	if (error) {

		ravb_ring_free(ndev, RAVB_BE);

		return error;

	}



	/* Descriptor format */

	ravb_ring_format(ndev, RAVB_BE);

	ravb_ring_format(ndev, RAVB_NC);



	/* Set AVB RX */

	ravb_write(ndev,
@@ -491,6 +505,8 @@ static void ravb_rcar_dmac_init(struct net_device *ndev) 
	ravb_write(ndev, RIC2_QFE0 | RIC2_QFE1 | RIC2_RFFE, RIC2);

	/* Frame transmitted, timestamp FIFO updated */

	ravb_write(ndev, TIC_FTE0 | TIC_FTE1 | TIC_TFUE, TIC);



	return 0;

}



/* Device init function for Ethernet AVB */
@@ -505,20 +521,9 @@ static int ravb_dmac_init(struct net_device *ndev) 
	if (error)

		return error;



	error = ravb_ring_init(ndev, RAVB_BE);

	error = info->dmac_init(ndev);

	if (error)

		return error;

	error = ravb_ring_init(ndev, RAVB_NC);

	if (error) {

		ravb_ring_free(ndev, RAVB_BE);

		return error;

	}



	/* Descriptor format */

	ravb_ring_format(ndev, RAVB_BE);

	ravb_ring_format(ndev, RAVB_NC);



	info->dmac_init(ndev);



	/* Setting the control will start the AVB-DMAC process. */

	ravb_modify(ndev, CCC, CCC_OPC, CCC_OPC_OPERATION);
@@ -859,6 +864,7 @@ static irqreturn_t ravb_interrupt(int irq, void *dev_id) 
{

	struct net_device *ndev = dev_id;

	struct ravb_private *priv = netdev_priv(ndev);

	const struct ravb_hw_info *info = priv->info;

	irqreturn_t result = IRQ_NONE;

	u32 iss;
@@ -875,10 +881,15 @@ static irqreturn_t ravb_interrupt(int irq, void *dev_id) 
			result = IRQ_HANDLED;



		/* Network control and best effort queue RX/TX */

		if (info->nc_queue) {

			for (q = RAVB_NC; q >= RAVB_BE; q--) {

				if (ravb_queue_interrupt(ndev, q))

					result = IRQ_HANDLED;

			}

		} else {

			if (ravb_queue_interrupt(ndev, RAVB_BE))

				result = IRQ_HANDLED;

		}

	}



	/* E-MAC status summary */
@@ -1000,6 +1011,7 @@ static int ravb_poll(struct napi_struct *napi, int budget) 


	/* Receive error message handling */

	priv->rx_over_errors =  priv->stats[RAVB_BE].rx_over_errors;

	if (info->nc_queue)

		priv->rx_over_errors += priv->stats[RAVB_NC].rx_over_errors;

	if (priv->rx_over_errors != ndev->stats.rx_over_errors)

		ndev->stats.rx_over_errors = priv->rx_over_errors;
@@ -1208,11 +1220,14 @@ static void ravb_get_ethtool_stats(struct net_device *ndev, 
				   struct ethtool_stats *estats, u64 *data)

{

	struct ravb_private *priv = netdev_priv(ndev);

	const struct ravb_hw_info *info = priv->info;

	int num_rx_q;

	int i = 0;

	int q;



	num_rx_q = info->nc_queue ? NUM_RX_QUEUE : 1;

	/* Device-specific stats */

	for (q = RAVB_BE; q < NUM_RX_QUEUE; q++) {

	for (q = RAVB_BE; q < num_rx_q; q++) {

		struct net_device_stats *stats = &priv->stats[q];



		data[i++] = priv->cur_rx[q];
@@ -1287,6 +1302,7 @@ static int ravb_set_ringparam(struct net_device *ndev, 


		/* Free all the skb's in the RX queue and the DMA buffers. */

		ravb_ring_free(ndev, RAVB_BE);

		if (info->nc_queue)

			ravb_ring_free(ndev, RAVB_NC);

	}
@@ -1403,6 +1419,7 @@ static int ravb_open(struct net_device *ndev) 
	int error;



	napi_enable(&priv->napi[RAVB_BE]);

	if (info->nc_queue)

		napi_enable(&priv->napi[RAVB_NC]);



	if (!info->multi_irqs) {
@@ -1477,6 +1494,7 @@ static int ravb_open(struct net_device *ndev) 
out_free_irq:

	free_irq(ndev->irq, ndev);

out_napi_off:

	if (info->nc_queue)

		napi_disable(&priv->napi[RAVB_NC]);

	napi_disable(&priv->napi[RAVB_BE]);

	return error;
@@ -1526,6 +1544,7 @@ static void ravb_tx_timeout_work(struct work_struct *work) 
	}



	ravb_ring_free(ndev, RAVB_BE);

	if (info->nc_queue)

		ravb_ring_free(ndev, RAVB_NC);



	/* Device init */
@@ -1698,28 +1717,38 @@ static struct net_device_stats *ravb_get_stats(struct net_device *ndev) 


	nstats = &ndev->stats;

	stats0 = &priv->stats[RAVB_BE];

	stats1 = &priv->stats[RAVB_NC];



	if (info->tx_counters) {

		nstats->tx_dropped += ravb_read(ndev, TROCR);

		ravb_write(ndev, 0, TROCR);	/* (write clear) */

	}



	nstats->rx_packets = stats0->rx_packets + stats1->rx_packets;

	nstats->tx_packets = stats0->tx_packets + stats1->tx_packets;

	nstats->rx_bytes = stats0->rx_bytes + stats1->rx_bytes;

	nstats->tx_bytes = stats0->tx_bytes + stats1->tx_bytes;

	nstats->multicast = stats0->multicast + stats1->multicast;

	nstats->rx_errors = stats0->rx_errors + stats1->rx_errors;

	nstats->rx_crc_errors = stats0->rx_crc_errors + stats1->rx_crc_errors;

	nstats->rx_frame_errors =

		stats0->rx_frame_errors + stats1->rx_frame_errors;

	nstats->rx_length_errors =

		stats0->rx_length_errors + stats1->rx_length_errors;

	nstats->rx_missed_errors =

		stats0->rx_missed_errors + stats1->rx_missed_errors;

	nstats->rx_over_errors =

		stats0->rx_over_errors + stats1->rx_over_errors;

	nstats->rx_packets = stats0->rx_packets;

	nstats->tx_packets = stats0->tx_packets;

	nstats->rx_bytes = stats0->rx_bytes;

	nstats->tx_bytes = stats0->tx_bytes;

	nstats->multicast = stats0->multicast;

	nstats->rx_errors = stats0->rx_errors;

	nstats->rx_crc_errors = stats0->rx_crc_errors;

	nstats->rx_frame_errors = stats0->rx_frame_errors;

	nstats->rx_length_errors = stats0->rx_length_errors;

	nstats->rx_missed_errors = stats0->rx_missed_errors;

	nstats->rx_over_errors = stats0->rx_over_errors;

	if (info->nc_queue) {

		stats1 = &priv->stats[RAVB_NC];



		nstats->rx_packets += stats1->rx_packets;

		nstats->tx_packets += stats1->tx_packets;

		nstats->rx_bytes += stats1->rx_bytes;

		nstats->tx_bytes += stats1->tx_bytes;

		nstats->multicast += stats1->multicast;

		nstats->rx_errors += stats1->rx_errors;

		nstats->rx_crc_errors += stats1->rx_crc_errors;

		nstats->rx_frame_errors += stats1->rx_frame_errors;

		nstats->rx_length_errors += stats1->rx_length_errors;

		nstats->rx_missed_errors += stats1->rx_missed_errors;

		nstats->rx_over_errors += stats1->rx_over_errors;

	}



	return nstats;

}
@@ -1784,11 +1813,13 @@ static int ravb_close(struct net_device *ndev) 
	}

	free_irq(ndev->irq, ndev);



	if (info->nc_queue)

		napi_disable(&priv->napi[RAVB_NC]);

	napi_disable(&priv->napi[RAVB_BE]);



	/* Free all the skb's in the RX queue and the DMA buffers. */

	ravb_ring_free(ndev, RAVB_BE);

	if (info->nc_queue)

		ravb_ring_free(ndev, RAVB_NC);



	return 0;
@@ -2007,7 +2038,7 @@ static const struct ravb_hw_info ravb_gen3_hw_info = { 
	.receive = ravb_rcar_rx,

	.set_rate = ravb_set_rate,

	.set_feature = ravb_set_features_rcar,

	.dmac_init = ravb_rcar_dmac_init,

	.dmac_init = ravb_dmac_init_rcar,

	.emac_init = ravb_rcar_emac_init,

	.gstrings_stats = ravb_gstrings_stats,

	.gstrings_size = sizeof(ravb_gstrings_stats),
@@ -2019,6 +2050,7 @@ static const struct ravb_hw_info ravb_gen3_hw_info = { 
	.tx_counters = 1,

	.multi_irqs = 1,

	.ccc_gac = 1,

	.nc_queue = 1,

};



static const struct ravb_hw_info ravb_gen2_hw_info = {
@@ -2028,7 +2060,7 @@ static const struct ravb_hw_info ravb_gen2_hw_info = { 
	.receive = ravb_rcar_rx,

	.set_rate = ravb_set_rate,

	.set_feature = ravb_set_features_rcar,

	.dmac_init = ravb_rcar_dmac_init,

	.dmac_init = ravb_dmac_init_rcar,

	.emac_init = ravb_rcar_emac_init,

	.gstrings_stats = ravb_gstrings_stats,

	.gstrings_size = sizeof(ravb_gstrings_stats),
@@ -2038,6 +2070,7 @@ static const struct ravb_hw_info ravb_gen2_hw_info = { 
	.max_rx_len = RX_BUF_SZ + RAVB_ALIGN - 1,

	.aligned_tx = 1,

	.gptp = 1,

	.nc_queue = 1,

};



static const struct of_device_id ravb_match_table[] = {
@@ -2192,8 +2225,11 @@ static int ravb_probe(struct platform_device *pdev) 
	priv->pdev = pdev;

	priv->num_tx_ring[RAVB_BE] = BE_TX_RING_SIZE;

	priv->num_rx_ring[RAVB_BE] = BE_RX_RING_SIZE;

	if (info->nc_queue) {

		priv->num_tx_ring[RAVB_NC] = NC_TX_RING_SIZE;

		priv->num_rx_ring[RAVB_NC] = NC_RX_RING_SIZE;

	}



	priv->addr = devm_platform_get_and_ioremap_resource(pdev, 0, &res);

	if (IS_ERR(priv->addr)) {

		error = PTR_ERR(priv->addr);
@@ -2323,6 +2359,7 @@ static int ravb_probe(struct platform_device *pdev) 
	}



	netif_napi_add(ndev, &priv->napi[RAVB_BE], ravb_poll, 64);

	if (info->nc_queue)

		netif_napi_add(ndev, &priv->napi[RAVB_NC], ravb_poll, 64);



	/* Network device register */
@@ -2341,7 +2378,9 @@ static int ravb_probe(struct platform_device *pdev) 
	return 0;



out_napi_del:

	if (info->nc_queue)

		netif_napi_del(&priv->napi[RAVB_NC]);



	netif_napi_del(&priv->napi[RAVB_BE]);

	ravb_mdio_release(priv);

out_dma_free:
@@ -2380,6 +2419,7 @@ static int ravb_remove(struct platform_device *pdev) 
	ravb_write(ndev, CCC_OPC_RESET, CCC);

	pm_runtime_put_sync(&pdev->dev);

	unregister_netdev(ndev);

	if (info->nc_queue)

		netif_napi_del(&priv->napi[RAVB_NC]);

	netif_napi_del(&priv->napi[RAVB_BE]);

	ravb_mdio_release(priv);
@@ -2394,6 +2434,7 @@ static int ravb_remove(struct platform_device *pdev) 
static int ravb_wol_setup(struct net_device *ndev)

{

	struct ravb_private *priv = netdev_priv(ndev);

	const struct ravb_hw_info *info = priv->info;



	/* Disable interrupts by clearing the interrupt masks. */

	ravb_write(ndev, 0, RIC0);
@@ -2402,6 +2443,7 @@ static int ravb_wol_setup(struct net_device *ndev) 


	/* Only allow ECI interrupts */

	synchronize_irq(priv->emac_irq);

	if (info->nc_queue)

		napi_disable(&priv->napi[RAVB_NC]);

	napi_disable(&priv->napi[RAVB_BE]);

	ravb_write(ndev, ECSIPR_MPDIP, ECSIPR);
@@ -2415,8 +2457,10 @@ static int ravb_wol_setup(struct net_device *ndev) 
static int ravb_wol_restore(struct net_device *ndev)

{

	struct ravb_private *priv = netdev_priv(ndev);

	const struct ravb_hw_info *info = priv->info;

	int ret;



	if (info->nc_queue)

		napi_enable(&priv->napi[RAVB_NC]);

	napi_enable(&priv->napi[RAVB_BE]);