From: Calvin Johnson <calvin.johnson@oss.nxp.com>
To: Grant Likely <grant.likely@arm.com>,
"Rafael J . Wysocki" <rafael@kernel.org>,
Jeremy Linton <jeremy.linton@arm.com>,
Andrew Lunn <andrew@lunn.ch>,
Andy Shevchenko <andy.shevchenko@gmail.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Russell King - ARM Linux admin <linux@armlinux.org.uk>,
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>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Marcin Wojtas <mw@semihalf.com>,
Pieter Jansen Van Vuuren <pieter.jansenvv@bamboosystems.io>,
Jon <jon@solid-run.com>, Saravana Kannan <saravanak@google.com>,
Randy Dunlap <rdunlap@infradead.org>
Cc: Laurentiu Tudor <laurentiu.tudor@nxp.com>,
linux-kernel@vger.kernel.org, linux.cj@gmail.com,
Diana Madalina Craciun <diana.craciun@nxp.com>,
netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-acpi@vger.kernel.org,
Calvin Johnson <calvin.johnson@oss.nxp.com>,
"David S. Miller" <davem@davemloft.net>,
Frank Rowand <frowand.list@gmail.com>,
Heiner Kallweit <hkallweit1@gmail.com>,
Jakub Kicinski <kuba@kernel.org>,
Rob Herring <robh+dt@kernel.org>,
devicetree@vger.kernel.org
Subject: [net-next PATCH v5 07/15] net: mdiobus: Introduce fwnode_mdiobus_register_phy()
Date: Mon, 8 Feb 2021 20:42:36 +0530 [thread overview]
Message-ID: <20210208151244.16338-8-calvin.johnson@oss.nxp.com> (raw)
In-Reply-To: <20210208151244.16338-1-calvin.johnson@oss.nxp.com>
Introduce fwnode_mdiobus_register_phy() to register PHYs on the
mdiobus. From the compatible string, identify whether the PHY is
c45 and based on this create a PHY device instance which is
registered on the mdiobus.
Signed-off-by: Calvin Johnson <calvin.johnson@oss.nxp.com>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
drivers/net/mdio/of_mdio.c | 3 +-
drivers/net/phy/mdio_bus.c | 65 ++++++++++++++++++++++++++++++++++++++
include/linux/mdio.h | 2 ++
include/linux/of_mdio.h | 6 +++-
4 files changed, 74 insertions(+), 2 deletions(-)
diff --git a/drivers/net/mdio/of_mdio.c b/drivers/net/mdio/of_mdio.c
index d4cc293358f7..cd7da38ae763 100644
--- a/drivers/net/mdio/of_mdio.c
+++ b/drivers/net/mdio/of_mdio.c
@@ -32,7 +32,7 @@ static int of_get_phy_id(struct device_node *device, u32 *phy_id)
return fwnode_get_phy_id(of_fwnode_handle(device), phy_id);
}
-static struct mii_timestamper *of_find_mii_timestamper(struct device_node *node)
+struct mii_timestamper *of_find_mii_timestamper(struct device_node *node)
{
struct of_phandle_args arg;
int err;
@@ -49,6 +49,7 @@ static struct mii_timestamper *of_find_mii_timestamper(struct device_node *node)
return register_mii_timestamper(arg.np, arg.args[0]);
}
+EXPORT_SYMBOL(of_find_mii_timestamper);
int of_mdiobus_phy_device_register(struct mii_bus *mdio, struct phy_device *phy,
struct device_node *child, u32 addr)
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 823518554079..33d1667fdeca 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -8,6 +8,7 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#include <linux/acpi.h>
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/errno.h>
@@ -106,6 +107,70 @@ int mdiobus_unregister_device(struct mdio_device *mdiodev)
}
EXPORT_SYMBOL(mdiobus_unregister_device);
+int fwnode_mdiobus_register_phy(struct mii_bus *bus,
+ struct fwnode_handle *child, u32 addr)
+{
+ struct mii_timestamper *mii_ts;
+ struct phy_device *phy;
+ bool is_c45 = false;
+ u32 phy_id;
+ int rc;
+
+ if (is_of_node(child)) {
+ mii_ts = of_find_mii_timestamper(to_of_node(child));
+ if (IS_ERR(mii_ts))
+ return PTR_ERR(mii_ts);
+ }
+
+ rc = fwnode_property_match_string(child, "compatible", "ethernet-phy-ieee802.3-c45");
+ if (rc >= 0)
+ is_c45 = true;
+
+ if (is_c45 || fwnode_get_phy_id(child, &phy_id))
+ phy = get_phy_device(bus, addr, is_c45);
+ else
+ phy = phy_device_create(bus, addr, phy_id, 0, NULL);
+ if (IS_ERR(phy)) {
+ if (mii_ts && is_of_node(child))
+ unregister_mii_timestamper(mii_ts);
+ return PTR_ERR(phy);
+ }
+
+ if (is_acpi_node(child)) {
+ phy->irq = bus->irq[addr];
+
+ /* Associate the fwnode with the device structure so it
+ * can be looked up later.
+ */
+ phy->mdio.dev.fwnode = child;
+
+ /* All data is now stored in the phy struct, so register it */
+ rc = phy_device_register(phy);
+ if (rc) {
+ phy_device_free(phy);
+ fwnode_handle_put(phy->mdio.dev.fwnode);
+ return rc;
+ }
+ } else if (is_of_node(child)) {
+ rc = of_mdiobus_phy_device_register(bus, phy, to_of_node(child), addr);
+ if (rc) {
+ if (mii_ts)
+ unregister_mii_timestamper(mii_ts);
+ phy_device_free(phy);
+ return rc;
+ }
+
+ /* phy->mii_ts may already be defined by the PHY driver. A
+ * mii_timestamper probed via the device tree will still have
+ * precedence.
+ */
+ if (mii_ts)
+ phy->mii_ts = mii_ts;
+ }
+ return 0;
+}
+EXPORT_SYMBOL(fwnode_mdiobus_register_phy);
+
struct phy_device *mdiobus_get_phy(struct mii_bus *bus, int addr)
{
struct mdio_device *mdiodev = bus->mdio_map[addr];
diff --git a/include/linux/mdio.h b/include/linux/mdio.h
index ffb787d5ebde..7f4215c069fe 100644
--- a/include/linux/mdio.h
+++ b/include/linux/mdio.h
@@ -381,6 +381,8 @@ int mdiobus_register_device(struct mdio_device *mdiodev);
int mdiobus_unregister_device(struct mdio_device *mdiodev);
bool mdiobus_is_registered_device(struct mii_bus *bus, int addr);
struct phy_device *mdiobus_get_phy(struct mii_bus *bus, int addr);
+int fwnode_mdiobus_register_phy(struct mii_bus *bus,
+ struct fwnode_handle *child, u32 addr);
/**
* mdio_module_driver() - Helper macro for registering mdio drivers
diff --git a/include/linux/of_mdio.h b/include/linux/of_mdio.h
index cfe8c607a628..3b66016f18aa 100644
--- a/include/linux/of_mdio.h
+++ b/include/linux/of_mdio.h
@@ -34,6 +34,7 @@ struct mii_bus *of_mdio_find_bus(struct device_node *mdio_np);
int of_phy_register_fixed_link(struct device_node *np);
void of_phy_deregister_fixed_link(struct device_node *np);
bool of_phy_is_fixed_link(struct device_node *np);
+struct mii_timestamper *of_find_mii_timestamper(struct device_node *np);
int of_mdiobus_phy_device_register(struct mii_bus *mdio, struct phy_device *phy,
struct device_node *child, u32 addr);
@@ -128,7 +129,10 @@ static inline bool of_phy_is_fixed_link(struct device_node *np)
{
return false;
}
-
+static inline struct mii_timestamper *of_find_mii_timestamper(struct device_node *np)
+{
+ return NULL;
+}
static inline int of_mdiobus_phy_device_register(struct mii_bus *mdio,
struct phy_device *phy,
struct device_node *child, u32 addr)
--
2.17.1
next prev parent reply other threads:[~2021-02-08 16:49 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-08 15:12 [net-next PATCH v5 00/15] ACPI support for dpaa2 driver Calvin Johnson
2021-02-08 15:12 ` [net-next PATCH v5 01/15] Documentation: ACPI: DSD: Document MDIO PHY Calvin Johnson
2021-02-08 20:01 ` Randy Dunlap
2021-02-09 14:34 ` Calvin Johnson
2021-02-08 15:12 ` [net-next PATCH v5 02/15] net: phy: Introduce fwnode_mdio_find_device() Calvin Johnson
2021-02-08 15:12 ` [net-next PATCH v5 03/15] net: phy: Introduce phy related fwnode functions Calvin Johnson
2021-02-08 15:12 ` [net-next PATCH v5 04/15] of: mdio: Refactor of_phy_find_device() Calvin Johnson
2021-02-08 15:12 ` [net-next PATCH v5 05/15] net: phy: Introduce fwnode_get_phy_id() Calvin Johnson
2021-02-08 15:12 ` [net-next PATCH v5 06/15] of: mdio: Refactor of_get_phy_id() Calvin Johnson
2021-02-08 15:12 ` Calvin Johnson [this message]
2021-02-08 17:40 ` [net-next PATCH v5 07/15] net: mdiobus: Introduce fwnode_mdiobus_register_phy() Russell King - ARM Linux admin
2021-02-09 15:04 ` Calvin Johnson
2021-02-08 15:12 ` [net-next PATCH v5 08/15] of: mdio: Refactor of_mdiobus_register_phy() Calvin Johnson
2021-02-08 15:12 ` [net-next PATCH v5 09/15] ACPI: utils: Introduce acpi_get_local_address() Calvin Johnson
2021-02-08 15:12 ` [net-next PATCH v5 10/15] net: mdio: Add ACPI support code for mdio Calvin Johnson
2021-02-08 16:16 ` Andy Shevchenko
2021-02-08 15:12 ` [net-next PATCH v5 11/15] net: mdiobus: Introduce fwnode_mdiobus_register() Calvin Johnson
2021-02-08 15:12 ` [net-next PATCH v5 12/15] net/fsl: Use fwnode_mdiobus_register() Calvin Johnson
2021-02-08 15:12 ` [net-next PATCH v5 13/15] phylink: introduce phylink_fwnode_phy_connect() Calvin Johnson
2021-02-08 15:31 ` Russell King - ARM Linux admin
2021-02-15 5:55 ` Calvin Johnson
2021-02-15 6:01 ` Calvin Johnson
2021-02-08 16:20 ` Russell King - ARM Linux admin
2021-02-08 15:12 ` [net-next PATCH v5 14/15] net: phylink: Refactor phylink_of_phy_connect() Calvin Johnson
2021-02-08 15:12 ` [net-next PATCH v5 15/15] net: dpaa2-mac: Add ACPI support for DPAA2 MAC driver Calvin Johnson
2021-02-08 16:21 ` Andy Shevchenko
2021-02-08 16:28 ` Russell King - ARM Linux admin
2021-02-15 12:33 ` Calvin Johnson
2021-02-15 15:13 ` Andy Shevchenko
2021-02-15 15:15 ` Andy Shevchenko
2021-02-16 9:59 ` 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=20210208151244.16338-8-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=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=diana.craciun@nxp.com \
--cc=f.fainelli@gmail.com \
--cc=florinlaurentiu.chiculita@nxp.com \
--cc=frowand.list@gmail.com \
--cc=grant.likely@arm.com \
--cc=heikki.krogerus@linux.intel.com \
--cc=hkallweit1@gmail.com \
--cc=ioana.ciornei@nxp.com \
--cc=jeremy.linton@arm.com \
--cc=jon@solid-run.com \
--cc=kuba@kernel.org \
--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=mw@semihalf.com \
--cc=netdev@vger.kernel.org \
--cc=pieter.jansenvv@bamboosystems.io \
--cc=rafael@kernel.org \
--cc=rdunlap@infradead.org \
--cc=robh+dt@kernel.org \
--cc=saravanak@google.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).