Following functions are defined:
phylink_fwnode_phy_connect()
phylink_device_phy_connect()
fwnode_phy_find_device()
device_phy_find_device()
First two help in connecting phy to phylink instance.
Remaining two help to find a phy on a mdiobus.
Calvin Johnson (2):
device property: Introduce fwnode_phy_find_device()
phylink: introduce phylink_fwnode_phy_connect()
drivers/base/property.c | 41 ++++++++++++++++++
drivers/net/phy/phylink.c | 90 +++++++++++++++++++++++++++++++++++++++
include/linux/phylink.h | 6 +++
include/linux/property.h | 5 +++
4 files changed, 142 insertions(+)
--
2.17.1
Define fwnode_phy_find_device() to iterate an mdiobus and find the
phy device of the provided phy fwnode.
Signed-off-by: Calvin Johnson <[email protected]>
---
drivers/base/property.c | 41 ++++++++++++++++++++++++++++++++++++++++
include/linux/property.h | 5 +++++
2 files changed, 46 insertions(+)
diff --git a/drivers/base/property.c b/drivers/base/property.c
index 5f35c0ccf5e0..7c0c14c800b7 100644
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -870,6 +870,47 @@ int device_get_phy_mode(struct device *dev)
}
EXPORT_SYMBOL_GPL(device_get_phy_mode);
+/**
+ * fwnode_phy_find_device - Give a phy fwnode to find the corresponding
+ * phy_device on the mdiobus.
+ * @phy_fwnode: Pointer to the phy's fwnode.
+ *
+ * If successful, returns a pointer to the phy_device with the embedded
+ * struct device refcount incremented by one, or NULL on failure.
+ */
+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_by_fwnode(&mdio_bus_type, phy_fwnode);
+ if (d) {
+ mdiodev = to_mdio_device(d);
+ if (mdiodev->flags & MDIO_DEVICE_FLAG_PHY)
+ return to_phy_device(d);
+ put_device(d);
+ }
+
+ return NULL;
+}
+EXPORT_SYMBOL(fwnode_phy_find_device);
+
+/**
+ * device_phy_find_device - For the given device, get the phy_device
+ * @dev: Pointer to the given device
+ *
+ * If successful, returns a pointer to the phy_device with the embedded
+ * struct device refcount incremented by one, or NULL on failure.
+ */
+struct phy_device *device_phy_find_device(struct device *dev)
+{
+ return fwnode_phy_find_device(dev_fwnode(dev));
+}
+EXPORT_SYMBOL_GPL(device_phy_find_device);
+
static void *fwnode_get_mac_addr(struct fwnode_handle *fwnode,
const char *name, char *addr,
int alen)
diff --git a/include/linux/property.h b/include/linux/property.h
index d86de017c689..236d656a2981 100644
--- a/include/linux/property.h
+++ b/include/linux/property.h
@@ -370,9 +370,14 @@ const void *device_get_match_data(struct device *dev);
int device_get_phy_mode(struct device *dev);
+struct phy_device *device_phy_find_device(struct device *dev);
+
void *device_get_mac_address(struct device *dev, char *addr, int alen);
int fwnode_get_phy_mode(struct fwnode_handle *fwnode);
+
+struct phy_device *fwnode_phy_find_device(struct fwnode_handle *phy_fwnode);
+
void *fwnode_get_mac_address(struct fwnode_handle *fwnode,
char *addr, int alen);
struct fwnode_handle *fwnode_graph_get_next_endpoint(
--
2.17.1
Define phylink_fwnode_phy_connect() to connect phy specified by
a fwnode to a phylink instance. This function will handle both
DT and ACPI nodes.
Signed-off-by: Calvin Johnson <[email protected]>
---
drivers/net/phy/phylink.c | 90 +++++++++++++++++++++++++++++++++++++++
include/linux/phylink.h | 6 +++
2 files changed, 96 insertions(+)
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 34ca12aec61b..4f6552389ffb 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -18,6 +18,7 @@
#include <linux/spinlock.h>
#include <linux/timer.h>
#include <linux/workqueue.h>
+#include <linux/acpi.h>
#include "sfp.h"
#include "swphy.h"
@@ -961,6 +962,95 @@ 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 device_node *dn = to_of_node(fwnode);
+ struct fwnode_reference_args args;
+ struct device_node *phy_node;
+ struct phy_device *phy_dev;
+ acpi_status status;
+ int ret;
+
+ /* 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;
+
+ if (is_of_node(fwnode)) {
+ phy_node = of_parse_phandle(dn, "phy-handle", 0);
+ if (!phy_node)
+ phy_node = of_parse_phandle(dn, "phy", 0);
+ if (!phy_node)
+ phy_node = of_parse_phandle(dn, "phy-device", 0);
+
+ if (!phy_node) {
+ if (pl->cfg_link_an_mode == MLO_AN_PHY)
+ return -ENODEV;
+ return 0;
+ }
+
+ phy_dev = of_phy_find_device(phy_node);
+ /* We're done with the phy_node handle */
+ of_node_put(phy_node);
+ } else if (is_acpi_node(fwnode)) {
+ status = acpi_node_get_property_reference(fwnode,
+ "phy-handle",
+ 0, &args);
+ if (ACPI_FAILURE(status))
+ return -ENODEV;
+ phy_dev = fwnode_phy_find_device(args.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);
+
+/**
+ * phylink_fwnode_phy_connect() - connect the PHY specified in the fwnode.
+ * @pl: a pointer to a &struct phylink returned from phylink_create()
+ * @dev: a pointer to a &struct device.
+ * @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_device_phy_connect(struct phylink *pl,
+ struct device *dev,
+ u32 flags)
+{
+ return phylink_fwnode_phy_connect(pl, dev_fwnode(dev), flags);
+}
+EXPORT_SYMBOL_GPL(phylink_device_phy_connect);
+
/**
* phylink_of_phy_connect() - connect the PHY specified in the DT mode.
* @pl: a pointer to a &struct phylink returned from phylink_create()
diff --git a/include/linux/phylink.h b/include/linux/phylink.h
index 3f8d37ec5503..c2966a067792 100644
--- a/include/linux/phylink.h
+++ b/include/linux/phylink.h
@@ -364,6 +364,12 @@ void phylink_add_pcs(struct phylink *, const struct phylink_pcs_ops *ops);
void phylink_destroy(struct phylink *);
int phylink_connect_phy(struct phylink *, struct phy_device *);
+int phylink_fwnode_phy_connect(struct phylink *pl,
+ struct fwnode_handle *fwnode,
+ u32 flags);
+int phylink_device_phy_connect(struct phylink *pl,
+ struct device *dev,
+ u32 flags);
int phylink_of_phy_connect(struct phylink *, struct device_node *, u32 flags);
void phylink_disconnect_phy(struct phylink *);
int phylink_fixed_state_cb(struct phylink *,
--
2.17.1
On 4/23/2020 8:16 PM, Calvin Johnson wrote:
> Define fwnode_phy_find_device() to iterate an mdiobus and find the
> phy device of the provided phy fwnode.
>
> Signed-off-by: Calvin Johnson <[email protected]>
If you forget to update the MAINTAINERS file, or do not place this code
under drivers/net/phy/* or drivers/of/of_mdio.c then this is going to
completely escape the sight of the PHYLIB/PHYLINK maintainers...
--
Florian
On Thu, Apr 23, 2020 at 08:45:03PM -0700, Florian Fainelli wrote:
>
>
> On 4/23/2020 8:16 PM, Calvin Johnson wrote:
> > Define fwnode_phy_find_device() to iterate an mdiobus and find the
> > phy device of the provided phy fwnode.
> >
> > Signed-off-by: Calvin Johnson <[email protected]>
>
> If you forget to update the MAINTAINERS file, or do not place this code
> under drivers/net/phy/* or drivers/of/of_mdio.c then this is going to
> completely escape the sight of the PHYLIB/PHYLINK maintainers...
Did you mean the following change?
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6354,6 +6354,7 @@ F:
Documentation/devicetree/bindings/net/ethernet-phy.yaml
F: Documentation/devicetree/bindings/net/mdio*
F: Documentation/devicetree/bindings/net/qca,ar803x.yaml
F: Documentation/networking/phy.rst
+F: drivers/base/property.c
F: drivers/net/phy/
F: drivers/of/of_mdio.c
Do I need to send v2 with this? On checking CC and MAINTAINERS, I see
only [email protected] was missed.
Please let me know.
Regards
Calvin
On Fri, Apr 24, 2020 at 02:56:51PM +0530, Calvin Johnson wrote:
> On Thu, Apr 23, 2020 at 08:45:03PM -0700, Florian Fainelli wrote:
> >
> >
> > On 4/23/2020 8:16 PM, Calvin Johnson wrote:
> > > Define fwnode_phy_find_device() to iterate an mdiobus and find the
> > > phy device of the provided phy fwnode.
> > >
> > > Signed-off-by: Calvin Johnson <[email protected]>
> >
> > If you forget to update the MAINTAINERS file, or do not place this code
> > under drivers/net/phy/* or drivers/of/of_mdio.c then this is going to
> > completely escape the sight of the PHYLIB/PHYLINK maintainers...
>
> Did you mean the following change?
>
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -6354,6 +6354,7 @@ F:
> Documentation/devicetree/bindings/net/ethernet-phy.yaml
> F: Documentation/devicetree/bindings/net/mdio*
> F: Documentation/devicetree/bindings/net/qca,ar803x.yaml
> F: Documentation/networking/phy.rst
> +F: drivers/base/property.c
> F: drivers/net/phy/
> F: drivers/of/of_mdio.c
I really doubt the phy maintainers want to maintain all of property.c,
right? Please be kinder...
greg k-h
On Fri, Apr 24, 2020 at 12:27 PM Calvin Johnson
<[email protected]> wrote:
> On Thu, Apr 23, 2020 at 08:45:03PM -0700, Florian Fainelli wrote:
> > On 4/23/2020 8:16 PM, Calvin Johnson wrote:
> > If you forget to update the MAINTAINERS file, or do not place this code
> > under drivers/net/phy/* or drivers/of/of_mdio.c then this is going to
> > completely escape the sight of the PHYLIB/PHYLINK maintainers...
>
> Did you mean the following change?
I don't think this is an appreciated option.
Second one was to locate this code under drivers/net, which may be
better. And perhaps other not basic (to the properties) stuff should
be also moved to respective subsystems.
--
With Best Regards,
Andy Shevchenko
On Fri, Apr 24, 2020 at 6:17 AM Calvin Johnson
<[email protected]> wrote:
>
> Define phylink_fwnode_phy_connect() to connect phy specified by
> a fwnode to a phylink instance. This function will handle both
> DT and ACPI nodes.
> #include <linux/spinlock.h>
> #include <linux/timer.h>
> #include <linux/workqueue.h>
> +#include <linux/acpi.h>
Looks like broken order.
> + if (is_of_node(fwnode)) {
> + } else if (is_acpi_node(fwnode)) {
> + }
I'm wondering if there is an API that allows you to drop all this
stuff. In property provider agnostic code we really don't want to see
this.
> + if (!phy_dev)
> + return -ENODEV;
--
With Best Regards,
Andy Shevchenko
On Fri, Apr 24, 2020 at 08:46:16AM +0530, Calvin Johnson wrote:
> Define fwnode_phy_find_device() to iterate an mdiobus and find the
> phy device of the provided phy fwnode.
>
> Signed-off-by: Calvin Johnson <[email protected]>
> ---
>
> drivers/base/property.c | 41 ++++++++++++++++++++++++++++++++++++++++
> include/linux/property.h | 5 +++++
> 2 files changed, 46 insertions(+)
>
> diff --git a/drivers/base/property.c b/drivers/base/property.c
> index 5f35c0ccf5e0..7c0c14c800b7 100644
> --- a/drivers/base/property.c
> +++ b/drivers/base/property.c
> @@ -870,6 +870,47 @@ int device_get_phy_mode(struct device *dev)
> }
> EXPORT_SYMBOL_GPL(device_get_phy_mode);
>
> +/**
> + * fwnode_phy_find_device - Give a phy fwnode to find the corresponding
> + * phy_device on the mdiobus.
> + * @phy_fwnode: Pointer to the phy's fwnode.
> + *
> + * If successful, returns a pointer to the phy_device with the embedded
> + * struct device refcount incremented by one, or NULL on failure.
> + */
> +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_by_fwnode(&mdio_bus_type, phy_fwnode);
> + if (d) {
> + mdiodev = to_mdio_device(d);
> + if (mdiodev->flags & MDIO_DEVICE_FLAG_PHY)
> + return to_phy_device(d);
> + put_device(d);
> + }
> +
> + return NULL;
> +}
> +EXPORT_SYMBOL(fwnode_phy_find_device);
> +
> +/**
> + * device_phy_find_device - For the given device, get the phy_device
> + * @dev: Pointer to the given device
> + *
> + * If successful, returns a pointer to the phy_device with the embedded
> + * struct device refcount incremented by one, or NULL on failure.
> + */
> +struct phy_device *device_phy_find_device(struct device *dev)
> +{
> + return fwnode_phy_find_device(dev_fwnode(dev));
> +}
> +EXPORT_SYMBOL_GPL(device_phy_find_device);
Let's not put any more subsystem specific functions into property.c.
thanks,
--
heikki
On Fri, Apr 24, 2020 at 12:54:26PM +0300, Andy Shevchenko wrote:
> On Fri, Apr 24, 2020 at 12:27 PM Calvin Johnson
> <[email protected]> wrote:
> > On Thu, Apr 23, 2020 at 08:45:03PM -0700, Florian Fainelli wrote:
> > > On 4/23/2020 8:16 PM, Calvin Johnson wrote:
>
> > > If you forget to update the MAINTAINERS file, or do not place this code
> > > under drivers/net/phy/* or drivers/of/of_mdio.c then this is going to
> > > completely escape the sight of the PHYLIB/PHYLINK maintainers...
> >
> > Did you mean the following change?
>
> I don't think this is an appreciated option.
> Second one was to locate this code under drivers/net, which may be
> better. And perhaps other not basic (to the properties) stuff should
> be also moved to respective subsystems.
How about placing it in drivers/net/phy/phy_device.c?
If it is ok, I can do it in v2.
Thanks
Calvin