LinuxLists.cc - [PATCH net] net: phy: marvell-88x2222: set proper phydev->port

2022-04-06 06:00:56

Subject: [PATCH net] net: phy: marvell-88x2222: set proper phydev->port

phydev->port was not set and always reported as PORT_TP.
Set phydev->port according to inserted SFP module.

Signed-off-by: Ivan Bornyakov <[email protected]>
---
drivers/net/phy/marvell-88x2222.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/net/phy/marvell-88x2222.c b/drivers/net/phy/marvell-88x2222.c
index ec4f1407a78c..9f971b37ec35 100644
--- a/drivers/net/phy/marvell-88x2222.c
+++ b/drivers/net/phy/marvell-88x2222.c
@@ -603,6 +603,7 @@ static int mv2222_sfp_insert(void *upstream, const struct sfp_eeprom_id *id)
dev = &phydev->mdio.dev;

sfp_parse_support(phydev->sfp_bus, id, sfp_supported);
+ phydev->port = sfp_parse_port(phydev->sfp_bus, id, sfp_supported);
sfp_interface = sfp_select_interface(phydev->sfp_bus, sfp_supported);

dev_info(dev, "%s SFP module inserted\n", phy_modes(sfp_interface));
@@ -639,6 +640,7 @@ static void mv2222_sfp_remove(void *upstream)

priv->line_interface = PHY_INTERFACE_MODE_NA;
linkmode_zero(priv->supported);
+ phydev->port = PORT_OTHER;
}

static void mv2222_sfp_link_up(void *upstream)
--
2.25.1

2022-04-25 13:40:34

by Ivan Bornyakov

[permalink] [raw]

Subject: [PATCH net-next RESEND] net: phy: marvell-88x2222: set proper phydev->port

2022-04-26 10:14:37

by Ivan Bornyakov

[permalink] [raw]

Subject: Re: [PATCH net-next RESEND] net: phy: marvell-88x2222: set proper phydev->port

On Mon, Apr 25, 2022 at 10:33:06PM +0100, Russell King (Oracle) wrote:
> On Mon, Apr 25, 2022 at 07:16:37AM +0300, Ivan Bornyakov wrote:
> > phydev->port was not set and always reported as PORT_TP.
> > Set phydev->port according to inserted SFP module.
> >
> > Signed-off-by: Ivan Bornyakov <[email protected]>
> > ---
> > drivers/net/phy/marvell-88x2222.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/drivers/net/phy/marvell-88x2222.c b/drivers/net/phy/marvell-88x2222.c
> > index ec4f1407a78c..9f971b37ec35 100644
> > --- a/drivers/net/phy/marvell-88x2222.c
> > +++ b/drivers/net/phy/marvell-88x2222.c
> > @@ -603,6 +603,7 @@ static int mv2222_sfp_insert(void *upstream, const struct sfp_eeprom_id *id)
> > dev = &phydev->mdio.dev;
> >
> > sfp_parse_support(phydev->sfp_bus, id, sfp_supported);
> > + phydev->port = sfp_parse_port(phydev->sfp_bus, id, sfp_supported);
> > sfp_interface = sfp_select_interface(phydev->sfp_bus, sfp_supported);
> >
> > dev_info(dev, "%s SFP module inserted\n", phy_modes(sfp_interface));
> > @@ -639,6 +640,7 @@ static void mv2222_sfp_remove(void *upstream)
> >
> > priv->line_interface = PHY_INTERFACE_MODE_NA;
> > linkmode_zero(priv->supported);
> > + phydev->port = PORT_OTHER;
>
> Can this PHY be used in dual-media mode, auto-switching between copper
> and fibre?

I believe, it can not.

> If so, is PORT_OTHER actually appropriate here, or should
> the old value be saved when the module is inserted and restored when
> it's removed?

Would PORT_NONE be appropriate? Saving old value would be ok also.

2022-04-27 11:09:00

by Russell King (Oracle)

[permalink] [raw]

Subject: Re: [PATCH net-next RESEND] net: phy: marvell-88x2222: set proper phydev->port

