From: Calvin Johnson <calvin.johnson@oss.nxp.com>
To: Russell King - ARM Linux admin <linux@armlinux.org.uk>
Cc: Andrew Lunn <andrew@lunn.ch>,
Cristi Sovaiala <cristian.sovaiala@nxp.com>,
Ioana Ciornei <ioana.ciornei@nxp.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Ioana Radulescu <ruxandra.radulescu@nxp.com>,
"Rajesh V . Bikkina" <rajesh.bikkina@nxp.com>,
Pankaj Bansal <pankaj.bansal@nxp.com>,
Diana Madalina Craciun <diana.craciun@nxp.com>,
linux-acpi@vger.kernel.org,
Andy Shevchenko <andy.shevchenko@gmail.com>,
Florin Laurentiu Chiculita <florinlaurentiu.chiculita@nxp.com>,
Madalin Bucur <madalin.bucur@oss.nxp.com>,
Makarand Pawagi <makarand.pawagi@nxp.com>,
Varun Sethi <V.Sethi@nxp.com>, Marcin Wojtas <mw@semihalf.com>,
linux-arm-kernel@lists.infradead.org,
Laurentiu Tudor <laurentiu.tudor@nxp.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Jeremy Linton <jeremy.linton@arm.com>,
linux.cj@gmail.com, "David S. Miller" <davem@davemloft.net>
Subject: Re: [RFC net-next PATCH v2 2/2] net: dpaa2-mac: Add ACPI support for DPAA2 MAC driver
Date: Mon, 20 Apr 2020 19:23:54 +0530 [thread overview]
Message-ID: <20200420135354.GA27078@lsv03152.swis.in-blr01.nxp.com> (raw)
In-Reply-To: <20200418113813.GT25745@shell.armlinux.org.uk>
On Sat, Apr 18, 2020 at 12:38:13PM +0100, Russell King - ARM Linux admin wrote:
> On Sat, Apr 18, 2020 at 04:24:32PM +0530, Calvin Johnson wrote:
> > Modify dpaa2_mac_connect() to support ACPI along with DT.
> > Modify dpaa2_mac_get_node() to get the dpmac fwnode from either
> > DT or ACPI.
> > Replace of_get_phy_mode with fwnode_get_phy_mode to get
> > phy-mode for a dpmac_node.
> > Define and use helper functions fwnode_phy_match() and
> > fwnode_phy_find_device() to find phy_dev that is later
> > connected to mac->phylink.
> >
> > Signed-off-by: Calvin Johnson <calvin.johnson@oss.nxp.com>
> > ---
> >
> > Changes in v2:
> > - Major change following other network drivers supporting ACPI
> > - dropped v1 patches 1, 2, 4, 5 and 6 as they are no longer valid
> > - incorporated other v1 review comments
> >
> > .../net/ethernet/freescale/dpaa2/dpaa2-mac.c | 122 ++++++++++++++----
> > 1 file changed, 94 insertions(+), 28 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
> > index 3ee236c5fc37..5a03da54a67f 100644
> > --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
> > +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
> > @@ -3,6 +3,9 @@
> >
> > #include "dpaa2-eth.h"
> > #include "dpaa2-mac.h"
> > +#include <linux/acpi.h>
> > +#include <linux/phy.h>
> > +#include <linux/phylink.h>
>
> Why do you need linux/phy.h and linux/phylink.h here? Please try
> building the driver without; you'll find they are already included
> via dpaa2-mac.h.
You are right. I'll remove them in v3
> > +static int fwnode_phy_match(struct device *dev, const void *phy_fwnode)
> > +{
> > + return dev->fwnode == phy_fwnode;
> > +}
> > +
> > +static struct phy_device *fwnode_phy_find_device(struct fwnode_handle *phy_fwnode)
> > +{
> > + struct device *d;
> > + struct mdio_device *mdiodev;
> > +
> > + if (!phy_fwnode)
> > + return NULL;
> > +
> > + d = bus_find_device(&mdio_bus_type, NULL, phy_fwnode, fwnode_phy_match);
> > + if (d) {
> > + mdiodev = to_mdio_device(d);
> > + if (mdiodev->flags & MDIO_DEVICE_FLAG_PHY)
> > + return to_phy_device(d);
> > + put_device(d);
> > + }
> > +
> > + return NULL;
> > +}
>
> This is groping around in the mdio bus implementation details; drivers
> must not do this layering violation. Please propose an interface in
> the mdio code to do what you need.
I'll study and propose a solution.
>
> > +
> > int dpaa2_mac_connect(struct dpaa2_mac *mac)
> > {
> > struct fsl_mc_device *dpmac_dev = mac->mc_dev;
> > struct net_device *net_dev = mac->net_dev;
> > - struct device_node *dpmac_node;
> > + struct fwnode_handle *dpmac_node = NULL;
> > + struct fwnode_reference_args args;
> > + struct phy_device *phy_dev;
> > struct phylink *phylink;
> > struct dpmac_attr attr;
> > + int status;
> > int err;
> >
> > err = dpmac_open(mac->mc_io, 0, dpmac_dev->obj_desc.id,
> > @@ -251,7 +299,7 @@ int dpaa2_mac_connect(struct dpaa2_mac *mac)
> >
> > mac->if_link_type = attr.link_type;
> >
> > - dpmac_node = dpaa2_mac_get_node(attr.id);
> > + dpmac_node = dpaa2_mac_get_node(&mac->mc_dev->dev, attr.id);
> > if (!dpmac_node) {
> > netdev_err(net_dev, "No dpmac@%d node found.\n", attr.id);
> > err = -ENODEV;
> > @@ -269,7 +317,7 @@ int dpaa2_mac_connect(struct dpaa2_mac *mac)
> > * error out if the interface mode requests them and there is no PHY
> > * to act upon them
> > */
> > - if (of_phy_is_fixed_link(dpmac_node) &&
> > + if (of_phy_is_fixed_link(to_of_node(dpmac_node)) &&
> > (mac->if_mode == PHY_INTERFACE_MODE_RGMII_ID ||
> > mac->if_mode == PHY_INTERFACE_MODE_RGMII_RXID ||
> > mac->if_mode == PHY_INTERFACE_MODE_RGMII_TXID)) {
> > @@ -282,7 +330,7 @@ int dpaa2_mac_connect(struct dpaa2_mac *mac)
> > mac->phylink_config.type = PHYLINK_NETDEV;
> >
> > phylink = phylink_create(&mac->phylink_config,
> > - of_fwnode_handle(dpmac_node), mac->if_mode,
> > + dpmac_node, mac->if_mode,
> > &dpaa2_mac_phylink_ops);
> > if (IS_ERR(phylink)) {
> > err = PTR_ERR(phylink);
> > @@ -290,20 +338,38 @@ int dpaa2_mac_connect(struct dpaa2_mac *mac)
> > }
> > mac->phylink = phylink;
> >
> > - err = phylink_of_phy_connect(mac->phylink, dpmac_node, 0);
> > + if (is_of_node(dpmac_node))
> > + err = phylink_of_phy_connect(mac->phylink,
> > + to_of_node(dpmac_node), 0);
> > + else if (is_acpi_node(dpmac_node)) {
> > + status = acpi_node_get_property_reference(dpmac_node,
> > + "phy-handle",
> > + 0, &args);
> > + if (ACPI_FAILURE(status))
> > + goto err_phylink_destroy;
> > + phy_dev = fwnode_phy_find_device(args.fwnode);
> > + if (!phy_dev)
> > + goto err_phylink_destroy;
> > +
> > + err = phylink_connect_phy(mac->phylink, phy_dev);
> > + if (err)
> > + phy_detach(phy_dev);
>
> phy_detach() reverses the effect of phy_attach_direct(). This is not
> the correct cleanup function in this case, because the PHY hasn't been
> attached (and phylink_connect_phy() will clean up any effects it has
> on error.) You only need to reverse the effect of your
> fwnode_phy_find_device(), which phy_detach() is inappropriate for.
Got it. I'll repair this part.
>
> In any case, if this method of getting a PHY is accepted by ACPI folk,
> it could be moved into a helper in phylink_fwnode_phy_connect() - and
> that really needs to happen before a patch adding this functionality is
> acceptable.
There is already similar code in upstream kernel:
https://elixir.bootlin.com/linux/v5.7-rc2/source/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c#L825
It makes sense to have a generic helper. Will create one.
Hope I can introduce it in the v3 patchset, ofcourse phylink_fwnode_phy_connect will be
defined in a patch before it is called. Let me know if it is not okay.
>
> > + }
> > if (err) {
> > - netdev_err(net_dev, "phylink_of_phy_connect() = %d\n", err);
> > + netdev_err(net_dev, "phylink_fwnode_phy_connect() = %d\n", err);
>
> That's a very misleading change - there is no function named as per your
> new name.
My bad. Sorry. Will correct it.
Thanks
Calvin
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-04-20 13:54 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-18 10:54 [RFC net-next PATCH v2 0/2] ACPI support for xgmac_mdio and dpaa2-mac drivers Calvin Johnson
2020-04-18 10:54 ` [RFC net-next PATCH v2 1/2] net/fsl: add ACPI support for mdio bus Calvin Johnson
2020-04-18 11:41 ` Russell King - ARM Linux admin
2020-04-18 11:50 ` Andy Shevchenko
2020-04-18 14:39 ` Andrew Lunn
2020-04-20 15:42 ` Calvin Johnson
2020-04-18 14:46 ` Andrew Lunn
2020-04-20 15:44 ` Calvin Johnson
2020-04-18 10:54 ` [RFC net-next PATCH v2 2/2] net: dpaa2-mac: Add ACPI support for DPAA2 MAC driver Calvin Johnson
2020-04-18 11:38 ` Russell King - ARM Linux admin
2020-04-20 13:53 ` Calvin Johnson [this message]
2020-04-18 15:00 ` Andrew Lunn
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=20200420135354.GA27078@lsv03152.swis.in-blr01.nxp.com \
--to=calvin.johnson@oss.nxp.com \
--cc=V.Sethi@nxp.com \
--cc=andrew@lunn.ch \
--cc=andy.shevchenko@gmail.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=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=linux@armlinux.org.uk \
--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=rajesh.bikkina@nxp.com \
--cc=ruxandra.radulescu@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).