From: Vladimir Oltean <olteanv@gmail.com>
To: "Clément Léger" <clement.leger@bootlin.com>
Cc: "Andrew Lunn" <andrew@lunn.ch>,
"Vivien Didelot" <vivien.didelot@gmail.com>,
"Florian Fainelli" <f.fainelli@gmail.com>,
"David S . Miller" <davem@davemloft.net>,
"Eric Dumazet" <edumazet@google.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"Paolo Abeni" <pabeni@redhat.com>,
"Rob Herring" <robh+dt@kernel.org>,
"Krzysztof Kozlowski" <krzk+dt@kernel.org>,
"Geert Uytterhoeven" <geert+renesas@glider.be>,
"Magnus Damm" <magnus.damm@gmail.com>,
"Heiner Kallweit" <hkallweit1@gmail.com>,
"Russell King" <linux@armlinux.org.uk>,
"Thomas Petazzoni" <thomas.petazzoni@bootlin.com>,
"Herve Codina" <herve.codina@bootlin.com>,
"Miquèl Raynal" <miquel.raynal@bootlin.com>,
"Milan Stevanovic" <milan.stevanovic@se.com>,
"Jimmy Lalande" <jimmy.lalande@se.com>,
"Pascal Eberhard" <pascal.eberhard@se.com>,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
linux-renesas-soc@vger.kernel.org, netdev@vger.kernel.org,
"Jean-Pierre Geslin" <jean-pierre.geslin@non.se.com>,
"Phil Edworthy" <phil.edworthy@renesas.com>
Subject: Re: [PATCH net-next v4 06/12] net: dsa: rzn1-a5psw: add Renesas RZ/N1 advanced 5 port switch driver
Date: Mon, 9 May 2022 19:08:13 +0300 [thread overview]
Message-ID: <20220509160813.stfqb4c2houmfn2g@skbuf> (raw)
In-Reply-To: <20220509131900.7840-7-clement.leger@bootlin.com>
On Mon, May 09, 2022 at 03:18:54PM +0200, Clément Léger wrote:
> Add Renesas RZ/N1 advanced 5 port switch driver. This switch handles 5
> ports including 1 CPU management port. A MDIO bus is also exposed by
> this switch and allows to communicate with PHYs connected to the ports.
> Each switch port (except for the CPU management ports) is connected to
> the MII converter.
>
> This driver includes basic bridging support, more support will be added
> later (vlan, etc).
>
> Suggested-by: Jean-Pierre Geslin <jean-pierre.geslin@non.se.com>
> Suggested-by: Phil Edworthy <phil.edworthy@renesas.com>
> Signed-off-by: Clément Léger <clement.leger@bootlin.com>
> ---
> +static int a5psw_port_bridge_join(struct dsa_switch *ds, int port,
> + struct dsa_bridge bridge,
> + bool *tx_fwd_offload,
> + struct netlink_ext_ack *extack)
> +{
> + struct a5psw *a5psw = ds->priv;
> +
> + /* We only support 1 bridge device */
> + if (a5psw->br_dev && bridge.dev != a5psw->br_dev) {
> + NL_SET_ERR_MSG_MOD(extack,
> + "Forwarding offload supported for a single bridge");
I don't think I saw the dsa_slave_changeupper() patch that avoids
overwriting the extack when dsa_port_bridge_join() returns -EOPNOTSUPP.
> + return -EOPNOTSUPP;
> + }
> +
> + a5psw->br_dev = bridge.dev;
> + a5psw_flooding_set_resolution(a5psw, port, true);
> + a5psw_port_mgmtfwd_set(a5psw, port, false);
> +
> + return 0;
By the way, does this switch pass tools/testing/selftests/drivers/net/dsa/no_forwarding.sh?
> +}
> +
> +static void a5psw_port_bridge_leave(struct dsa_switch *ds, int port,
> + struct dsa_bridge bridge)
> +{
> + struct a5psw *a5psw = ds->priv;
> +
> + a5psw_flooding_set_resolution(a5psw, port, false);
> + a5psw_port_mgmtfwd_set(a5psw, port, true);
> +
> + /* No more ports bridged */
> + if (a5psw->bridged_ports == BIT(A5PSW_CPU_PORT))
> + a5psw->br_dev = NULL;
> +}
> +
> +static int a5psw_pcs_get(struct a5psw *a5psw)
> +{
> + struct device_node *ports, *port, *pcs_node;
> + struct phylink_pcs *pcs;
> + int ret;
> + u32 reg;
> +
> + ports = of_get_child_by_name(a5psw->dev->of_node, "ethernet-ports");
> + if (!ports)
> + ports = of_get_child_by_name(a5psw->dev->of_node, "ports");
> +
> + if (!ports)
> + return -EINVAL;
> +
> + for_each_available_child_of_node(ports, port) {
> + pcs_node = of_parse_phandle(port, "pcs-handle", 0);
> + if (!pcs_node)
> + continue;
> +
> + if (of_property_read_u32(port, "reg", ®)) {
> + ret = -EINVAL;
> + goto free_pcs;
> + }
> +
> + if (reg >= ARRAY_SIZE(a5psw->pcs)) {
> + ret = -ENODEV;
> + goto free_pcs;
> + }
> +
> + pcs = miic_create(pcs_node);
> + if (IS_ERR(pcs)) {
> + dev_err(a5psw->dev, "Failed to create PCS for port %d\n",
> + reg);
> + ret = PTR_ERR(pcs);
> + goto free_pcs;
> + }
> +
> + a5psw->pcs[reg] = pcs;
> + }
> + of_node_put(ports);
> +
> + return 0;
> +
> +free_pcs:
The error path is missing of_node_put(ports).
> + a5psw_pcs_free(a5psw);
> +
> + return ret;
> +}
> +
> +static int a5psw_probe(struct platform_device *pdev)
> +{
> + struct device *dev = &pdev->dev;
> + struct device_node *mdio;
> + struct dsa_switch *ds;
> + struct a5psw *a5psw;
> + int ret;
> +
> + a5psw = devm_kzalloc(dev, sizeof(*a5psw), GFP_KERNEL);
> + if (!a5psw)
> + return -ENOMEM;
> +
> + a5psw->dev = dev;
> + spin_lock_init(&a5psw->lk_lock);
> + spin_lock_init(&a5psw->reg_lock);
> + a5psw->base = devm_platform_ioremap_resource(pdev, 0);
> + if (!a5psw->base)
> + return -EINVAL;
> +
> + ret = a5psw_pcs_get(a5psw);
> + if (ret)
> + return ret;
> +
> + a5psw->hclk = devm_clk_get(dev, "hclk");
> + if (IS_ERR(a5psw->hclk)) {
> + dev_err(dev, "failed get hclk clock\n");
> + ret = PTR_ERR(a5psw->hclk);
> + goto free_pcs;
> + }
> +
> + a5psw->clk = devm_clk_get(dev, "clk");
> + if (IS_ERR(a5psw->clk)) {
> + dev_err(dev, "failed get clk_switch clock\n");
> + ret = PTR_ERR(a5psw->clk);
> + goto free_pcs;
> + }
> +
> + ret = clk_prepare_enable(a5psw->clk);
> + if (ret)
> + goto free_pcs;
> +
> + ret = clk_prepare_enable(a5psw->hclk);
> + if (ret)
> + goto clk_disable;
> +
> + mdio = of_get_child_by_name(dev->of_node, "mdio");
> + if (of_device_is_available(mdio)) {
> + ret = a5psw_probe_mdio(a5psw, mdio);
> + if (ret) {
> + of_node_put(mdio);
> + dev_err(&pdev->dev, "Failed to register MDIO: %d\n",
> + ret);
> + goto hclk_disable;
> + }
Missing an of_node_put(mdio) if the device is available and ret == 0.
> + } else {
> + of_node_put(mdio);
> + }
> +
> + ds = &a5psw->ds;
> + ds->dev = &pdev->dev;
> + ds->num_ports = A5PSW_PORTS_NUM;
> + ds->ops = &a5psw_switch_ops;
> + ds->priv = a5psw;
> +
> + ret = dsa_register_switch(ds);
> + if (ret) {
> + dev_err(&pdev->dev, "Failed to register DSA switch: %d\n", ret);
> + goto hclk_disable;
> + }
> +
> + return 0;
> +
> +hclk_disable:
> + clk_disable_unprepare(a5psw->hclk);
> +clk_disable:
> + clk_disable_unprepare(a5psw->clk);
> +free_pcs:
> + a5psw_pcs_free(a5psw);
> +
> + return ret;
> +}
> +
> +static int a5psw_remove(struct platform_device *pdev)
> +{
> + struct a5psw *a5psw = platform_get_drvdata(pdev);
I hate to repeat myself, but drivers in general can be removed after the device
was shut down. If that happens, you will dereference a platform_get_drvdata()
which is NULL, as set by yourself in a5psw_shutdown().
> +
> + dsa_unregister_switch(&a5psw->ds);
> + a5psw_pcs_free(a5psw);
> + clk_disable_unprepare(a5psw->hclk);
> + clk_disable_unprepare(a5psw->clk);
> +
> + return 0;
> +}
> +
> +static void a5psw_shutdown(struct platform_device *pdev)
> +{
> + struct a5psw *a5psw = platform_get_drvdata(pdev);
> +
> + if (!a5psw)
> + return;
> +
> + dsa_switch_shutdown(&a5psw->ds);
> +
> + platform_set_drvdata(pdev, NULL);
> +}
next prev parent reply other threads:[~2022-05-09 16:08 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-09 13:18 [PATCH net-next v4 00/12] add support for Renesas RZ/N1 ethernet subsystem devices Clément Léger
2022-05-09 13:18 ` [PATCH net-next v4 01/12] net: dsa: add support for ethtool get_rmon_stats() Clément Léger
2022-05-09 13:18 ` [PATCH net-next v4 02/12] net: dsa: add Renesas RZ/N1 switch tag driver Clément Léger
2022-05-09 15:52 ` Vladimir Oltean
2022-05-10 16:20 ` Florian Fainelli
2022-05-09 13:18 ` [PATCH net-next v4 03/12] dt-bindings: net: pcs: add bindings for Renesas RZ/N1 MII converter Clément Léger
2022-05-10 16:21 ` Florian Fainelli
2022-05-11 15:20 ` Rob Herring
2022-05-09 13:18 ` [PATCH net-next v4 04/12] net: pcs: add Renesas MII converter driver Clément Léger
2022-05-09 20:20 ` Russell King (Oracle)
2022-05-10 7:24 ` Clément Léger
2022-05-09 13:18 ` [PATCH net-next v4 05/12] dt-bindings: net: dsa: add bindings for Renesas RZ/N1 Advanced 5 port switch Clément Léger
2022-05-11 15:22 ` Rob Herring
2022-05-11 15:33 ` Vladimir Oltean
2022-05-18 1:59 ` Rob Herring
2022-05-18 12:05 ` Vladimir Oltean
2022-05-18 12:41 ` Clément Léger
2022-05-18 18:53 ` Rob Herring
2022-05-09 13:18 ` [PATCH net-next v4 06/12] net: dsa: rzn1-a5psw: add Renesas RZ/N1 advanced 5 port switch driver Clément Léger
2022-05-09 16:08 ` Vladimir Oltean [this message]
2022-05-10 8:34 ` Clément Léger
2022-05-11 9:36 ` Vladimir Oltean
2022-05-12 8:47 ` Clément Léger
2022-05-19 14:03 ` Clément Léger
2022-05-09 13:18 ` [PATCH net-next v4 07/12] net: dsa: rzn1-a5psw: add statistics support Clément Léger
2022-05-10 16:32 ` Florian Fainelli
2022-05-11 7:06 ` Clément Léger
2022-05-09 13:18 ` [PATCH net-next v4 08/12] net: dsa: rzn1-a5psw: add FDB support Clément Léger
2022-05-09 13:18 ` [PATCH net-next v4 09/12] ARM: dts: r9a06g032: describe MII converter Clément Léger
2022-05-09 13:18 ` [PATCH net-next v4 10/12] ARM: dts: r9a06g032: describe GMAC2 Clément Léger
2022-05-09 13:18 ` [PATCH net-next v4 11/12] ARM: dts: r9a06g032: describe switch Clément Léger
2022-05-09 13:19 ` [PATCH net-next v4 12/12] MAINTAINERS: add Renesas RZ/N1 switch related driver entry Clément Léger
2022-05-10 16:22 ` Florian Fainelli
2022-05-10 16:30 ` [PATCH net-next v4 00/12] add support for Renesas RZ/N1 ethernet subsystem devices Florian Fainelli
2022-05-11 7:08 ` Clément Léger
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=20220509160813.stfqb4c2houmfn2g@skbuf \
--to=olteanv@gmail.com \
--cc=andrew@lunn.ch \
--cc=clement.leger@bootlin.com \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=edumazet@google.com \
--cc=f.fainelli@gmail.com \
--cc=geert+renesas@glider.be \
--cc=herve.codina@bootlin.com \
--cc=hkallweit1@gmail.com \
--cc=jean-pierre.geslin@non.se.com \
--cc=jimmy.lalande@se.com \
--cc=krzk+dt@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=magnus.damm@gmail.com \
--cc=milan.stevanovic@se.com \
--cc=miquel.raynal@bootlin.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=pascal.eberhard@se.com \
--cc=phil.edworthy@renesas.com \
--cc=robh+dt@kernel.org \
--cc=thomas.petazzoni@bootlin.com \
--cc=vivien.didelot@gmail.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: link
Be 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).