| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20250719125616.336ece14@kmaincent-XPS-13-7390>
Date: Sat, 19 Jul 2025 12:56:16 +0200
From: Kory Maincent <kory.maincent@...tlin.com>
To: Maxime Chevallier <maxime.chevallier@...tlin.com>
Cc: davem@...emloft.net, netdev@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-arm-msm@...r.kernel.org,
thomas.petazzoni@...tlin.com, Andrew Lunn <andrew@...n.ch>, Jakub Kicinski
<kuba@...nel.org>, Eric Dumazet <edumazet@...gle.com>, Paolo Abeni
<pabeni@...hat.com>, Russell King <linux@...linux.org.uk>,
linux-arm-kernel@...ts.infradead.org, Christophe Leroy
<christophe.leroy@...roup.eu>, Herve Codina <herve.codina@...tlin.com>,
Florian Fainelli <f.fainelli@...il.com>, Heiner Kallweit
<hkallweit1@...il.com>, Vladimir Oltean <vladimir.oltean@....com>, Marek
Behún <kabel@...nel.org>, Oleksij Rempel
<o.rempel@...gutronix.de>, Nicolò Veronese
<nicveronese@...il.com>, Simon Horman <horms@...nel.org>,
mwojtas@...omium.org, Antoine Tenart <atenart@...nel.org>,
devicetree@...r.kernel.org, Conor Dooley <conor+dt@...nel.org>, Krzysztof
Kozlowski <krzk+dt@...nel.org>, Rob Herring <robh@...nel.org>, Romain
Gantois <romain.gantois@...tlin.com>, Daniel Golle <daniel@...rotopia.org>,
Dimitri Fedrau <dimitri.fedrau@...bherr.com>
Subject: Re: [PATCH net-next v9 05/15] net: phy: dp83822: Add support for
phy_port representation
Le Thu, 17 Jul 2025 09:30:09 +0200,
Maxime Chevallier <maxime.chevallier@...tlin.com> a écrit :
> With the phy_port representation intrduced, we can use .attach_port to
*introduced
As you will have to resend a new version ;)
else
Reviewed-by: Kory Maincent <kory.maincent@...tlin.com>
Thank you!
> 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@...tlin.com>
> ---
> drivers/net/phy/dp83822.c | 71 +++++++++++++++++++++++++--------------
> 1 file changed, 45 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/net/phy/dp83822.c b/drivers/net/phy/dp83822.c
> index 33db21251f2e..2657be2e9034 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>
>
> @@ -811,17 +812,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;
> @@ -950,6 +940,48 @@ 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;
> + 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;
> +
> +#if IS_ENABLED(CONFIG_OF_MDIO)
> + if (dp83822->fx_enabled && dp83822->fx_sd_enable)
> + dp83822->fx_signal_det_low =
> + device_property_present(&phydev->mdio.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(&phydev->mdio.dev,
> + "ti,fiber-mode");
> +#endif /* CONFIG_OF_MDIO */
> +
> + 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;
> @@ -968,27 +1000,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)
> @@ -1172,6 +1190,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) \
--
Köry Maincent, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
Powered by blists - more mailing lists