From: Grant Likely <grant.likely@arm.com> To: Calvin Johnson <calvin.johnson@oss.nxp.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> Cc: linux-kernel@vger.kernel.org, linux.cj@gmail.com, netdev@vger.kernel.org, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Diana Madalina Craciun <diana.craciun@nxp.com>, Laurentiu Tudor <laurentiu.tudor@nxp.com>, "David S. Miller" <davem@davemloft.net>, Heiner Kallweit <hkallweit1@gmail.com>, Jakub Kicinski <kuba@kernel.org>, nd <nd@arm.com> Subject: Re: [net-next PATCH v1 3/7] net: phy: Introduce fwnode_get_phy_id() Date: Fri, 2 Oct 2020 12:05:14 +0100 [thread overview] Message-ID: <11e6b553-675f-8f3d-f9d5-316dae381457@arm.com> (raw) In-Reply-To: <20200930160430.7908-4-calvin.johnson@oss.nxp.com> On 30/09/2020 17:04, Calvin Johnson wrote: > Extract phy_id from compatible string. This will be used by > fwnode_mdiobus_register_phy() to create phy device using the > phy_id. > > Signed-off-by: Calvin Johnson <calvin.johnson@oss.nxp.com> > --- > > drivers/net/phy/phy_device.c | 32 +++++++++++++++++++++++++++++++- > include/linux/phy.h | 5 +++++ > 2 files changed, 36 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c > index c4aec56d0a95..162abde6223d 100644 > --- a/drivers/net/phy/phy_device.c > +++ b/drivers/net/phy/phy_device.c > @@ -9,6 +9,7 @@ > > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > +#include <linux/acpi.h> > #include <linux/bitmap.h> > #include <linux/delay.h> > #include <linux/errno.h> > @@ -845,6 +846,27 @@ static int get_phy_c22_id(struct mii_bus *bus, int addr, u32 *phy_id) > return 0; > } > > +/* Extract the phy ID from the compatible string of the form > + * ethernet-phy-idAAAA.BBBB. > + */ > +int fwnode_get_phy_id(struct fwnode_handle *fwnode, u32 *phy_id) > +{ > + unsigned int upper, lower; > + const char *cp; > + int ret; > + > + ret = fwnode_property_read_string(fwnode, "compatible", &cp); > + if (ret) > + return ret; > + > + if (sscanf(cp, "ethernet-phy-id%4x.%4x", &upper, &lower) == 2) { > + *phy_id = ((upper & 0xFFFF) << 16) | (lower & 0xFFFF); > + return 0; > + } > + return -EINVAL; > +} > +EXPORT_SYMBOL(fwnode_get_phy_id); This block, and the changes in patch 4 duplicate functions from drivers/of/of_mdio.c, but it doesn't refactor anything in drivers/of/of_mdio.c to use the new path. Is your intent to bring all of the parsing in these functions of "compatible" into the ACPI code path? If so, then the existing code path needs to be refactored to work with fwnode_handle instead of device_node. If not, then the DT path in these functions should call out to of_mdio, while the ACPI path only does what is necessary. > + > /** > * get_phy_device - reads the specified PHY device and returns its @phy_device > * struct > @@ -2866,7 +2888,15 @@ EXPORT_SYMBOL_GPL(device_phy_find_device); > */ > struct fwnode_handle *fwnode_get_phy_node(struct fwnode_handle *fwnode) > { > - return fwnode_find_reference(fwnode, "phy-handle", 0); > + struct fwnode_handle *phy_node; > + > + phy_node = fwnode_find_reference(fwnode, "phy-handle", 0); > + if (is_acpi_node(fwnode) || !IS_ERR(phy_node)) > + return phy_node; > + phy_node = fwnode_find_reference(fwnode, "phy", 0); > + if (IS_ERR(phy_node)) > + phy_node = fwnode_find_reference(fwnode, "phy-device", 0); > + return phy_node; > } > EXPORT_SYMBOL_GPL(fwnode_get_phy_node); > > diff --git a/include/linux/phy.h b/include/linux/phy.h > index 7b1bf3d46fd3..b6814e04092f 100644 > --- a/include/linux/phy.h > +++ b/include/linux/phy.h > @@ -1378,6 +1378,7 @@ struct phy_device *phy_device_create(struct mii_bus *bus, int addr, u32 phy_id, > bool is_c45, > struct phy_c45_device_ids *c45_ids); > #if IS_ENABLED(CONFIG_PHYLIB) > +int fwnode_get_phy_id(struct fwnode_handle *fwnode, u32 *phy_id); > struct phy_device *fwnode_phy_find_device(struct fwnode_handle *phy_fwnode); > struct phy_device *device_phy_find_device(struct device *dev); > struct fwnode_handle *fwnode_get_phy_node(struct fwnode_handle *fwnode); > @@ -1385,6 +1386,10 @@ struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45); > int phy_device_register(struct phy_device *phy); > void phy_device_free(struct phy_device *phydev); > #else > +static inline int fwnode_get_phy_id(struct fwnode_handle *fwnode, u32 *phy_id) > +{ > + return 0; > +} > static inline > struct phy_device *fwnode_phy_find_device(struct fwnode_handle *phy_fwnode) > { >
WARNING: multiple messages have this Message-ID (diff)
From: Grant Likely <grant.likely@arm.com> To: Calvin Johnson <calvin.johnson@oss.nxp.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> Cc: nd <nd@arm.com>, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Diana Madalina Craciun <diana.craciun@nxp.com>, linux-acpi@vger.kernel.org, linux.cj@gmail.com, Jakub Kicinski <kuba@kernel.org>, Heiner Kallweit <hkallweit1@gmail.com>, "David S. Miller" <davem@davemloft.net>, linux-arm-kernel@lists.infradead.org, Laurentiu Tudor <laurentiu.tudor@nxp.com> Subject: Re: [net-next PATCH v1 3/7] net: phy: Introduce fwnode_get_phy_id() Date: Fri, 2 Oct 2020 12:05:14 +0100 [thread overview] Message-ID: <11e6b553-675f-8f3d-f9d5-316dae381457@arm.com> (raw) In-Reply-To: <20200930160430.7908-4-calvin.johnson@oss.nxp.com> On 30/09/2020 17:04, Calvin Johnson wrote: > Extract phy_id from compatible string. This will be used by > fwnode_mdiobus_register_phy() to create phy device using the > phy_id. > > Signed-off-by: Calvin Johnson <calvin.johnson@oss.nxp.com> > --- > > drivers/net/phy/phy_device.c | 32 +++++++++++++++++++++++++++++++- > include/linux/phy.h | 5 +++++ > 2 files changed, 36 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c > index c4aec56d0a95..162abde6223d 100644 > --- a/drivers/net/phy/phy_device.c > +++ b/drivers/net/phy/phy_device.c > @@ -9,6 +9,7 @@ > > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > +#include <linux/acpi.h> > #include <linux/bitmap.h> > #include <linux/delay.h> > #include <linux/errno.h> > @@ -845,6 +846,27 @@ static int get_phy_c22_id(struct mii_bus *bus, int addr, u32 *phy_id) > return 0; > } > > +/* Extract the phy ID from the compatible string of the form > + * ethernet-phy-idAAAA.BBBB. > + */ > +int fwnode_get_phy_id(struct fwnode_handle *fwnode, u32 *phy_id) > +{ > + unsigned int upper, lower; > + const char *cp; > + int ret; > + > + ret = fwnode_property_read_string(fwnode, "compatible", &cp); > + if (ret) > + return ret; > + > + if (sscanf(cp, "ethernet-phy-id%4x.%4x", &upper, &lower) == 2) { > + *phy_id = ((upper & 0xFFFF) << 16) | (lower & 0xFFFF); > + return 0; > + } > + return -EINVAL; > +} > +EXPORT_SYMBOL(fwnode_get_phy_id); This block, and the changes in patch 4 duplicate functions from drivers/of/of_mdio.c, but it doesn't refactor anything in drivers/of/of_mdio.c to use the new path. Is your intent to bring all of the parsing in these functions of "compatible" into the ACPI code path? If so, then the existing code path needs to be refactored to work with fwnode_handle instead of device_node. If not, then the DT path in these functions should call out to of_mdio, while the ACPI path only does what is necessary. > + > /** > * get_phy_device - reads the specified PHY device and returns its @phy_device > * struct > @@ -2866,7 +2888,15 @@ EXPORT_SYMBOL_GPL(device_phy_find_device); > */ > struct fwnode_handle *fwnode_get_phy_node(struct fwnode_handle *fwnode) > { > - return fwnode_find_reference(fwnode, "phy-handle", 0); > + struct fwnode_handle *phy_node; > + > + phy_node = fwnode_find_reference(fwnode, "phy-handle", 0); > + if (is_acpi_node(fwnode) || !IS_ERR(phy_node)) > + return phy_node; > + phy_node = fwnode_find_reference(fwnode, "phy", 0); > + if (IS_ERR(phy_node)) > + phy_node = fwnode_find_reference(fwnode, "phy-device", 0); > + return phy_node; > } > EXPORT_SYMBOL_GPL(fwnode_get_phy_node); > > diff --git a/include/linux/phy.h b/include/linux/phy.h > index 7b1bf3d46fd3..b6814e04092f 100644 > --- a/include/linux/phy.h > +++ b/include/linux/phy.h > @@ -1378,6 +1378,7 @@ struct phy_device *phy_device_create(struct mii_bus *bus, int addr, u32 phy_id, > bool is_c45, > struct phy_c45_device_ids *c45_ids); > #if IS_ENABLED(CONFIG_PHYLIB) > +int fwnode_get_phy_id(struct fwnode_handle *fwnode, u32 *phy_id); > struct phy_device *fwnode_phy_find_device(struct fwnode_handle *phy_fwnode); > struct phy_device *device_phy_find_device(struct device *dev); > struct fwnode_handle *fwnode_get_phy_node(struct fwnode_handle *fwnode); > @@ -1385,6 +1386,10 @@ struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45); > int phy_device_register(struct phy_device *phy); > void phy_device_free(struct phy_device *phydev); > #else > +static inline int fwnode_get_phy_id(struct fwnode_handle *fwnode, u32 *phy_id) > +{ > + return 0; > +} > static inline > struct phy_device *fwnode_phy_find_device(struct fwnode_handle *phy_fwnode) > { > _______________________________________________ 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-10-02 11:05 UTC|newest] Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-09-30 16:04 [net-next PATCH v1 0/7] ACPI support for dpaa2 driver Calvin Johnson 2020-09-30 16:04 ` Calvin Johnson 2020-09-30 16:04 ` [net-next PATCH v1 1/7] Documentation: ACPI: DSD: Document MDIO PHY Calvin Johnson 2020-09-30 16:04 ` Calvin Johnson 2020-09-30 16:37 ` Rafael J. Wysocki 2020-09-30 16:37 ` Rafael J. Wysocki 2020-10-01 13:26 ` Calvin Johnson 2020-10-01 13:26 ` Calvin Johnson 2020-10-02 11:08 ` Grant Likely 2020-10-02 11:08 ` Grant Likely 2020-10-02 14:13 ` Rafael J. Wysocki 2020-10-02 14:13 ` Rafael J. Wysocki 2020-09-30 16:04 ` [net-next PATCH v1 2/7] net: phy: Introduce phy related fwnode functions Calvin Johnson 2020-09-30 16:04 ` Calvin Johnson 2020-09-30 22:03 ` David Miller 2020-09-30 22:03 ` David Miller 2020-10-01 3:58 ` Calvin Johnson 2020-10-01 3:58 ` Calvin Johnson 2020-09-30 16:04 ` [net-next PATCH v1 3/7] net: phy: Introduce fwnode_get_phy_id() Calvin Johnson 2020-09-30 16:04 ` Calvin Johnson 2020-09-30 16:34 ` Andrew Lunn 2020-09-30 16:34 ` Andrew Lunn 2020-09-30 18:07 ` Russell King - ARM Linux admin 2020-09-30 18:07 ` Russell King - ARM Linux admin 2020-09-30 18:19 ` Andrew Lunn 2020-09-30 18:19 ` Andrew Lunn 2020-10-01 4:00 ` Calvin Johnson 2020-10-01 4:00 ` Calvin Johnson 2020-10-02 10:48 ` Grant Likely 2020-10-02 10:48 ` Grant Likely 2020-10-02 11:05 ` Grant Likely [this message] 2020-10-02 11:05 ` Grant Likely 2020-10-02 15:14 ` Florian Fainelli 2020-10-02 15:14 ` Florian Fainelli 2020-10-02 15:50 ` Russell King - ARM Linux admin 2020-10-02 15:50 ` Russell King - ARM Linux admin 2020-10-03 18:03 ` Calvin Johnson 2020-10-03 18:03 ` Calvin Johnson 2020-10-03 18:00 ` Calvin Johnson 2020-10-03 18:00 ` Calvin Johnson 2020-09-30 16:04 ` [net-next PATCH v1 4/7] net: mdiobus: Introduce fwnode_mdiobus_register_phy() Calvin Johnson 2020-09-30 16:04 ` Calvin Johnson 2020-09-30 22:04 ` David Miller 2020-09-30 22:04 ` David Miller 2020-10-01 3:07 ` kernel test robot 2020-09-30 16:04 ` [net-next PATCH v1 5/7] phylink: introduce phylink_fwnode_phy_connect() Calvin Johnson 2020-09-30 16:04 ` Calvin Johnson 2020-09-30 16:04 ` [net-next PATCH v1 6/7] net: dpaa2-mac: Add ACPI support for DPAA2 MAC driver Calvin Johnson 2020-09-30 16:04 ` Calvin Johnson 2020-10-01 15:36 ` Andy Shevchenko 2020-10-01 15:36 ` Andy Shevchenko 2020-10-03 16:30 ` Calvin Johnson 2020-10-03 16:30 ` Calvin Johnson 2020-10-02 11:22 ` Grant Likely 2020-10-02 11:22 ` Grant Likely 2020-10-03 17:39 ` Calvin Johnson 2020-10-03 17:39 ` Calvin Johnson 2020-10-07 15:50 ` Calvin Johnson 2020-10-07 15:50 ` Calvin Johnson 2020-09-30 16:04 ` [net-next PATCH v1 7/7] net/fsl: Use _ADR ACPI object to register PHYs Calvin Johnson 2020-09-30 16:04 ` Calvin Johnson 2020-09-30 16:27 ` Andrew Lunn 2020-09-30 16:27 ` Andrew Lunn 2020-09-30 22:04 ` David Miller 2020-09-30 22:04 ` David Miller
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=11e6b553-675f-8f3d-f9d5-316dae381457@arm.com \ --to=grant.likely@arm.com \ --cc=andrew@lunn.ch \ --cc=andy.shevchenko@gmail.com \ --cc=calvin.johnson@oss.nxp.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=heikki.krogerus@linux.intel.com \ --cc=hkallweit1@gmail.com \ --cc=ioana.ciornei@nxp.com \ --cc=jeremy.linton@arm.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=nd@arm.com \ --cc=netdev@vger.kernel.org \ --cc=rafael@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.