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: linux-arm-kernel@lists.infradead.org,
Diana Madalina Craciun <diana.craciun@nxp.com>,
linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org,
linux.cj@gmail.com, netdev@vger.kernel.org,
Laurentiu Tudor <laurentiu.tudor@nxp.com>,
Calvin Johnson <calvin.johnson@oss.nxp.com>,
"David S. Miller" <davem@davemloft.net>,
Heiner Kallweit <hkallweit1@gmail.com>,
Jakub Kicinski <kuba@kernel.org>
Subject: [net-next PATCH v7 11/16] net: mdio: Add ACPI support code for mdio
Date: Thu, 11 Mar 2021 11:50:06 +0530 [thread overview]
Message-ID: <20210311062011.8054-12-calvin.johnson@oss.nxp.com> (raw)
In-Reply-To: <20210311062011.8054-1-calvin.johnson@oss.nxp.com>
Define acpi_mdiobus_register() to Register mii_bus and create PHYs for
each ACPI child node.
Signed-off-by: Calvin Johnson <calvin.johnson@oss.nxp.com>
---
Changes in v7:
- Include headers directly used in acpi_mdio.c
Changes in v6:
- use GENMASK() and ACPI_COMPANION_SET()
- some cleanup
- remove unwanted header inclusion
Changes in v5:
- add missing MODULE_LICENSE()
- replace fwnode_get_id() with OF and ACPI function calls
Changes in v4: None
Changes in v3: None
Changes in v2: None
MAINTAINERS | 1 +
drivers/net/mdio/Kconfig | 7 +++++
drivers/net/mdio/Makefile | 1 +
drivers/net/mdio/acpi_mdio.c | 56 ++++++++++++++++++++++++++++++++++++
include/linux/acpi_mdio.h | 25 ++++++++++++++++
5 files changed, 90 insertions(+)
create mode 100644 drivers/net/mdio/acpi_mdio.c
create mode 100644 include/linux/acpi_mdio.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 146de41d2656..051377b7fa94 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6680,6 +6680,7 @@ F: Documentation/devicetree/bindings/net/mdio*
F: Documentation/devicetree/bindings/net/qca,ar803x.yaml
F: Documentation/networking/phy.rst
F: drivers/net/mdio/
+F: drivers/net/mdio/acpi_mdio.c
F: drivers/net/mdio/fwnode_mdio.c
F: drivers/net/mdio/of_mdio.c
F: drivers/net/pcs/
diff --git a/drivers/net/mdio/Kconfig b/drivers/net/mdio/Kconfig
index 2d5bf5ccffb5..fc8c787b448f 100644
--- a/drivers/net/mdio/Kconfig
+++ b/drivers/net/mdio/Kconfig
@@ -36,6 +36,13 @@ config OF_MDIO
help
OpenFirmware MDIO bus (Ethernet PHY) accessors
+config ACPI_MDIO
+ def_tristate PHYLIB
+ depends on ACPI
+ depends on PHYLIB
+ help
+ ACPI MDIO bus (Ethernet PHY) accessors
+
if MDIO_BUS
config MDIO_DEVRES
diff --git a/drivers/net/mdio/Makefile b/drivers/net/mdio/Makefile
index ea5390e2ef84..e8b739a3df1c 100644
--- a/drivers/net/mdio/Makefile
+++ b/drivers/net/mdio/Makefile
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
# Makefile for Linux MDIO bus drivers
+obj-$(CONFIG_ACPI_MDIO) += acpi_mdio.o
obj-$(CONFIG_FWNODE_MDIO) += fwnode_mdio.o
obj-$(CONFIG_OF_MDIO) += of_mdio.o
diff --git a/drivers/net/mdio/acpi_mdio.c b/drivers/net/mdio/acpi_mdio.c
new file mode 100644
index 000000000000..60a86e3fc246
--- /dev/null
+++ b/drivers/net/mdio/acpi_mdio.c
@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * ACPI helpers for the MDIO (Ethernet PHY) API
+ *
+ * This file provides helper functions for extracting PHY device information
+ * out of the ACPI ASL and using it to populate an mii_bus.
+ */
+
+#include <linux/acpi.h>
+#include <linux/acpi_mdio.h>
+#include <linux/bits.h>
+#include <linux/dev_printk.h>
+#include <linux/fwnode_mdio.h>
+#include <linux/module.h>
+#include <linux/types.h>
+
+MODULE_AUTHOR("Calvin Johnson <calvin.johnson@oss.nxp.com>");
+MODULE_LICENSE("GPL");
+
+/**
+ * acpi_mdiobus_register - Register mii_bus and create PHYs from the ACPI ASL.
+ * @mdio: pointer to mii_bus structure
+ * @fwnode: pointer to fwnode of MDIO bus.
+ *
+ * This function registers the mii_bus structure and registers a phy_device
+ * for each child node of @fwnode.
+ */
+int acpi_mdiobus_register(struct mii_bus *mdio, struct fwnode_handle *fwnode)
+{
+ struct fwnode_handle *child;
+ u32 addr;
+ int ret;
+
+ /* Mask out all PHYs from auto probing. */
+ mdio->phy_mask = GENMASK(31, 0);
+ ret = mdiobus_register(mdio);
+ if (ret)
+ return ret;
+
+ ACPI_COMPANION_SET(&mdio->dev, to_acpi_device_node(fwnode));
+
+ /* Loop over the child nodes and register a phy_device for each PHY */
+ fwnode_for_each_child_node(fwnode, child) {
+ ret = acpi_get_local_address(ACPI_HANDLE_FWNODE(child), &addr);
+ if (ret || addr >= PHY_MAX_ADDR)
+ continue;
+
+ ret = fwnode_mdiobus_register_phy(mdio, child, addr);
+ if (ret == -ENODEV)
+ dev_err(&mdio->dev,
+ "MDIO device at address %d is missing.\n",
+ addr);
+ }
+ return 0;
+}
+EXPORT_SYMBOL(acpi_mdiobus_register);
diff --git a/include/linux/acpi_mdio.h b/include/linux/acpi_mdio.h
new file mode 100644
index 000000000000..748d261fe2f9
--- /dev/null
+++ b/include/linux/acpi_mdio.h
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * ACPI helper for the MDIO (Ethernet PHY) API
+ */
+
+#ifndef __LINUX_ACPI_MDIO_H
+#define __LINUX_ACPI_MDIO_H
+
+#include <linux/phy.h>
+
+#if IS_ENABLED(CONFIG_ACPI_MDIO)
+int acpi_mdiobus_register(struct mii_bus *mdio, struct fwnode_handle *fwnode);
+#else /* CONFIG_ACPI_MDIO */
+static inline int acpi_mdiobus_register(struct mii_bus *mdio, struct fwnode_handle *fwnode)
+{
+ /*
+ * Fall back to mdiobus_register() function to register a bus.
+ * This way, we don't have to keep compat bits around in drivers.
+ */
+
+ return mdiobus_register(mdio);
+}
+#endif
+
+#endif /* __LINUX_ACPI_MDIO_H */
--
2.17.1
next prev parent reply other threads:[~2021-03-11 6:23 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-11 6:19 [net-next PATCH v7 00/16] ACPI support for dpaa2 driver Calvin Johnson
2021-03-11 6:19 ` [net-next PATCH v7 01/16] Documentation: ACPI: DSD: Document MDIO PHY Calvin Johnson
2021-03-11 6:19 ` [net-next PATCH v7 02/16] net: phy: Introduce fwnode_mdio_find_device() Calvin Johnson
2021-03-11 6:50 ` Saravana Kannan
2021-03-11 16:58 ` Calvin Johnson
2021-03-11 6:19 ` [net-next PATCH v7 03/16] net: phy: Introduce phy related fwnode functions Calvin Johnson
2021-03-11 6:19 ` [net-next PATCH v7 04/16] of: mdio: Refactor of_phy_find_device() Calvin Johnson
2021-03-16 19:17 ` Daniel Thompson
2021-03-17 8:45 ` Calvin Johnson
2021-03-19 11:21 ` Daniel Thompson
2021-03-23 5:27 ` Calvin Johnson
2021-03-11 6:20 ` [net-next PATCH v7 05/16] net: phy: Introduce fwnode_get_phy_id() Calvin Johnson
2021-03-11 6:20 ` [net-next PATCH v7 06/16] of: mdio: Refactor of_get_phy_id() Calvin Johnson
2021-03-11 6:20 ` [net-next PATCH v7 07/16] net: mii_timestamper: check NULL in unregister_mii_timestamper() Calvin Johnson
2021-03-11 12:04 ` Andy Shevchenko
2021-03-11 17:03 ` Calvin Johnson
2021-03-11 6:20 ` [net-next PATCH v7 08/16] net: mdiobus: Introduce fwnode_mdiobus_register_phy() Calvin Johnson
2021-03-11 12:09 ` Andy Shevchenko
2021-03-11 18:00 ` Calvin Johnson
2021-03-11 18:14 ` Andy Shevchenko
2021-03-11 6:20 ` [net-next PATCH v7 09/16] of: mdio: Refactor of_mdiobus_register_phy() Calvin Johnson
2021-03-11 6:20 ` [net-next PATCH v7 10/16] ACPI: utils: Introduce acpi_get_local_address() Calvin Johnson
2021-03-11 12:10 ` Andy Shevchenko
2021-03-11 6:20 ` Calvin Johnson [this message]
2021-03-11 12:14 ` [net-next PATCH v7 11/16] net: mdio: Add ACPI support code for mdio Andy Shevchenko
2021-03-15 10:21 ` Calvin Johnson
2021-03-11 6:20 ` [net-next PATCH v7 12/16] net: mdiobus: Introduce fwnode_mdiobus_register() Calvin Johnson
2021-03-11 6:20 ` [net-next PATCH v7 13/16] net/fsl: Use fwnode_mdiobus_register() Calvin Johnson
2021-03-11 6:20 ` [net-next PATCH v7 14/16] net: phylink: introduce phylink_fwnode_phy_connect() Calvin Johnson
2021-03-11 6:20 ` [net-next PATCH v7 15/16] net: phylink: Refactor phylink_of_phy_connect() Calvin Johnson
2021-03-11 6:20 ` [net-next PATCH v7 16/16] net: dpaa2-mac: Add ACPI support for DPAA2 MAC driver 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=20210311062011.8054-12-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=diana.craciun@nxp.com \
--cc=f.fainelli@gmail.com \
--cc=florinlaurentiu.chiculita@nxp.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=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).