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

ravb: Add struct ravb_hw_info to driver data 



The DMAC and EMAC blocks of Gigabit Ethernet IP found on RZ/G2L SoC are
similar to the R-Car Ethernet AVB IP. With a few changes in the driver we
can support both IPs.

This patch adds the struct ravb_hw_info to hold hw features, driver data
and function pointers to support both the IPs. It also replaces the driver
data chip type with struct ravb_hw_info by moving chip type to it.

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 avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cb537b24

drivers/net/ethernet/renesas/ravb.h

+6 −0
Original line number Diff line number Diff line
@@ -988,6 +988,10 @@ enum ravb_chip_id { 
	RCAR_GEN3,

};



struct ravb_hw_info {

	enum ravb_chip_id chip_id;

};



struct ravb_private {

	struct net_device *ndev;

	struct platform_device *pdev;
@@ -1040,6 +1044,8 @@ struct ravb_private { 
	unsigned txcidm:1;		/* TX Clock Internal Delay Mode */

	unsigned rgmii_override:1;	/* Deprecated rgmii-*id behavior */

	unsigned int num_tx_desc;	/* TX descriptors per packet */



	const struct ravb_hw_info *info;

};



static inline u32 ravb_read(struct net_device *ndev, enum ravb_reg reg)

drivers/net/ethernet/renesas/ravb_main.c

+22 −13
Original line number Diff line number Diff line
@@ -1924,12 +1924,20 @@ static int ravb_mdio_release(struct ravb_private *priv) 
	return 0;

}



static const struct ravb_hw_info ravb_gen3_hw_info = {

	.chip_id = RCAR_GEN3,

};



static const struct ravb_hw_info ravb_gen2_hw_info = {

	.chip_id = RCAR_GEN2,

};



static const struct of_device_id ravb_match_table[] = {

	{ .compatible = "renesas,etheravb-r8a7790", .data = (void *)RCAR_GEN2 },

	{ .compatible = "renesas,etheravb-r8a7794", .data = (void *)RCAR_GEN2 },

	{ .compatible = "renesas,etheravb-rcar-gen2", .data = (void *)RCAR_GEN2 },

	{ .compatible = "renesas,etheravb-r8a7795", .data = (void *)RCAR_GEN3 },

	{ .compatible = "renesas,etheravb-rcar-gen3", .data = (void *)RCAR_GEN3 },

	{ .compatible = "renesas,etheravb-r8a7790", .data = &ravb_gen2_hw_info },

	{ .compatible = "renesas,etheravb-r8a7794", .data = &ravb_gen2_hw_info },

	{ .compatible = "renesas,etheravb-rcar-gen2", .data = &ravb_gen2_hw_info },

	{ .compatible = "renesas,etheravb-r8a7795", .data = &ravb_gen3_hw_info },

	{ .compatible = "renesas,etheravb-rcar-gen3", .data = &ravb_gen3_hw_info },

	{ }

};

MODULE_DEVICE_TABLE(of, ravb_match_table);
@@ -2023,8 +2031,8 @@ static void ravb_set_delay_mode(struct net_device *ndev) 
static int ravb_probe(struct platform_device *pdev)

{

	struct device_node *np = pdev->dev.of_node;

	const struct ravb_hw_info *info;

	struct ravb_private *priv;

	enum ravb_chip_id chip_id;

	struct net_device *ndev;

	int error, irq, q;

	struct resource *res;
@@ -2047,9 +2055,9 @@ static int ravb_probe(struct platform_device *pdev) 
	pm_runtime_enable(&pdev->dev);

	pm_runtime_get_sync(&pdev->dev);



	chip_id = (enum ravb_chip_id)of_device_get_match_data(&pdev->dev);

	info = of_device_get_match_data(&pdev->dev);



	if (chip_id == RCAR_GEN3)

	if (info->chip_id == RCAR_GEN3)

		irq = platform_get_irq_byname(pdev, "ch22");

	else

		irq = platform_get_irq(pdev, 0);
@@ -2062,6 +2070,7 @@ static int ravb_probe(struct platform_device *pdev) 
	SET_NETDEV_DEV(ndev, &pdev->dev);



	priv = netdev_priv(ndev);

	priv->info = info;

	priv->ndev = ndev;

	priv->pdev = pdev;

	priv->num_tx_ring[RAVB_BE] = BE_TX_RING_SIZE;
@@ -2088,7 +2097,7 @@ static int ravb_probe(struct platform_device *pdev) 
	priv->avb_link_active_low =

		of_property_read_bool(np, "renesas,ether-link-active-low");



	if (chip_id == RCAR_GEN3) {

	if (info->chip_id == RCAR_GEN3) {

		irq = platform_get_irq_byname(pdev, "ch24");

		if (irq < 0) {

			error = irq;
@@ -2113,7 +2122,7 @@ static int ravb_probe(struct platform_device *pdev) 
		}

	}



	priv->chip_id = chip_id;

	priv->chip_id = info->chip_id;



	priv->clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(priv->clk)) {
@@ -2131,7 +2140,7 @@ static int ravb_probe(struct platform_device *pdev) 
	ndev->max_mtu = 2048 - (ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN);

	ndev->min_mtu = ETH_MIN_MTU;



	priv->num_tx_desc = chip_id == RCAR_GEN2 ?

	priv->num_tx_desc = info->chip_id == RCAR_GEN2 ?

		NUM_TX_DESC_GEN2 : NUM_TX_DESC_GEN3;



	/* Set function */
@@ -2173,7 +2182,7 @@ static int ravb_probe(struct platform_device *pdev) 
	INIT_LIST_HEAD(&priv->ts_skb_list);



	/* Initialise PTP Clock driver */

	if (chip_id != RCAR_GEN2)

	if (info->chip_id != RCAR_GEN2)

		ravb_ptp_init(ndev, pdev);



	/* Debug message level */
@@ -2221,7 +2230,7 @@ static int ravb_probe(struct platform_device *pdev) 
			  priv->desc_bat_dma);



	/* Stop PTP Clock driver */

	if (chip_id != RCAR_GEN2)

	if (info->chip_id != RCAR_GEN2)

		ravb_ptp_stop(ndev);

out_disable_refclk:

	clk_disable_unprepare(priv->refclk);