On Mon, Apr 25, 2022 at 07:16:37AM +0300, Ivan Bornyakov wrote:
> phydev->port was not set and always reported as PORT_TP.
> Set phydev->port according to inserted SFP module.
>
> Signed-off-by: Ivan Bornyakov <[email protected]>
> ---
> drivers/net/phy/marvell-88x2222.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/net/phy/marvell-88x2222.c b/drivers/net/phy/marvell-88x2222.c
> index ec4f1407a78c..9f971b37ec35 100644
> --- a/drivers/net/phy/marvell-88x2222.c
> +++ b/drivers/net/phy/marvell-88x2222.c
> @@ -603,6 +603,7 @@ static int mv2222_sfp_insert(void *upstream, const struct sfp_eeprom_id *id)
> dev = &phydev->mdio.dev;
>
> sfp_parse_support(phydev->sfp_bus, id, sfp_supported);
> + phydev->port = sfp_parse_port(phydev->sfp_bus, id, sfp_supported);
> sfp_interface = sfp_select_interface(phydev->sfp_bus, sfp_supported);
>
> dev_info(dev, "%s SFP module inserted\n", phy_modes(sfp_interface));
> @@ -639,6 +640,7 @@ static void mv2222_sfp_remove(void *upstream)
>
> priv->line_interface = PHY_INTERFACE_MODE_NA;
> linkmode_zero(priv->supported);
> + phydev->port = PORT_OTHER;

Can this PHY be used in dual-media mode, auto-switching between copper
and fibre? If so, is PORT_OTHER actually appropriate here, or should
the old value be saved when the module is inserted and restored when
it's removed?

--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!

2022-06-12 19:19:15

by Ivan Bornyakov

[permalink] [raw]

Subject: [PATCH v2 net-next] net: phy: marvell-88x2222: set proper phydev->port

phydev->port was not set and always reported as PORT_TP.
Set phydev->port according to inserted SFP module.

Signed-off-by: Ivan Bornyakov <[email protected]>
---
Changelog:
v1 -> v2: set port as PORT_NONE on SFP removal, instead of PORT_OTHER

drivers/net/phy/marvell-88x2222.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/net/phy/marvell-88x2222.c b/drivers/net/phy/marvell-88x2222.c
index d8b31d4d2a73..f070776ca904 100644
--- a/drivers/net/phy/marvell-88x2222.c
+++ b/drivers/net/phy/marvell-88x2222.c
@@ -490,6 +490,7 @@ static int mv2222_sfp_insert(void *upstream, const struct sfp_eeprom_id *id)
dev = &phydev->mdio.dev;

sfp_parse_support(phydev->sfp_bus, id, sfp_supported);
+ phydev->port = sfp_parse_port(phydev->sfp_bus, id, sfp_supported);
sfp_interface = sfp_select_interface(phydev->sfp_bus, sfp_supported);

dev_info(dev, "%s SFP module inserted\n", phy_modes(sfp_interface));
@@ -526,6 +527,7 @@ static void mv2222_sfp_remove(void *upstream)

priv->line_interface = PHY_INTERFACE_MODE_NA;
linkmode_zero(priv->supported);
+ phydev->port = PORT_NONE;
}

static void mv2222_sfp_link_up(void *upstream)
--
2.35.1

2022-06-15 08:39:38

by patchwork-bot+netdevbpf

[permalink] [raw]

Subject: Re: [PATCH v2 net-next] net: phy: marvell-88x2222: set proper phydev->port

Hello:

This patch was applied to netdev/net-next.git (master)
by David S. Miller <[email protected]>:

On Sun, 12 Jun 2022 21:19:34 +0300 you wrote:
> phydev->port was not set and always reported as PORT_TP.
> Set phydev->port according to inserted SFP module.
>
> Signed-off-by: Ivan Bornyakov <[email protected]>
> ---
> Changelog:
> v1 -> v2: set port as PORT_NONE on SFP removal, instead of PORT_OTHER
>
> [...]

Here is the summary with links:
- [v2,net-next] net: phy: marvell-88x2222: set proper phydev->port
https://git.kernel.org/netdev/net-next/c/9794ef5a6843

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html