| Message ID | 20250425141511.182537-5-maxime.chevallier@bootlin.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Introduce an ethernet port representation | expand |
On Fri, Apr 25, 2025 at 04:14:57PM +0200, Maxime Chevallier wrote: > With the phy_port representation intrduced, we can use .attach_port to > populate the port information based on either the straps or the > ti,fiber-mode property. This allows simplifying the probe function and > allow users to override the strapping configuration. > > Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com> > --- > drivers/net/phy/dp83822.c | 70 ++++++++++++++++++++++++--------------- > 1 file changed, 44 insertions(+), 26 deletions(-) > > diff --git a/drivers/net/phy/dp83822.c b/drivers/net/phy/dp83822.c > index 490c9f4e5d4e..bbbe509f3bd9 100644 > --- a/drivers/net/phy/dp83822.c > +++ b/drivers/net/phy/dp83822.c > @@ -11,6 +11,7 @@ > #include <linux/module.h> > #include <linux/of.h> > #include <linux/phy.h> > +#include <linux/phy_port.h> > #include <linux/netdevice.h> > #include <linux/bitfield.h> > > @@ -814,17 +815,6 @@ static int dp83822_of_init(struct phy_device *phydev) > int i, ret; > u32 val; > > - /* Signal detection for the PHY is only enabled if the FX_EN and the > - * SD_EN pins are strapped. Signal detection can only enabled if FX_EN > - * is strapped otherwise signal detection is disabled for the PHY. > - */ > - if (dp83822->fx_enabled && dp83822->fx_sd_enable) > - dp83822->fx_signal_det_low = device_property_present(dev, > - "ti,link-loss-low"); > - if (!dp83822->fx_enabled) > - dp83822->fx_enabled = device_property_present(dev, > - "ti,fiber-mode"); > - > if (!device_property_read_string(dev, "ti,gpio2-clk-out", &of_val)) { > if (strcmp(of_val, "mac-if") == 0) { > dp83822->gpio2_clk_out = DP83822_CLK_SRC_MAC_IF; > @@ -953,6 +943,47 @@ static int dp83822_read_straps(struct phy_device *phydev) > return 0; > } > > +static int dp83822_attach_port(struct phy_device *phydev, struct phy_port *port) > +{ > + struct dp83822_private *dp83822 = phydev->priv; > + struct device *dev = &phydev->mdio.dev; Hi Maxime, A nit from my side: dev is unused if CONFIG_OF_MDIO is not defined. Perhaps it's scope can be reduced somehow. Or &phydev->mdio.dev can be used directly? Or the code guarded by CONFIG_OF_MDIO could be moved into a separate function that makes use if IS_ENABLED to return early if there is nothing to do (maybe the best option if possible, as it would increase compile coverage). Or ... > + int ret; > + > + if (port->mediums) { > + if (phy_port_is_fiber(port)) > + dp83822->fx_enabled = true; > + } else { > + ret = dp83822_read_straps(phydev); > + if (ret) > + return ret; > + > +#ifdef CONFIG_OF_MDIO > + if (dp83822->fx_enabled && dp83822->fx_sd_enable) > + dp83822->fx_signal_det_low = > + device_property_present(dev, "ti,link-loss-low"); > + > + /* ti,fiber-mode is still used for backwards compatibility, but > + * has been replaced with the mdi node definition, see > + * ethernet-port.yaml > + */ > + if (!dp83822->fx_enabled) > + dp83822->fx_enabled = > + device_property_present(dev, "ti,fiber-mode"); > +#endif > + > + if (dp83822->fx_enabled) { > + port->lanes = 1; > + port->mediums = BIT(ETHTOOL_LINK_MEDIUM_BASEF); > + } else { > + /* This PHY can only to 100BaseTX max, so on 2 lanes */ > + port->lanes = 2; > + port->mediums = BIT(ETHTOOL_LINK_MEDIUM_BASET); > + } > + } > + > + return 0; > +} ...
diff --git a/drivers/net/phy/dp83822.c b/drivers/net/phy/dp83822.c index 490c9f4e5d4e..bbbe509f3bd9 100644 --- a/drivers/net/phy/dp83822.c +++ b/drivers/net/phy/dp83822.c @@ -11,6 +11,7 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/phy.h> +#include <linux/phy_port.h> #include <linux/netdevice.h> #include <linux/bitfield.h> @@ -814,17 +815,6 @@ static int dp83822_of_init(struct phy_device *phydev) int i, ret; u32 val; - /* Signal detection for the PHY is only enabled if the FX_EN and the - * SD_EN pins are strapped. Signal detection can only enabled if FX_EN - * is strapped otherwise signal detection is disabled for the PHY. - */ - if (dp83822->fx_enabled && dp83822->fx_sd_enable) - dp83822->fx_signal_det_low = device_property_present(dev, - "ti,link-loss-low"); - if (!dp83822->fx_enabled) - dp83822->fx_enabled = device_property_present(dev, - "ti,fiber-mode"); - if (!device_property_read_string(dev, "ti,gpio2-clk-out", &of_val)) { if (strcmp(of_val, "mac-if") == 0) { dp83822->gpio2_clk_out = DP83822_CLK_SRC_MAC_IF; @@ -953,6 +943,47 @@ static int dp83822_read_straps(struct phy_device *phydev) return 0; } +static int dp83822_attach_port(struct phy_device *phydev, struct phy_port *port) +{ + struct dp83822_private *dp83822 = phydev->priv; + struct device *dev = &phydev->mdio.dev; + int ret; + + if (port->mediums) { + if (phy_port_is_fiber(port)) + dp83822->fx_enabled = true; + } else { + ret = dp83822_read_straps(phydev); + if (ret) + return ret; + +#ifdef CONFIG_OF_MDIO + if (dp83822->fx_enabled && dp83822->fx_sd_enable) + dp83822->fx_signal_det_low = + device_property_present(dev, "ti,link-loss-low"); + + /* ti,fiber-mode is still used for backwards compatibility, but + * has been replaced with the mdi node definition, see + * ethernet-port.yaml + */ + if (!dp83822->fx_enabled) + dp83822->fx_enabled = + device_property_present(dev, "ti,fiber-mode"); +#endif + + if (dp83822->fx_enabled) { + port->lanes = 1; + port->mediums = BIT(ETHTOOL_LINK_MEDIUM_BASEF); + } else { + /* This PHY can only to 100BaseTX max, so on 2 lanes */ + port->lanes = 2; + port->mediums = BIT(ETHTOOL_LINK_MEDIUM_BASET); + } + } + + return 0; +} + static int dp8382x_probe(struct phy_device *phydev) { struct dp83822_private *dp83822; @@ -971,27 +1002,13 @@ static int dp8382x_probe(struct phy_device *phydev) static int dp83822_probe(struct phy_device *phydev) { - struct dp83822_private *dp83822; int ret; ret = dp8382x_probe(phydev); if (ret) return ret; - dp83822 = phydev->priv; - - ret = dp83822_read_straps(phydev); - if (ret) - return ret; - - ret = dp83822_of_init(phydev); - if (ret) - return ret; - - if (dp83822->fx_enabled) - phydev->port = PORT_FIBRE; - - return 0; + return dp83822_of_init(phydev); } static int dp83826_probe(struct phy_device *phydev) @@ -1175,6 +1192,7 @@ static int dp83822_led_hw_control_get(struct phy_device *phydev, u8 index, .led_hw_is_supported = dp83822_led_hw_is_supported, \ .led_hw_control_set = dp83822_led_hw_control_set, \ .led_hw_control_get = dp83822_led_hw_control_get, \ + .attach_port = dp83822_attach_port \ } #define DP83825_PHY_DRIVER(_id, _name) \
With the phy_port representation intrduced, we can use .attach_port to populate the port information based on either the straps or the ti,fiber-mode property. This allows simplifying the probe function and allow users to override the strapping configuration. Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com> --- drivers/net/phy/dp83822.c | 70 ++++++++++++++++++++++++--------------- 1 file changed, 44 insertions(+), 26 deletions(-)