arm64: dts: update SolidRun Armada 8040 phy interface types
Subsystems (3)
PATCH 1/1 arm64: dts: update SolidRun Armada 8040 phy interface types
Update the SolidRun Armada 8040 platforms phy interface types from the old 10gbase-kr to the newer and more correct 10gbase-r.
--- 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(-)
arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts +1 -1
@@ -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>;
arch/arm64/boot/dts/marvell/armada-8040-mcbin-singleshot.dts +2 -2
@@ -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>; };
arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts +2 -2
@@ -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 {
Signature · 1 line
2.20.1
Quoted 12 lines
-----Original Message-----
From: Russell King,,, <[email protected]> On Behalf Of Russell King
Sent: Friday, March 27, 2020 2:41 PM
To: Gregory Clement <[email protected]>
Cc: Madalin Bucur (OSS) <[email protected]>; Jason Cooper <[email protected]>; Andrew Lunn <[email protected]>; Sebastian Hesselbarth <[email protected]>; Rob Herring <[email protected]>; Mark Rutland <[email protected]>; linux-arm- [email protected]; [email protected]
Subject: [PATCH] arm64: dts: update SolidRun Armada 8040 phy interface types
Quoted 4 lines
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 <[email protected]>
Quoted 66 lines
--- 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(-)arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts +1
-1@@ -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>;arch/arm64/boot/dts/marvell/armada-8040-mcbin-singleshot.dts +2
-2@@ -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>; };arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts +2
-3@@ -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
Russell King - ARM Linux admin
maintainerA 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.
Quoted 69 lines · Russell King
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 <[email protected]>--- 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(-)arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts +1
-1@@ -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>;arch/arm64/boot/dts/marvell/armada-8040-mcbin-singleshot.dts +2
-2@@ -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>; };arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts +2
-2@@ -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 {Signature · 1 line
2.20.1
Signature · 2 lines
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
Quoted 4 lines · Russell King
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 <[email protected]>
Can we add a fixes: tag to this? So it gets backported to the point 10gbase-r was added.
Andrew
Russell King - ARM Linux admin
maintainerQuoted 10 lines · Andrew Lunn
Quoted 4 lines · Russell King
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 <[email protected]>Reviewed-by Andrew Lunn <[email protected]>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.
Signature · 2 lines
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
Russell King - ARM Linux admin
maintainerQuoted 9 lines · Russell King - ARM Linux admin
Quoted 8 lines · Andrew Lunn
Quoted 4 lines · Russell King
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 <[email protected]>Reviewed-by Andrew Lunn <[email protected]>
Quoted 8 lines
Quoted 2 lines
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.
Signature · 2 lines
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
Andrew Lunn
maintainerQuoted 1 line
... 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
Russell King - ARM Linux admin
maintainerQuoted 4 lines · Andrew Lunn
Quoted 1 line
... 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.
Signature · 2 lines
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
Gregory CLEMENT
maintainerHello,
Quoted 11 lines · Andrew Lunn
Quoted 4 lines
Quoted 1 line
... 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
Quoted 4 lines
Signature · 3 lines
-- 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
Signature · 3 lines
Gregory Clement, Bootlin Embedded Linux and Kernel engineering http://bootlin.com