| Message ID | E1jHoHy-0002Ep-IY@rmk-PC.armlinux.org.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: dts: update SolidRun Armada 8040 phy interface types | expand |
A note for Gregorii / bootlin people: After this patch, these still remain: arch/arm64/boot/dts/marvell/cn9131-db.dts: phy-mode = "10gbase-kr"; arch/arm64/boot/dts/marvell/armada-7040-db.dts: phy-mode = "10gbase-kr"; arch/arm64/boot/dts/marvell/armada-8040-db.dts: phy-mode = "10gbase-kr"; arch/arm64/boot/dts/marvell/armada-8040-db.dts: phy-mode = "10gbase-kr"; arch/arm64/boot/dts/marvell/cn9132-db.dts: phy-mode = "10gbase-kr"; arch/arm64/boot/dts/marvell/cn9130-db.dts: phy-mode = "10gbase-kr"; Please can you check whether these should be updated, and if so also update them? 10GBASE-KR is the backplane variant of 10GBASE-R which involves some negotiation. Thanks. On Fri, Mar 27, 2020 at 12:40:42PM +0000, Russell King wrote: > Update the SolidRun Armada 8040 platforms phy interface types from the > old 10gbase-kr to the newer and more correct 10gbase-r. > > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> > --- > arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts | 2 +- > arch/arm64/boot/dts/marvell/armada-8040-mcbin-singleshot.dts | 4 ++-- > arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts b/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts > index 1e7b47affe26..006666272489 100644 > --- a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts > +++ b/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts > @@ -401,7 +401,7 @@ > /* SFP */ > &cp0_eth0 { > status = "okay"; > - phy-mode = "10gbase-kr"; > + phy-mode = "10gbase-r"; > managed = "in-band-status"; > phys = <&cp0_comphy2 0>; > sfp = <&sfp_cp0_eth0>; > diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin-singleshot.dts b/arch/arm64/boot/dts/marvell/armada-8040-mcbin-singleshot.dts > index 26114d96d637..b44f4c029b78 100644 > --- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin-singleshot.dts > +++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin-singleshot.dts > @@ -16,14 +16,14 @@ > > &cp0_eth0 { > status = "okay"; > - phy-mode = "10gbase-kr"; > + phy-mode = "10gbase-r"; > managed = "in-band-status"; > sfp = <&sfp_eth0>; > }; > > &cp1_eth0 { > status = "okay"; > - phy-mode = "10gbase-kr"; > + phy-mode = "10gbase-r"; > managed = "in-band-status"; > sfp = <&sfp_eth1>; > }; > diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts > index 087a5502631e..42741adf867b 100644 > --- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts > +++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts > @@ -63,14 +63,14 @@ > status = "okay"; > /* Network PHY */ > phy = <&phy0>; > - phy-mode = "10gbase-kr"; > + phy-mode = "10gbase-r"; > }; > > &cp1_eth0 { > status = "okay"; > /* Network PHY */ > phy = <&phy8>; > - phy-mode = "10gbase-kr"; > + phy-mode = "10gbase-r"; > }; > > &cp1_pinctrl { > -- > 2.20.1 > >
On Fri, Mar 27, 2020 at 12:40:42PM +0000, Russell King wrote: > Update the SolidRun Armada 8040 platforms phy interface types from the > old 10gbase-kr to the newer and more correct 10gbase-r. > > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Can we add a fixes: tag to this? So it gets backported to the point 10gbase-r was added. Andrew
On Fri, Mar 27, 2020 at 02:43:19PM +0100, Andrew Lunn wrote: > On Fri, Mar 27, 2020 at 12:40:42PM +0000, Russell King wrote: > > Update the SolidRun Armada 8040 platforms phy interface types from the > > old 10gbase-kr to the newer and more correct 10gbase-r. > > > > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> > > Reviewed-by: Andrew Lunn <andrew@lunn.ch> > > Can we add a fixes: tag to this? So it gets backported to the point > 10gbase-r was added. I think "carefully" is the answer. It's not just the point where 10gbase-r was added because there's a whole bunch of other patches that are also required to the various ethernet and PHY drivers, SFP and phylink. It's probably going to take a bit to work that out, get it wrong and stuff will break.
On Fri, Mar 27, 2020 at 01:46:52PM +0000, Russell King - ARM Linux admin wrote: > On Fri, Mar 27, 2020 at 02:43:19PM +0100, Andrew Lunn wrote: > > On Fri, Mar 27, 2020 at 12:40:42PM +0000, Russell King wrote: > > > Update the SolidRun Armada 8040 platforms phy interface types from the > > > old 10gbase-kr to the newer and more correct 10gbase-r. > > > > > > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> > > > > Reviewed-by: Andrew Lunn <andrew@lunn.ch> > > > > Can we add a fixes: tag to this? So it gets backported to the point > > 10gbase-r was added. > > I think "carefully" is the answer. It's not just the point where > 10gbase-r was added because there's a whole bunch of other patches > that are also required to the various ethernet and PHY drivers, SFP > and phylink. It's probably going to take a bit to work that out, > get it wrong and stuff will break. ... and actually there is no point. It is _way_ too soon to even start thinking of using 10GKR for its true purpose - the patches to add 10GBASER were only merged for v5.6-rc1, so we're still waiting for a kernel with that update to be released. In other words, there's no stable kernels to backport it to yet. Do we want it to go into -rc? If so, it also needs to be thoroughly tested.
> ... and actually there is no point.
O.K. lets merge these as normal, not as fixes. It is probably too
late for ARM SoC, so i guess they will get merged next cycle.
Andrew
On Fri, Mar 27, 2020 at 03:15:38PM +0100, Andrew Lunn wrote: > > ... and actually there is no point. > > O.K. lets merge these as normal, not as fixes. It is probably too > late for ARM SoC, so i guess they will get merged next cycle. Yep, which means that the backplane patches from NXP will have to be delayed about 20 weeks (about 10 weeks in the arm64 tree before being merged into 5.8-rc1, and then another 10 weeks before 5.8 is released.) That's probably not a bad thing, as it'll let us hash out the conflicts between my PCS patch set and their backplane patches.
Hello, > On Fri, Mar 27, 2020 at 03:15:38PM +0100, Andrew Lunn wrote: >> > ... and actually there is no point. >> >> O.K. lets merge these as normal, not as fixes. It is probably too >> late for ARM SoC, so i guess they will get merged next cycle. > > Yep, which means that the backplane patches from NXP will have to be > delayed about 20 weeks (about 10 weeks in the arm64 tree before being > merged into 5.8-rc1, and then another 10 weeks before 5.8 is released.) > That's probably not a bad thing, as it'll let us hash out the conflicts > between my PCS patch set and their backplane patches. None of my pull request has been merged yet, so I can make an other one ontop of the existing ones with this patch, and I will let decide the ARM SoC maintainer if they can take it or not. Gregory > > -- > RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ > FTTC broadband for 0.8mile line in suburbia: sync at 10.2Mbps down 587kbps up
diff --git a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts b/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts index 1e7b47affe26..006666272489 100644 --- a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts +++ b/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts @@ -401,7 +401,7 @@ /* SFP */ &cp0_eth0 { status = "okay"; - phy-mode = "10gbase-kr"; + phy-mode = "10gbase-r"; managed = "in-band-status"; phys = <&cp0_comphy2 0>; sfp = <&sfp_cp0_eth0>; diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin-singleshot.dts b/arch/arm64/boot/dts/marvell/armada-8040-mcbin-singleshot.dts index 26114d96d637..b44f4c029b78 100644 --- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin-singleshot.dts +++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin-singleshot.dts @@ -16,14 +16,14 @@ &cp0_eth0 { status = "okay"; - phy-mode = "10gbase-kr"; + phy-mode = "10gbase-r"; managed = "in-band-status"; sfp = <&sfp_eth0>; }; &cp1_eth0 { status = "okay"; - phy-mode = "10gbase-kr"; + phy-mode = "10gbase-r"; managed = "in-band-status"; sfp = <&sfp_eth1>; }; diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts index 087a5502631e..42741adf867b 100644 --- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts +++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts @@ -63,14 +63,14 @@ status = "okay"; /* Network PHY */ phy = <&phy0>; - phy-mode = "10gbase-kr"; + phy-mode = "10gbase-r"; }; &cp1_eth0 { status = "okay"; /* Network PHY */ phy = <&phy8>; - phy-mode = "10gbase-kr"; + phy-mode = "10gbase-r"; }; &cp1_pinctrl {
Update the SolidRun Armada 8040 platforms phy interface types from the old 10gbase-kr to the newer and more correct 10gbase-r. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> --- arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts | 2 +- arch/arm64/boot/dts/marvell/armada-8040-mcbin-singleshot.dts | 4 ++-- arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)