Netdev Archive on lore.kernel.org help / color / mirror / Atom feed
From: Biju Das <biju.das.jz@bp.renesas.com> To: "David S. Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org> Cc: Biju Das <biju.das.jz@bp.renesas.com>, Sergei Shtylyov <sergei.shtylyov@gmail.com>, Geert Uytterhoeven <geert+renesas@glider.be>, Sergey Shtylyov <s.shtylyov@omprussia.ru>, Adam Ford <aford173@gmail.com>, Andrew Lunn <andrew@lunn.ch>, Yuusuke Ashizuka <ashiduka@fujitsu.com>, Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>, netdev@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Chris Paterson <Chris.Paterson2@renesas.com>, Biju Das <biju.das@bp.renesas.com>, Prabhakar Mahadev Lad <prabhakar.mahadev-lad.rj@bp.renesas.com> Subject: [PATCH net-next v2 1/8] ravb: Add struct ravb_hw_info to driver data Date: Mon, 2 Aug 2021 11:26:47 +0100 [thread overview] Message-ID: <20210802102654.5996-2-biju.das.jz@bp.renesas.com> (raw) In-Reply-To: <20210802102654.5996-1-biju.das.jz@bp.renesas.com> 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. Currently a runtime decision based on the chip type is used to distinguish the HW differences between the SoC families. The number of TX descriptors for R-Car Gen3 is 1 whereas on R-Car Gen2 and RZ/G2L it is 2. For cases like this it is better to select the number of TX descriptors by using a structure with a value, rather than a runtime decision based on the chip type. This patch adds the num_tx_desc variable to struct ravb_hw_info and also replaces the driver data chip type with struct ravb_hw_info by moving chip type to it. Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> --- v2: * Incorporated Andrew and Sergei's review comments for making it smaller patch and provided detailed description. --- drivers/net/ethernet/renesas/ravb.h | 7 +++++ drivers/net/ethernet/renesas/ravb_main.c | 38 +++++++++++++++--------- 2 files changed, 31 insertions(+), 14 deletions(-) diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h index 80e62ca2e3d3..cfb972c05b34 100644 --- a/drivers/net/ethernet/renesas/ravb.h +++ b/drivers/net/ethernet/renesas/ravb.h @@ -988,6 +988,11 @@ enum ravb_chip_id { RCAR_GEN3, }; +struct ravb_hw_info { + enum ravb_chip_id chip_id; + int num_tx_desc; +}; + struct ravb_private { struct net_device *ndev; struct platform_device *pdev; @@ -1040,6 +1045,8 @@ struct ravb_private { unsigned txcidm:1; /* TX Clock Internal Delay Mode */ unsigned rgmii_override:1; /* Deprecated rgmii-*id behavior */ 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) diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index f4dfe9f71d06..ffbd224d8780 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -1924,12 +1924,22 @@ 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, + .num_tx_desc = NUM_TX_DESC_GEN3, +}; + +static const struct ravb_hw_info ravb_gen2_hw_info = { + .chip_id = RCAR_GEN2, + .num_tx_desc = NUM_TX_DESC_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); @@ -2034,8 +2044,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; @@ -2058,9 +2068,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); @@ -2073,6 +2083,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; @@ -2099,7 +2110,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; @@ -2124,7 +2135,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)) { @@ -2142,8 +2153,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 ? - NUM_TX_DESC_GEN2 : NUM_TX_DESC_GEN3; + priv->num_tx_desc = info->num_tx_desc; /* Set function */ ndev->netdev_ops = &ravb_netdev_ops; @@ -2184,7 +2194,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 */ @@ -2232,7 +2242,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); -- 2.17.1
next prev parent reply other threads:[~2021-08-02 10:27 UTC|newest] Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-08-02 10:26 [PATCH net-next v2 0/8] Add Gigabit Ethernet driver support Biju Das 2021-08-02 10:26 ` Biju Das [this message] 2021-08-02 15:02 ` [PATCH net-next v2 1/8] ravb: Add struct ravb_hw_info to driver data Andrew Lunn 2021-08-02 20:42 ` Sergei Shtylyov 2021-08-03 5:57 ` Biju Das 2021-08-03 6:36 ` Biju Das 2021-08-04 19:27 ` Sergei Shtylyov 2021-08-04 20:27 ` Sergei Shtylyov 2021-08-09 12:06 ` Geert Uytterhoeven 2021-08-12 7:26 ` Biju Das 2021-08-12 7:58 ` Geert Uytterhoeven 2021-08-12 8:13 ` Biju Das 2021-08-17 11:24 ` Biju Das 2021-08-17 20:11 ` Sergey Shtylyov 2021-08-18 6:29 ` Biju Das 2021-08-18 10:11 ` Sergey Shtylyov 2021-08-18 10:23 ` Biju Das 2021-08-02 10:26 ` [PATCH net-next v2 2/8] ravb: Add skb_sz to struct ravb_hw_info Biju Das 2021-08-02 15:08 ` Andrew Lunn 2021-08-02 20:54 ` Sergei Shtylyov 2021-08-03 7:13 ` Biju Das 2021-08-02 10:26 ` [PATCH net-next v2 3/8] ravb: Add num_gstat_queue " Biju Das 2021-08-02 15:09 ` Andrew Lunn 2021-08-03 18:21 ` Sergei Shtylyov 2021-08-03 19:13 ` Biju Das 2021-08-03 19:22 ` Sergei Shtylyov 2021-08-03 19:47 ` Biju Das 2021-08-17 15:08 ` Biju Das 2021-08-02 10:26 ` [PATCH net-next v2 4/8] ravb: Add stats_len " Biju Das 2021-08-03 18:35 ` Sergei Shtylyov 2021-08-03 18:47 ` Biju Das 2021-08-03 19:20 ` Sergei Shtylyov 2021-08-02 10:26 ` [PATCH net-next v2 5/8] ravb: Add gstrings_stats and gstrings_size " Biju Das 2021-08-02 15:11 ` Andrew Lunn 2021-08-04 20:36 ` Sergei Shtylyov 2021-08-02 10:26 ` [PATCH net-next v2 6/8] ravb: Add net_features and net_hw_features " Biju Das 2021-08-02 15:12 ` Andrew Lunn 2021-08-05 19:07 ` Sergei Shtylyov 2021-08-05 19:18 ` Biju Das 2021-08-06 20:20 ` Sergei Shtylyov 2021-08-12 7:35 ` Biju Das 2021-08-06 20:31 ` Sergei Shtylyov 2021-08-02 10:26 ` [PATCH net-next v2 7/8] ravb: Add internal delay hw feature " Biju Das 2021-08-02 15:13 ` Andrew Lunn 2021-08-03 21:06 ` Sergei Shtylyov 2021-08-04 6:19 ` Biju Das 2021-08-03 21:12 ` Sergei Shtylyov 2021-08-04 5:13 ` Biju Das 2021-08-04 9:51 ` Sergey Shtylyov 2021-08-04 10:08 ` Biju Das 2021-08-04 10:34 ` Sergei Shtylyov 2021-08-04 10:20 ` Sergei Shtylyov 2021-08-04 10:32 ` Biju Das 2021-08-02 10:26 ` [PATCH net-next v2 8/8] ravb: Add tx_drop_cntrs " Biju Das 2021-08-02 15:14 ` Andrew Lunn 2021-08-04 20:50 ` Sergei Shtylyov 2021-08-17 15:47 ` Biju Das 2021-08-17 16:30 ` Sergey Shtylyov 2021-08-17 16:33 ` Biju Das
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210802102654.5996-2-biju.das.jz@bp.renesas.com \ --to=biju.das.jz@bp.renesas.com \ --cc=Chris.Paterson2@renesas.com \ --cc=aford173@gmail.com \ --cc=andrew@lunn.ch \ --cc=ashiduka@fujitsu.com \ --cc=biju.das@bp.renesas.com \ --cc=davem@davemloft.net \ --cc=geert+renesas@glider.be \ --cc=kuba@kernel.org \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=netdev@vger.kernel.org \ --cc=prabhakar.mahadev-lad.rj@bp.renesas.com \ --cc=s.shtylyov@omprussia.ru \ --cc=sergei.shtylyov@gmail.com \ --cc=yoshihiro.shimoda.uh@renesas.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).