From: Russell King - ARM Linux admin <linux@armlinux.org.uk>
To: Calvin Johnson <calvin.johnson@oss.nxp.com>
Cc: "Rafael J . Wysocki" <rafael@kernel.org>,
linux.cj@gmail.com, Jeremy Linton <jeremy.linton@arm.com>,
Andrew Lunn <andrew@lunn.ch>,
Andy Shevchenko <andy.shevchenko@gmail.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Cristi Sovaiala <cristian.sovaiala@nxp.com>,
Florin Laurentiu Chiculita <florinlaurentiu.chiculita@nxp.com>,
Ioana Ciornei <ioana.ciornei@nxp.com>,
Madalin Bucur <madalin.bucur@oss.nxp.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Varun Sethi <V.Sethi@nxp.com>,
"Rajesh V . Bikkina" <rajesh.bikkina@nxp.com>,
linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org,
Diana Madalina Craciun <diana.craciun@nxp.com>,
netdev@vger.kernel.org, Marcin Wojtas <mw@semihalf.com>,
Laurentiu Tudor <laurentiu.tudor@nxp.com>,
Makarand Pawagi <makarand.pawagi@nxp.com>,
linux-arm-kernel@lists.infradead.org,
Pankaj Bansal <pankaj.bansal@nxp.com>,
"David S. Miller" <davem@davemloft.net>,
Heiner Kallweit <hkallweit1@gmail.com>
Subject: Re: [net-next PATCH v3 3/5] phylink: Introduce phylink_fwnode_phy_connect()
Date: Tue, 5 May 2020 15:35:59 +0100 [thread overview]
Message-ID: <20200505143559.GJ1551@shell.armlinux.org.uk> (raw)
In-Reply-To: <20200505132905.10276-4-calvin.johnson@oss.nxp.com>
On Tue, May 05, 2020 at 06:59:03PM +0530, Calvin Johnson wrote:
> Define phylink_fwnode_phy_connect() to connect phy specified by
> a fwnode to a phylink instance.
>
> Signed-off-by: Calvin Johnson <calvin.johnson@oss.nxp.com>
> ---
>
> Changes in v3:
> remove NULL return check as it is invalid
> remove unused phylink_device_phy_connect()
>
> Changes in v2:
> replace of_ and acpi_ code with generic fwnode to get phy-handle.
>
> drivers/net/phy/phylink.c | 48 +++++++++++++++++++++++++++++++++++++++
> include/linux/phylink.h | 3 +++
> 2 files changed, 51 insertions(+)
>
> diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
> index 0f23bec431c1..560d1069426c 100644
> --- a/drivers/net/phy/phylink.c
> +++ b/drivers/net/phy/phylink.c
> @@ -961,6 +961,54 @@ int phylink_connect_phy(struct phylink *pl, struct phy_device *phy)
> }
> EXPORT_SYMBOL_GPL(phylink_connect_phy);
>
> +/**
> + * phylink_fwnode_phy_connect() - connect the PHY specified in the fwnode.
> + * @pl: a pointer to a &struct phylink returned from phylink_create()
> + * @fwnode: a pointer to a &struct fwnode_handle.
> + * @flags: PHY-specific flags to communicate to the PHY device driver
> + *
> + * Connect the phy specified @fwnode to the phylink instance specified
> + * by @pl. Actions specified in phylink_connect_phy() will be
> + * performed.
> + *
> + * Returns 0 on success or a negative errno.
> + */
> +int phylink_fwnode_phy_connect(struct phylink *pl,
> + struct fwnode_handle *fwnode,
> + u32 flags)
> +{
> + struct fwnode_handle *phy_fwnode;
> + struct phy_device *phy_dev;
> + int ret = 0;
> +
> + /* Fixed links and 802.3z are handled without needing a PHY */
> + if (pl->cfg_link_an_mode == MLO_AN_FIXED ||
> + (pl->cfg_link_an_mode == MLO_AN_INBAND &&
> + phy_interface_mode_is_8023z(pl->link_interface)))
> + return 0;
> +
> + phy_fwnode = fwnode_get_phy_node(fwnode);
> + if ((IS_ERR(phy_fwnode)) && pl->cfg_link_an_mode == MLO_AN_PHY)
> + return -ENODEV;
This doesn't reflect the behaviour of phylink_of_phy_connect() - it is
*not* a cleanup of what is there, which is:
if (!phy_node) {
if (pl->cfg_link_an_mode == MLO_AN_PHY)
return -ENODEV;
return 0;
}
which does:
- if there is a PHY node, find the PHY and connect it.
- if there is no PHY node, then:
+ if we are expecting a PHY to be present, return an error.
+ otherwise, it is not a problem, continue.
That is very important behaviour - it allows drivers to call
phylink_*_phy_connect() without knowing whether there should or should
not be a PHY - and keeps that knowledge within phylink. It means
network drivers don't have to parse the firmware to find out if there's
a fixed link or SFP cage attached, and decide whether to call these
functions.
> +
> + phy_dev = fwnode_phy_find_device(phy_fwnode);
> + fwnode_handle_put(phy_fwnode);
> + if (!phy_dev)
> + return -ENODEV;
> +
> + ret = phy_attach_direct(pl->netdev, phy_dev, flags,
> + pl->link_interface);
> + if (ret)
> + return ret;
> +
> + ret = phylink_bringup_phy(pl, phy_dev, pl->link_config.interface);
> + if (ret)
> + phy_detach(phy_dev);
> +
> + return ret;
> +}
> +EXPORT_SYMBOL_GPL(phylink_fwnode_phy_connect);
> +
I think we need to go further with this, and we need to have
phylink_fwnode_phy_connect() functionally identical to
phylink_of_phy_connect() for DT-based fwnodes. Doing so will avoid
introducing errors such as the one you've added above.
The only difference between these two is that DT has a number of
legacy properties - these can be omitted if the fwnode is not a DT
node.
Remember that fwnode is compatible with DT, so fwnode_phy_find_device()
can internally decide whether to look for the ACPI property or one of
the three DT properties.
It also means that phylink_of_phy_connect() can become:
int phylink_of_phy_connect(struct phylink *pl, struct device_node *dn,
u32 flags)
{
return phylink_fwnode_phy_connect(pl, of_fwnode_handle(dn), flags);
}
--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 10.2Mbps down 587kbps up
next prev parent reply other threads:[~2020-05-05 14:36 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-05 13:29 [net-next PATCH v3 0/5] Introduce new fwnode based APIs to support phylink and phy layers Calvin Johnson
2020-05-05 13:29 ` [net-next PATCH v3 1/5] net: phy: Introduce phy related fwnode functions Calvin Johnson
2020-05-05 14:44 ` Russell King - ARM Linux admin
2020-05-05 23:21 ` kbuild test robot
2020-05-05 23:39 ` Russell King - ARM Linux admin
2020-05-06 0:07 ` kbuild test robot
2020-05-05 13:29 ` [net-next PATCH v3 2/5] net: phy: alphabetically sort header includes Calvin Johnson
2020-05-05 13:29 ` [net-next PATCH v3 3/5] phylink: Introduce phylink_fwnode_phy_connect() Calvin Johnson
2020-05-05 14:13 ` Andy Shevchenko
2020-05-05 14:35 ` Russell King - ARM Linux admin [this message]
2020-05-05 13:29 ` [net-next PATCH v3 4/5] net: phy: Introduce fwnode_get_phy_id() Calvin Johnson
2020-05-05 14:15 ` Andy Shevchenko
2020-05-05 14:20 ` Russell King - ARM Linux admin
2020-05-07 13:26 ` Jeremy Linton
2020-05-07 17:27 ` Andy Shevchenko
2020-05-07 19:54 ` Jeremy Linton
2020-05-08 16:07 ` Calvin Johnson
2020-05-08 18:13 ` Andrew Lunn
2020-05-08 19:18 ` Jeremy Linton
2020-05-08 20:27 ` Andrew Lunn
2020-05-08 22:48 ` Jeremy Linton
2020-05-08 23:42 ` Andrew Lunn
2020-05-09 0:11 ` Jeremy Linton
2020-05-11 8:00 ` Calvin Johnson
2020-05-11 9:38 ` Russell King - ARM Linux admin
2020-05-11 10:29 ` Calvin Johnson
2020-05-11 10:48 ` Russell King - ARM Linux admin
2020-05-11 12:02 ` Calvin Johnson
2020-05-11 13:04 ` Andrew Lunn
2020-05-11 13:35 ` Russell King - ARM Linux admin
2020-05-11 14:59 ` Calvin Johnson
2020-05-11 7:39 ` Calvin Johnson
2020-05-11 5:52 ` Calvin Johnson
2020-05-11 12:53 ` Andrew Lunn
2020-05-05 13:29 ` [net-next PATCH v3 5/5] net: mdiobus: Introduce fwnode_mdiobus_register_phy() Calvin Johnson
2020-05-05 14:22 ` Andy Shevchenko
2020-05-07 7:44 ` Calvin Johnson
2020-05-07 9:10 ` Andy Shevchenko
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=20200505143559.GJ1551@shell.armlinux.org.uk \
--to=linux@armlinux.org.uk \
--cc=V.Sethi@nxp.com \
--cc=andrew@lunn.ch \
--cc=andy.shevchenko@gmail.com \
--cc=calvin.johnson@oss.nxp.com \
--cc=cristian.sovaiala@nxp.com \
--cc=davem@davemloft.net \
--cc=diana.craciun@nxp.com \
--cc=f.fainelli@gmail.com \
--cc=florinlaurentiu.chiculita@nxp.com \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=hkallweit1@gmail.com \
--cc=ioana.ciornei@nxp.com \
--cc=jeremy.linton@arm.com \
--cc=laurentiu.tudor@nxp.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux.cj@gmail.com \
--cc=madalin.bucur@oss.nxp.com \
--cc=makarand.pawagi@nxp.com \
--cc=mw@semihalf.com \
--cc=netdev@vger.kernel.org \
--cc=pankaj.bansal@nxp.com \
--cc=rafael@kernel.org \
--cc=rajesh.bikkina@nxp.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).