2019-02-21 16:55:26

by Maxime Chevallier

Subject: [PATCH net] net: phy: marvell10g: Fix Multi-G advertisement to only advertise 10G

Some Marvell Alaska PHYs support 2.5G, 5G and 10G BaseT links. Their
default behaviour is to advertise all of these modes, but at the moment,
only 10GBaseT is supported. To prevent link partners from establishing
link at that speed, clear these modes upon configuring aneg parameters.

Fixes: 20b2af32ff3f ("net: phy: add Marvell Alaska X 88X3310 10Gigabit PHY support")
Signed-off-by: Maxime Chevallier <[email protected]>
Reported-by: Russell King <[email protected]>
---

Dave,

This patch will conflict when merging net into net-next, and is actually
not needed there. In net-next, this issue is fixed by the recent work
done by Andrew and Heiner, that introduce more generic ways to handle aneg
configuration for C45 PHYs.

The commit fixing this would be :
3de97f3c6308 ("net: phy: marvell10g: use genphy_c45_an_config_aneg")

However this fix should be backported, hence why it was implemented in a
small standalone patch here.

Please tell me if you have any issue with this.

Thanks,

Maxime

drivers/net/phy/marvell10g.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c
index 82ab6ed3b74e..6bac602094bd 100644
--- a/drivers/net/phy/marvell10g.c
+++ b/drivers/net/phy/marvell10g.c
@@ -26,6 +26,8 @@
#include <linux/marvell_phy.h>
#include <linux/phy.h>

+#define MDIO_AN_10GBT_CTRL_ADV_NBT_MASK 0x01e0
+
enum {
MV_PCS_BASE_T = 0x0000,
MV_PCS_BASE_R = 0x1000,
@@ -386,8 +388,10 @@ static int mv3310_config_aneg(struct phy_device *phydev)
else
reg = 0;

+ /* Make sure we clear unsupported 2.5G/5G advertising */
ret = mv3310_modify(phydev, MDIO_MMD_AN, MDIO_AN_10GBT_CTRL,
- MDIO_AN_10GBT_CTRL_ADV10G, reg);
+ MDIO_AN_10GBT_CTRL_ADV10G |
+ MDIO_AN_10GBT_CTRL_ADV_NBT_MASK, reg);
if (ret < 0)
return ret;
if (ret > 0)
--
2.19.2

2019-02-23 21:29:53

by David Miller

Subject: Re: [PATCH net] net: phy: marvell10g: Fix Multi-G advertisement to only advertise 10G

From: Maxime Chevallier <[email protected]>
Date: Thu, 21 Feb 2019 17:54:11 +0100

> Some Marvell Alaska PHYs support 2.5G, 5G and 10G BaseT links. Their
> default behaviour is to advertise all of these modes, but at the moment,
> only 10GBaseT is supported. To prevent link partners from establishing
> link at that speed, clear these modes upon configuring aneg parameters.
>
> Fixes: 20b2af32ff3f ("net: phy: add Marvell Alaska X 88X3310 10Gigabit PHY support")
> Signed-off-by: Maxime Chevallier <[email protected]>
> Reported-by: Russell King <[email protected]>
> ---
>
> Dave,
>
> This patch will conflict when merging net into net-next, and is actually
> not needed there. In net-next, this issue is fixed by the recent work
> done by Andrew and Heiner, that introduce more generic ways to handle aneg
> configuration for C45 PHYs.
>
> The commit fixing this would be :
> 3de97f3c6308 ("net: phy: marvell10g: use genphy_c45_an_config_aneg")
>
> However this fix should be backported, hence why it was implemented in a
> small standalone patch here.
>
> Please tell me if you have any issue with this.

Understood, this is fine.

Applied and queued up for -stable.

Thanks.