* [PATCH net v2] net: mvpp2: 10G modes aren't supported on all ports
@ 2018-12-14 9:34 Antoine Tenart
2018-12-14 16:02 ` Russell King - ARM Linux
0 siblings, 1 reply; 4+ messages in thread
From: Antoine Tenart @ 2018-12-14 9:34 UTC (permalink / raw)
To: davem, linux
Cc: Antoine Tenart, netdev, linux-kernel, thomas.petazzoni,
maxime.chevallier, gregory.clement, miquel.raynal, nadavh,
stefanc, ymarkman, mw, Baruch Siach
The mvpp2_phylink_validate() function sets all modes that are
supported by a given PPv2 port. A recent change made all ports to
advertise they support 10G modes in certain cases. This is not true,
as only the port #0 can do so. This patch fixes it.
Fixes: 01b3fd5ac97c ("net: mvpp2: fix detection of 10G SFP modules")
Cc: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
---
Since v1:
- Rebased on top of the latest net master branch.
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index 125ea99418df..88aa488054a8 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -4405,12 +4405,14 @@ static void mvpp2_phylink_validate(struct net_device *dev,
case PHY_INTERFACE_MODE_10GKR:
case PHY_INTERFACE_MODE_XAUI:
case PHY_INTERFACE_MODE_NA:
- phylink_set(mask, 10000baseCR_Full);
- phylink_set(mask, 10000baseSR_Full);
- phylink_set(mask, 10000baseLR_Full);
- phylink_set(mask, 10000baseLRM_Full);
- phylink_set(mask, 10000baseER_Full);
- phylink_set(mask, 10000baseKR_Full);
+ if (port->gop_id == 0) {
+ phylink_set(mask, 10000baseCR_Full);
+ phylink_set(mask, 10000baseSR_Full);
+ phylink_set(mask, 10000baseLR_Full);
+ phylink_set(mask, 10000baseLRM_Full);
+ phylink_set(mask, 10000baseER_Full);
+ phylink_set(mask, 10000baseKR_Full);
+ }
/* Fall-through */
case PHY_INTERFACE_MODE_RGMII:
case PHY_INTERFACE_MODE_RGMII_ID:
--
2.19.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net v2] net: mvpp2: 10G modes aren't supported on all ports
2018-12-14 9:34 [PATCH net v2] net: mvpp2: 10G modes aren't supported on all ports Antoine Tenart
@ 2018-12-14 16:02 ` Russell King - ARM Linux
2018-12-14 16:09 ` Antoine Tenart
0 siblings, 1 reply; 4+ messages in thread
From: Russell King - ARM Linux @ 2018-12-14 16:02 UTC (permalink / raw)
To: Antoine Tenart
Cc: davem, netdev, linux-kernel, thomas.petazzoni, maxime.chevallier,
gregory.clement, miquel.raynal, nadavh, stefanc, ymarkman, mw,
Baruch Siach
On Fri, Dec 14, 2018 at 10:34:51AM +0100, Antoine Tenart wrote:
> The mvpp2_phylink_validate() function sets all modes that are
> supported by a given PPv2 port. A recent change made all ports to
> advertise they support 10G modes in certain cases. This is not true,
> as only the port #0 can do so. This patch fixes it.
>
> Fixes: 01b3fd5ac97c ("net: mvpp2: fix detection of 10G SFP modules")
> Cc: Baruch Siach <baruch@tkos.co.il>
> Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
Looking at net-next, I think there's more to be fixed here:
case PHY_INTERFACE_MODE_RGMII:
case PHY_INTERFACE_MODE_RGMII_ID:
case PHY_INTERFACE_MODE_RGMII_RXID:
case PHY_INTERFACE_MODE_RGMII_TXID:
case PHY_INTERFACE_MODE_SGMII:
...
phylink_set(mask, 10000baseT_Full);
Is that really true?
--
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up
According to speedtest.net: 11.9Mbps down 500kbps up
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net v2] net: mvpp2: 10G modes aren't supported on all ports
2018-12-14 16:02 ` Russell King - ARM Linux
@ 2018-12-14 16:09 ` Antoine Tenart
2018-12-14 16:38 ` Russell King - ARM Linux
0 siblings, 1 reply; 4+ messages in thread
From: Antoine Tenart @ 2018-12-14 16:09 UTC (permalink / raw)
To: Russell King - ARM Linux
Cc: Antoine Tenart, davem, netdev, linux-kernel, thomas.petazzoni,
maxime.chevallier, gregory.clement, miquel.raynal, nadavh,
stefanc, ymarkman, mw, Baruch Siach
Hi Russell,
On Fri, Dec 14, 2018 at 04:02:50PM +0000, Russell King - ARM Linux wrote:
> On Fri, Dec 14, 2018 at 10:34:51AM +0100, Antoine Tenart wrote:
> > The mvpp2_phylink_validate() function sets all modes that are
> > supported by a given PPv2 port. A recent change made all ports to
> > advertise they support 10G modes in certain cases. This is not true,
> > as only the port #0 can do so. This patch fixes it.
> >
> > Fixes: 01b3fd5ac97c ("net: mvpp2: fix detection of 10G SFP modules")
> > Cc: Baruch Siach <baruch@tkos.co.il>
> > Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
>
> Looking at net-next, I think there's more to be fixed here:
>
> case PHY_INTERFACE_MODE_RGMII:
> case PHY_INTERFACE_MODE_RGMII_ID:
> case PHY_INTERFACE_MODE_RGMII_RXID:
> case PHY_INTERFACE_MODE_RGMII_TXID:
> case PHY_INTERFACE_MODE_SGMII:
> ...
> phylink_set(mask, 10000baseT_Full);
>
> Is that really true?
Good catch. Will you send a fix or do you want me to do it?
Thanks,
Antoine
--
Antoine Ténart, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net v2] net: mvpp2: 10G modes aren't supported on all ports
2018-12-14 16:09 ` Antoine Tenart
@ 2018-12-14 16:38 ` Russell King - ARM Linux
0 siblings, 0 replies; 4+ messages in thread
From: Russell King - ARM Linux @ 2018-12-14 16:38 UTC (permalink / raw)
To: Antoine Tenart
Cc: davem, netdev, linux-kernel, thomas.petazzoni, maxime.chevallier,
gregory.clement, miquel.raynal, nadavh, stefanc, ymarkman, mw,
Baruch Siach
On Fri, Dec 14, 2018 at 05:09:44PM +0100, Antoine Tenart wrote:
> Hi Russell,
>
> On Fri, Dec 14, 2018 at 04:02:50PM +0000, Russell King - ARM Linux wrote:
> > On Fri, Dec 14, 2018 at 10:34:51AM +0100, Antoine Tenart wrote:
> > > The mvpp2_phylink_validate() function sets all modes that are
> > > supported by a given PPv2 port. A recent change made all ports to
> > > advertise they support 10G modes in certain cases. This is not true,
> > > as only the port #0 can do so. This patch fixes it.
> > >
> > > Fixes: 01b3fd5ac97c ("net: mvpp2: fix detection of 10G SFP modules")
> > > Cc: Baruch Siach <baruch@tkos.co.il>
> > > Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
> >
> > Looking at net-next, I think there's more to be fixed here:
> >
> > case PHY_INTERFACE_MODE_RGMII:
> > case PHY_INTERFACE_MODE_RGMII_ID:
> > case PHY_INTERFACE_MODE_RGMII_RXID:
> > case PHY_INTERFACE_MODE_RGMII_TXID:
> > case PHY_INTERFACE_MODE_SGMII:
> > ...
> > phylink_set(mask, 10000baseT_Full);
> >
> > Is that really true?
>
> Good catch. Will you send a fix or do you want me to do it?
I'm not planning to given that I don't know what other changes are
in the pipeline - I had assumed you'd wrap it up into a v3.
Thanks.
--
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up
According to speedtest.net: 11.9Mbps down 500kbps up
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-12-14 16:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-14 9:34 [PATCH net v2] net: mvpp2: 10G modes aren't supported on all ports Antoine Tenart
2018-12-14 16:02 ` Russell King - ARM Linux
2018-12-14 16:09 ` Antoine Tenart
2018-12-14 16:38 ` Russell King - ARM Linux
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).