From: Calvin Johnson <calvin.johnson@oss.nxp.com>
To: Jeremy Linton <jeremy.linton@arm.com>,
Russell King - ARM Linux admin <linux@armlinux.org.uk>,
Jon <jon@solid-run.com>,
Cristi Sovaiala <cristian.sovaiala@nxp.com>,
Ioana Ciornei <ioana.ciornei@nxp.com>,
Andrew Lunn <andrew@lunn.ch>,
Andy Shevchenko <andy.shevchenko@gmail.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Madalin Bucur <madalin.bucur@oss.nxp.com>
Cc: netdev@vger.kernel.org, linux.cj@gmail.com,
linux-acpi@vger.kernel.org,
Calvin Johnson <calvin.johnson@oss.nxp.com>
Subject: [net-next PATCH v7 4/6] net: phy: introduce phy_find_by_mdio_handle()
Date: Wed, 15 Jul 2020 14:33:58 +0530 [thread overview]
Message-ID: <20200715090400.4733-5-calvin.johnson@oss.nxp.com> (raw)
In-Reply-To: <20200715090400.4733-1-calvin.johnson@oss.nxp.com>
The PHYs on an mdiobus are probed and registered using mdiobus_register().
Later, for connecting these PHYs to MAC, the PHYs registered on the
mdiobus have to be referenced.
For each MAC node, a property "mdio-handle" is used to reference the
MDIO bus on which the PHYs are registered. On getting hold of the MDIO
bus, use phy_find_by_fwnode() to get the PHY connected to the MAC.
Introduce fwnode_mdio_find_bus() to find the mii_bus that corresponds
to given mii_bus fwnode.
Signed-off-by: Calvin Johnson <calvin.johnson@oss.nxp.com>
---
Changes in v7:
- remove unnecessary -ve check for u32 var
Changes in v6: None
Changes in v5:
- rename phy_find_by_fwnode() to phy_find_by_mdio_handle()
- add docment for phy_find_by_mdio_handle()
- error out DT in phy_find_by_mdio_handle()
- clean up err return
Changes in v4:
- release fwnode_mdio after use
- return ERR_PTR instead of NULL
Changes in v3:
- introduce fwnode_mdio_find_bus()
- renamed and improved phy_find_by_fwnode()
Changes in v2: None
drivers/net/phy/mdio_bus.c | 25 ++++++++++++++++++++++
drivers/net/phy/phy_device.c | 40 ++++++++++++++++++++++++++++++++++++
include/linux/phy.h | 2 ++
3 files changed, 67 insertions(+)
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 8610f938f81f..d9597c5b55ae 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -435,6 +435,31 @@ struct mii_bus *of_mdio_find_bus(struct device_node *mdio_bus_np)
}
EXPORT_SYMBOL(of_mdio_find_bus);
+/**
+ * fwnode_mdio_find_bus - Given an mii_bus fwnode, find the mii_bus.
+ * @mdio_bus_fwnode: fwnode of the mii_bus.
+ *
+ * Returns a reference to the mii_bus, or NULL if none found. The
+ * embedded struct device will have its reference count incremented,
+ * and this must be put once the bus is finished with.
+ *
+ * Because the association of a fwnode and mii_bus is made via
+ * mdiobus_register(), the mii_bus cannot be found before it is
+ * registered with mdiobus_register().
+ *
+ */
+struct mii_bus *fwnode_mdio_find_bus(struct fwnode_handle *mdio_bus_fwnode)
+{
+ struct device *d;
+
+ if (!mdio_bus_fwnode)
+ return NULL;
+
+ d = class_find_device_by_fwnode(&mdio_bus_class, mdio_bus_fwnode);
+ return d ? to_mii_bus(d) : NULL;
+}
+EXPORT_SYMBOL(fwnode_mdio_find_bus);
+
/* Walk the list of subnodes of a mdio bus and look for a node that
* matches the mdio device's address with its 'reg' property. If
* found, set the of_node pointer for the mdio device. This allows
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 7cda95330aea..38d781720670 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -23,8 +23,10 @@
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/netdevice.h>
+#include <linux/of.h>
#include <linux/phy.h>
#include <linux/phy_led_triggers.h>
+#include <linux/platform_device.h>
#include <linux/property.h>
#include <linux/sfp.h>
#include <linux/skbuff.h>
@@ -964,6 +966,44 @@ struct phy_device *phy_find_first(struct mii_bus *bus)
}
EXPORT_SYMBOL(phy_find_first);
+/**
+ * phy_find_by_mdio_handle - get phy device from mdio-handle and phy-channel
+ * @fwnode: a pointer to a &struct fwnode_handle to get mdio-handle and
+ * phy-channel
+ *
+ * Find fwnode_mdio using mdio-handle reference. Using fwnode_mdio get the
+ * mdio bus. Property phy-channel provides the phy address on the mdio bus.
+ * Pass mdio bus and phy address to mdiobus_get_phy() and get corresponding
+ * phy_device. This method is used for ACPI and not for DT.
+ *
+ * Returns pointer to the phy device on success, else ERR_PTR.
+ */
+struct phy_device *phy_find_by_mdio_handle(struct fwnode_handle *fwnode)
+{
+ struct fwnode_handle *fwnode_mdio;
+ struct mii_bus *mdio;
+ int addr;
+ int err;
+
+ if (is_of_node(fwnode))
+ return ERR_PTR(-EINVAL);
+
+ fwnode_mdio = fwnode_find_reference(fwnode, "mdio-handle", 0);
+ mdio = fwnode_mdio_find_bus(fwnode_mdio);
+ fwnode_handle_put(fwnode_mdio);
+ if (!mdio)
+ return ERR_PTR(-ENODEV);
+
+ err = fwnode_property_read_u32(fwnode, "phy-channel", &addr);
+ if (err)
+ return ERR_PTR(err);
+ if (addr >= PHY_MAX_ADDR)
+ return ERR_PTR(-EINVAL);
+
+ return mdiobus_get_phy(mdio, addr);
+}
+EXPORT_SYMBOL(phy_find_by_mdio_handle);
+
static void phy_link_change(struct phy_device *phydev, bool up)
{
struct net_device *netdev = phydev->attached_dev;
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 0403eb799913..fd383a22eb61 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -334,6 +334,7 @@ static inline struct mii_bus *devm_mdiobus_alloc(struct device *dev)
}
struct mii_bus *mdio_find_bus(const char *mdio_name);
+struct mii_bus *fwnode_mdio_find_bus(struct fwnode_handle *mdio_bus_fwnode);
struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr);
#define PHY_INTERRUPT_DISABLED false
@@ -1245,6 +1246,7 @@ int phy_sfp_probe(struct phy_device *phydev,
struct phy_device *phy_attach(struct net_device *dev, const char *bus_id,
phy_interface_t interface);
struct phy_device *phy_find_first(struct mii_bus *bus);
+struct phy_device *phy_find_by_mdio_handle(struct fwnode_handle *fwnode);
int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
u32 flags, phy_interface_t interface);
int phy_connect_direct(struct net_device *dev, struct phy_device *phydev,
--
2.17.1
next prev parent reply other threads:[~2020-07-15 9:04 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-15 9:03 [net-next PATCH v7 0/6] ACPI support for dpaa2 MAC driver Calvin Johnson
2020-07-15 9:03 ` [net-next PATCH v7 1/6] Documentation: ACPI: DSD: Document MDIO PHY Calvin Johnson
2020-07-16 3:04 ` Florian Fainelli
2020-07-16 3:11 ` Andrew Lunn
2020-07-23 23:26 ` Jeremy Linton
2020-07-24 13:39 ` Andrew Lunn
2020-07-24 17:26 ` Jeremy Linton
2020-07-24 17:39 ` Florian Fainelli
2020-07-24 19:20 ` Andrew Lunn
2020-07-24 20:12 ` Andy Shevchenko
2020-07-24 20:13 ` Florian Fainelli
2020-07-24 20:20 ` Andy Shevchenko
2020-07-25 7:36 ` Calvin Johnson
2020-07-25 10:48 ` Andy Shevchenko
2020-07-24 21:06 ` Russell King - ARM Linux admin
2020-07-27 17:03 ` Sudeep Holla
2020-07-24 19:14 ` Andrew Lunn
2020-07-27 17:21 ` Sudeep Holla
2020-07-28 20:34 ` Andrew Lunn
2020-07-28 20:59 ` Russell King - ARM Linux admin
2020-07-28 21:26 ` Andy Shevchenko
2020-07-29 16:00 ` Rafael J. Wysocki
2020-07-31 15:08 ` Andrew Lunn
2020-07-27 17:32 ` Jon Nettleton
[not found] ` <1595922651-sup-5323@galangal.danc.bne.opengear.com>
2020-07-28 20:45 ` Andrew Lunn
2020-07-28 20:56 ` Florian Fainelli
2020-07-28 21:28 ` Andy Shevchenko
2020-07-28 21:40 ` Florian Fainelli
2020-07-31 15:14 ` Andrew Lunn
2020-09-25 13:22 ` Grant Likely
2020-07-28 22:30 ` Jeremy Linton
2020-07-29 0:39 ` Florian Fainelli
2020-07-29 2:53 ` Jeremy Linton
2020-07-29 3:16 ` Florian Fainelli
2020-07-29 8:43 ` Jon Nettleton
2020-07-29 9:39 ` Calvin Johnson
2020-09-25 13:34 ` Grant Likely
2020-09-26 4:30 ` Calvin Johnson
2020-09-29 5:17 ` Calvin Johnson
2020-09-29 13:43 ` Andrew Lunn
2020-09-29 13:55 ` Andy Shevchenko
2020-09-29 14:32 ` Andrew Lunn
2020-09-29 14:46 ` Andy Shevchenko
2020-09-29 15:06 ` Andrew Lunn
2020-09-29 15:29 ` Arnd Bergmann
2020-09-29 14:44 ` Arnd Bergmann
2020-09-29 14:59 ` Andrew Lunn
2020-09-29 15:59 ` Grant Likely
2020-09-29 15:53 ` Grant Likely
2020-09-29 16:04 ` Calvin Johnson
2020-07-15 9:03 ` [net-next PATCH v7 2/6] net: phy: introduce device_mdiobus_register() Calvin Johnson
2020-07-16 3:05 ` Florian Fainelli
2020-07-15 9:03 ` [net-next PATCH v7 3/6] net/fsl: use device_mdiobus_register() Calvin Johnson
2020-07-16 3:05 ` Florian Fainelli
2020-07-15 9:03 ` Calvin Johnson [this message]
2020-07-16 3:06 ` [net-next PATCH v7 4/6] net: phy: introduce phy_find_by_mdio_handle() Florian Fainelli
2020-07-15 9:03 ` [net-next PATCH v7 5/6] phylink: introduce phylink_fwnode_phy_connect() Calvin Johnson
2020-07-15 9:04 ` [net-next PATCH v7 6/6] net: dpaa2-mac: Add ACPI support for DPAA2 MAC driver Calvin Johnson
2020-09-25 13:39 ` [net-next PATCH v7 0/6] ACPI support for dpaa2 " Grant Likely
2020-09-26 4:34 ` Calvin Johnson
2020-07-25 14:23 Calvin Johnson
2020-07-25 14:24 ` [net-next PATCH v7 4/6] net: phy: introduce phy_find_by_mdio_handle() Calvin Johnson
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=20200715090400.4733-5-calvin.johnson@oss.nxp.com \
--to=calvin.johnson@oss.nxp.com \
--cc=andrew@lunn.ch \
--cc=andy.shevchenko@gmail.com \
--cc=cristian.sovaiala@nxp.com \
--cc=f.fainelli@gmail.com \
--cc=ioana.ciornei@nxp.com \
--cc=jeremy.linton@arm.com \
--cc=jon@solid-run.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux.cj@gmail.com \
--cc=linux@armlinux.org.uk \
--cc=madalin.bucur@oss.nxp.com \
--cc=netdev@vger.kernel.org \
/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).