| Message ID | 20220405091929.670951-2-andy.chiu@sifive.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d1c4f93e3f0a023024a6f022a61528c06cf1daa9 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Fix broken link on Xilinx's AXI Ethernet in SGMII mode | expand |
> -----Original Message----- > From: Andy Chiu <andy.chiu@sifive.com> > Sent: Tuesday, April 5, 2022 2:49 PM > To: davem@davemloft.net; Michal Simek <michals@xilinx.com>; Radhey > Shyam Pandey <radheys@xilinx.com> > Cc: andrew@lunn.ch; kuba@kernel.org; pabeni@redhat.com; > robh+dt@kernel.org; krzk+dt@kernel.org; linux@armlinux.org.uk; > netdev@vger.kernel.org; devicetree@vger.kernel.org; Andy Chiu > <andy.chiu@sifive.com>; Greentime Hu <greentime.hu@sifive.com>; Robert > Hancock <robert.hancock@calian.com> > Subject: [PATCH v8 net-next 1/4] net: axienet: setup mdio unconditionally > > The call to axienet_mdio_setup should not depend on whether "phy-node" > pressents on the DT. Besides, since `lp->phy_node` is used if PHY is in SGMII or :s/pressents/present > 100Base-X modes, move it into the if statement. And the next patch will > remove `lp->phy_node` from driver's private structure and do an of_node_put > on it right away after use since it is not used elsewhere. > > Signed-off-by: Andy Chiu <andy.chiu@sifive.com> > Reviewed-by: Greentime Hu <greentime.hu@sifive.com> > Reviewed-by: Robert Hancock <robert.hancock@calian.com> Reviewed-by: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com> > --- > drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c > b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c > index c7eb05e4a6bf..78a991bbbcf9 100644 > --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c > +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c > @@ -2064,15 +2064,14 @@ static int axienet_probe(struct platform_device > *pdev) > if (ret) > goto cleanup_clk; > > - lp->phy_node = of_parse_phandle(pdev->dev.of_node, "phy-handle", > 0); > - if (lp->phy_node) { > - ret = axienet_mdio_setup(lp); > - if (ret) > - dev_warn(&pdev->dev, > - "error registering MDIO bus: %d\n", ret); > - } > + ret = axienet_mdio_setup(lp); > + if (ret) > + dev_warn(&pdev->dev, > + "error registering MDIO bus: %d\n", ret); > + > if (lp->phy_mode == PHY_INTERFACE_MODE_SGMII || > lp->phy_mode == PHY_INTERFACE_MODE_1000BASEX) { > + lp->phy_node = of_parse_phandle(pdev->dev.of_node, "phy- > handle", 0); > if (!lp->phy_node) { > dev_err(&pdev->dev, "phy-handle required for > 1000BaseX/SGMII\n"); > ret = -EINVAL; > -- > 2.34.1
On Tue, Apr 05, 2022 at 05:19:26PM +0800, Andy Chiu wrote: > The call to axienet_mdio_setup should not depend on whether "phy-node" > pressents on the DT. Besides, since `lp->phy_node` is used if PHY is in > SGMII or 100Base-X modes, move it into the if statement. And the next patch > will remove `lp->phy_node` from driver's private structure and do an > of_node_put on it right away after use since it is not used elsewhere. > > Signed-off-by: Andy Chiu <andy.chiu@sifive.com> > Reviewed-by: Greentime Hu <greentime.hu@sifive.com> > Reviewed-by: Robert Hancock <robert.hancock@calian.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c index c7eb05e4a6bf..78a991bbbcf9 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c @@ -2064,15 +2064,14 @@ static int axienet_probe(struct platform_device *pdev) if (ret) goto cleanup_clk; - lp->phy_node = of_parse_phandle(pdev->dev.of_node, "phy-handle", 0); - if (lp->phy_node) { - ret = axienet_mdio_setup(lp); - if (ret) - dev_warn(&pdev->dev, - "error registering MDIO bus: %d\n", ret); - } + ret = axienet_mdio_setup(lp); + if (ret) + dev_warn(&pdev->dev, + "error registering MDIO bus: %d\n", ret); + if (lp->phy_mode == PHY_INTERFACE_MODE_SGMII || lp->phy_mode == PHY_INTERFACE_MODE_1000BASEX) { + lp->phy_node = of_parse_phandle(pdev->dev.of_node, "phy-handle", 0); if (!lp->phy_node) { dev_err(&pdev->dev, "phy-handle required for 1000BaseX/SGMII\n"); ret = -EINVAL;