From: David Yang <mmyangfl@gmail.com>
To: netdev@vger.kernel.org
Cc: David Yang <mmyangfl@gmail.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@kernel.org>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Jian Shen <shenjian15@huawei.com>,
Jijie Shao <shaojijie@huawei.com>,
devicetree@vger.kernel.org
Subject: [PATCH net-next v2 2/2] net: hix5hd2_gmac: support fixed-link and mdio child
Date: Mon, 23 Nov 2026 07:01:31 +0800 [thread overview]
Message-ID: <20261122230134.3366017-3-mmyangfl@gmail.com> (raw)
In-Reply-To: <20261122230134.3366017-1-mmyangfl@gmail.com>
On Hi3716cv200 hix5hd2_gmac is found directly linked to another MAC
without PHY. The driver didn't take fixed-link into account and failed
probe when the node has no phy-handle. Add support for fixed-link.
With a fixed link declared on the MAC node, of_mdiobus_register() treats
the reg-less fixed-link child as a PHY candidate and walks all 32 bus
addresses, printing "scan phy fixed-link at address X" for each address.
Register the bus based on if the PHY attached to a given interface is
described in the device tree or not, like commit ef8a2e27289e ("net:
macb: fix probing of PHY not described in the dt").
Signed-off-by: David Yang <mmyangfl@gmail.com>
---
drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 78 +++++++++++++------
1 file changed, 53 insertions(+), 25 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c b/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c
index 12a5657653f8..9a2a3fa1455f 100644
--- a/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c
+++ b/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c
@@ -1101,6 +1101,7 @@ static int hix5hd2_dev_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct device_node *node = dev->of_node;
+ struct device_node *mdio_np;
struct net_device *ndev;
struct hix5hd2_priv *priv;
struct mii_bus *bus;
@@ -1175,23 +1176,35 @@ static int hix5hd2_dev_probe(struct platform_device *pdev)
hix5hd2_phy_reset(priv);
}
- bus = mdiobus_alloc();
- if (bus == NULL) {
- ret = -ENOMEM;
- goto out_disable_clk;
- }
-
- bus->priv = priv;
- bus->name = "hix5hd2_mii_bus";
- bus->read = hix5hd2_mdio_read;
- bus->write = hix5hd2_mdio_write;
- bus->parent = &pdev->dev;
- snprintf(bus->id, MII_BUS_ID_SIZE, "%s-mii", dev_name(&pdev->dev));
- priv->bus = bus;
+ bus = NULL;
+ mdio_np = of_get_child_by_name(node, "mdio");
+ if (mdio_np || !of_phy_is_fixed_link(node)) {
+ bus = mdiobus_alloc();
+ if (!bus) {
+ ret = -ENOMEM;
+ of_node_put(mdio_np);
+ goto out_disable_clk;
+ }
- ret = of_mdiobus_register(bus, node);
- if (ret)
- goto err_free_mdio;
+ bus->priv = priv;
+ bus->name = "hix5hd2_mii_bus";
+ bus->read = hix5hd2_mdio_read;
+ bus->write = hix5hd2_mdio_write;
+ bus->parent = &pdev->dev;
+ snprintf(bus->id, MII_BUS_ID_SIZE, "%s-mii",
+ dev_name(&pdev->dev));
+ priv->bus = bus;
+
+ if (mdio_np)
+ ret = of_mdiobus_register(bus, mdio_np);
+ else
+ ret = of_mdiobus_register(bus, node);
+ if (ret) {
+ of_node_put(mdio_np);
+ goto err_free_mdio;
+ }
+ }
+ of_node_put(mdio_np);
ret = of_get_phy_mode(node, &priv->phy_mode);
if (ret) {
@@ -1199,11 +1212,18 @@ static int hix5hd2_dev_probe(struct platform_device *pdev)
goto err_mdiobus;
}
- priv->phy_node = of_parse_phandle(node, "phy-handle", 0);
- if (!priv->phy_node) {
- netdev_err(ndev, "not find phy-handle\n");
- ret = -EINVAL;
- goto err_mdiobus;
+ if (of_phy_is_fixed_link(node)) {
+ ret = of_phy_register_fixed_link(node);
+ if (ret < 0)
+ goto err_mdiobus;
+ priv->phy_node = of_node_get(node);
+ } else {
+ priv->phy_node = of_parse_phandle(node, "phy-handle", 0);
+ if (!priv->phy_node) {
+ netdev_err(ndev, "not find phy-handle\n");
+ ret = -EINVAL;
+ goto err_mdiobus;
+ }
}
ndev->irq = platform_get_irq(pdev, 0);
@@ -1268,11 +1288,15 @@ static int hix5hd2_dev_probe(struct platform_device *pdev)
netif_napi_del(&priv->napi);
hix5hd2_destroy_hw_desc_queue(priv);
out_phy_node:
+ if (of_phy_is_fixed_link(node))
+ of_phy_deregister_fixed_link(node);
of_node_put(priv->phy_node);
err_mdiobus:
- mdiobus_unregister(bus);
+ if (bus)
+ mdiobus_unregister(bus);
err_free_mdio:
- mdiobus_free(bus);
+ if (bus)
+ mdiobus_free(bus);
out_disable_clk:
clk_disable_unprepare(priv->mac_ifc_clk);
out_disable_mac_core_clk:
@@ -1290,12 +1314,16 @@ static void hix5hd2_dev_remove(struct platform_device *pdev)
unregister_netdev(ndev);
cancel_work_sync(&priv->tx_timeout_task);
- mdiobus_unregister(priv->bus);
- mdiobus_free(priv->bus);
+ if (priv->bus) {
+ mdiobus_unregister(priv->bus);
+ mdiobus_free(priv->bus);
+ }
if (HAS_CAP_TSO(priv->hw_cap))
hix5hd2_destroy_sg_desc_queue(priv);
hix5hd2_destroy_hw_desc_queue(priv);
+ if (of_phy_is_fixed_link(pdev->dev.of_node))
+ of_phy_deregister_fixed_link(pdev->dev.of_node);
of_node_put(priv->phy_node);
free_netdev(ndev);
}
--
2.53.0
prev parent reply other threads:[~2026-11-22 23:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-22 23:01 [PATCH net-next v2 0/2] net: hix5hd2_gmac: support fixed-link David Yang
2026-11-22 23:01 ` [PATCH net-next v2 1/2] dt-bindings: net: hisilicon,hisi-gmac-v1: allow fixed-link and mdio child David Yang
2026-11-22 23:01 ` David Yang [this message]
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=20261122230134.3366017-3-mmyangfl@gmail.com \
--to=mmyangfl@gmail.com \
--cc=andrew+netdev@lunn.ch \
--cc=conor+dt@kernel.org \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=edumazet@kernel.org \
--cc=krzk+dt@kernel.org \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=robh@kernel.org \
--cc=shaojijie@huawei.com \
--cc=shenjian15@huawei.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