| Message ID | 20230525182606.3317923-1-andrew@lunn.ch (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [v2] ARM: dts: vf610: ZII: Add missing phy-mode and fixed links | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
On Thu, May 25, 2023 at 08:26:06PM +0200, Andrew Lunn wrote: > The DSA framework has got more picky about always having a phy-mode > for the CPU port. The Vybrid FEC is a Fast Ethrnet using RMII. > > Additionally, the cpu label has never actually been used in the > binding, so remove it. > > Lastly, for DSA links between switches, add a fixed-link node > indicating the expected speed/duplex of the link. > > Signed-off-by: Andrew Lunn <andrew@lunn.ch> Applied, thanks!
On Thu, May 25, 2023 at 08:26:06PM +0200, Andrew Lunn wrote: > diff --git a/arch/arm/boot/dts/vf610-zii-cfu1.dts b/arch/arm/boot/dts/vf610-zii-cfu1.dts > index 96495d965163..1a19aec8957b 100644 > --- a/arch/arm/boot/dts/vf610-zii-cfu1.dts > +++ b/arch/arm/boot/dts/vf610-zii-cfu1.dts > @@ -202,7 +202,7 @@ port@5 { > > port@6 { > reg = <6>; > - label = "cpu"; > + phy-mode = "rmii"; > ethernet = <&fec1>; > > fixed-link { > diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts > index 6280c5e86a12..6071eb6b33a0 100644 > --- a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts > +++ b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts > @@ -75,7 +75,7 @@ fixed-link { > > port@6 { > reg = <6>; > - label = "cpu"; > + phy-mode = "rmii"; > ethernet = <&fec1>; > > fixed-link { > diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts > index c00d39562a10..6f9878f124c4 100644 > --- a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts > +++ b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts > @@ -44,7 +44,7 @@ ports { > > port@0 { > reg = <0>; > - label = "cpu"; > + phy-mode = "rmii"; > ethernet = <&fec1>; > > fixed-link { > diff --git a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts > index 7b3276cd470f..df1335492a19 100644 > --- a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts > +++ b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts > @@ -59,7 +59,7 @@ ports { > > port@0 { > reg = <0>; > - label = "cpu"; > + phy-mode = "rmii"; > ethernet = <&fec1>; > > fixed-link { > diff --git a/arch/arm/boot/dts/vf610-zii-spb4.dts b/arch/arm/boot/dts/vf610-zii-spb4.dts > index 180acb0795b9..1461804ecaea 100644 > --- a/arch/arm/boot/dts/vf610-zii-spb4.dts > +++ b/arch/arm/boot/dts/vf610-zii-spb4.dts > @@ -140,7 +140,7 @@ ports { > > port@0 { > reg = <0>; > - label = "cpu"; > + phy-mode = "rmii"; > ethernet = <&fec1>; > > fixed-link { > diff --git a/arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts b/arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts > index 73fdace4cb42..463c2452b9b7 100644 > --- a/arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts > +++ b/arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts > @@ -129,7 +129,7 @@ ports { > > port@0 { > reg = <0>; > - label = "cpu"; > + phy-mode = "rmii"; > ethernet = <&fec1>; > > fixed-link { > diff --git a/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts b/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts > index 20beaa8433b6..f5ae0d5de315 100644 > --- a/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts > +++ b/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts > @@ -154,7 +154,7 @@ ports { > > port@0 { > reg = <0>; > - label = "cpu"; > + phy-mode = "rmii"; > ethernet = <&fec1>; > > fixed-link { Shouldn't these have been rev-rmii to be consistent with what was done for arm64?
On Mon, May 29, 2023 at 04:35:07PM +0300, Vladimir Oltean wrote: > On Thu, May 25, 2023 at 08:26:06PM +0200, Andrew Lunn wrote: > > diff --git a/arch/arm/boot/dts/vf610-zii-cfu1.dts b/arch/arm/boot/dts/vf610-zii-cfu1.dts > > index 96495d965163..1a19aec8957b 100644 > > --- a/arch/arm/boot/dts/vf610-zii-cfu1.dts > > +++ b/arch/arm/boot/dts/vf610-zii-cfu1.dts > > @@ -202,7 +202,7 @@ port@5 { > > > > port@6 { > > reg = <6>; > > - label = "cpu"; > > + phy-mode = "rmii"; > > ethernet = <&fec1>; > > > > fixed-link { > > diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts > > index 6280c5e86a12..6071eb6b33a0 100644 > > --- a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts > > +++ b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts > > @@ -75,7 +75,7 @@ fixed-link { > > > > port@6 { > > reg = <6>; > > - label = "cpu"; > > + phy-mode = "rmii"; > > ethernet = <&fec1>; > > > > fixed-link { > > diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts > > index c00d39562a10..6f9878f124c4 100644 > > --- a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts > > +++ b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts > > @@ -44,7 +44,7 @@ ports { > > > > port@0 { > > reg = <0>; > > - label = "cpu"; > > + phy-mode = "rmii"; > > ethernet = <&fec1>; > > > > fixed-link { > > diff --git a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts > > index 7b3276cd470f..df1335492a19 100644 > > --- a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts > > +++ b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts > > @@ -59,7 +59,7 @@ ports { > > > > port@0 { > > reg = <0>; > > - label = "cpu"; > > + phy-mode = "rmii"; > > ethernet = <&fec1>; > > > > fixed-link { > > diff --git a/arch/arm/boot/dts/vf610-zii-spb4.dts b/arch/arm/boot/dts/vf610-zii-spb4.dts > > index 180acb0795b9..1461804ecaea 100644 > > --- a/arch/arm/boot/dts/vf610-zii-spb4.dts > > +++ b/arch/arm/boot/dts/vf610-zii-spb4.dts > > @@ -140,7 +140,7 @@ ports { > > > > port@0 { > > reg = <0>; > > - label = "cpu"; > > + phy-mode = "rmii"; > > ethernet = <&fec1>; > > > > fixed-link { > > diff --git a/arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts b/arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts > > index 73fdace4cb42..463c2452b9b7 100644 > > --- a/arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts > > +++ b/arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts > > @@ -129,7 +129,7 @@ ports { > > > > port@0 { > > reg = <0>; > > - label = "cpu"; > > + phy-mode = "rmii"; > > ethernet = <&fec1>; > > > > fixed-link { > > diff --git a/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts b/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts > > index 20beaa8433b6..f5ae0d5de315 100644 > > --- a/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts > > +++ b/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts > > @@ -154,7 +154,7 @@ ports { > > > > port@0 { > > reg = <0>; > > - label = "cpu"; > > + phy-mode = "rmii"; > > ethernet = <&fec1>; > > > > fixed-link { > > Shouldn't these have been rev-rmii to be consistent with what was done > for arm64? Should I drop the patch for now, or can this be changed incrementally if needed? Shawn
On Sun, Jun 04, 2023 at 08:07:48PM +0800, Shawn Guo wrote: > On Mon, May 29, 2023 at 04:35:07PM +0300, Vladimir Oltean wrote: > > On Thu, May 25, 2023 at 08:26:06PM +0200, Andrew Lunn wrote: > > > diff --git a/arch/arm/boot/dts/vf610-zii-cfu1.dts b/arch/arm/boot/dts/vf610-zii-cfu1.dts > > > index 96495d965163..1a19aec8957b 100644 > > > --- a/arch/arm/boot/dts/vf610-zii-cfu1.dts > > > +++ b/arch/arm/boot/dts/vf610-zii-cfu1.dts > > > @@ -202,7 +202,7 @@ port@5 { > > > > > > port@6 { > > > reg = <6>; > > > - label = "cpu"; > > > + phy-mode = "rmii"; > > > ethernet = <&fec1>; > > > > > > fixed-link { > > > diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts > > > index 6280c5e86a12..6071eb6b33a0 100644 > > > --- a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts > > > +++ b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts > > > @@ -75,7 +75,7 @@ fixed-link { > > > > > > port@6 { > > > reg = <6>; > > > - label = "cpu"; > > > + phy-mode = "rmii"; > > > ethernet = <&fec1>; > > > > > > fixed-link { > > > diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts > > > index c00d39562a10..6f9878f124c4 100644 > > > --- a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts > > > +++ b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts > > > @@ -44,7 +44,7 @@ ports { > > > > > > port@0 { > > > reg = <0>; > > > - label = "cpu"; > > > + phy-mode = "rmii"; > > > ethernet = <&fec1>; > > > > > > fixed-link { > > > diff --git a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts > > > index 7b3276cd470f..df1335492a19 100644 > > > --- a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts > > > +++ b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts > > > @@ -59,7 +59,7 @@ ports { > > > > > > port@0 { > > > reg = <0>; > > > - label = "cpu"; > > > + phy-mode = "rmii"; > > > ethernet = <&fec1>; > > > > > > fixed-link { > > > diff --git a/arch/arm/boot/dts/vf610-zii-spb4.dts b/arch/arm/boot/dts/vf610-zii-spb4.dts > > > index 180acb0795b9..1461804ecaea 100644 > > > --- a/arch/arm/boot/dts/vf610-zii-spb4.dts > > > +++ b/arch/arm/boot/dts/vf610-zii-spb4.dts > > > @@ -140,7 +140,7 @@ ports { > > > > > > port@0 { > > > reg = <0>; > > > - label = "cpu"; > > > + phy-mode = "rmii"; > > > ethernet = <&fec1>; > > > > > > fixed-link { > > > diff --git a/arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts b/arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts > > > index 73fdace4cb42..463c2452b9b7 100644 > > > --- a/arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts > > > +++ b/arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts > > > @@ -129,7 +129,7 @@ ports { > > > > > > port@0 { > > > reg = <0>; > > > - label = "cpu"; > > > + phy-mode = "rmii"; > > > ethernet = <&fec1>; > > > > > > fixed-link { > > > diff --git a/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts b/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts > > > index 20beaa8433b6..f5ae0d5de315 100644 > > > --- a/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts > > > +++ b/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts > > > @@ -154,7 +154,7 @@ ports { > > > > > > port@0 { > > > reg = <0>; > > > - label = "cpu"; > > > + phy-mode = "rmii"; > > > ethernet = <&fec1>; > > > > > > fixed-link { > > > > Shouldn't these have been rev-rmii to be consistent with what was done > > for arm64? > > Should I drop the patch for now, or can this be changed incrementally if > needed? What we have here is something that is "close enough". It isn't 100% correct, but acceptable for the time being, and isn't something that will ever become a problem, since the hardware itself can not have its interface mode changed (it's set by pin strapping.) It's something that can be fixed later.
On Sun, Jun 04, 2023 at 01:24:35PM +0100, Russell King (Oracle) wrote: > On Sun, Jun 04, 2023 at 08:07:48PM +0800, Shawn Guo wrote: > > On Mon, May 29, 2023 at 04:35:07PM +0300, Vladimir Oltean wrote: > > > On Thu, May 25, 2023 at 08:26:06PM +0200, Andrew Lunn wrote: ... > > > > diff --git a/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts b/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts > > > > index 20beaa8433b6..f5ae0d5de315 100644 > > > > --- a/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts > > > > +++ b/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts > > > > @@ -154,7 +154,7 @@ ports { > > > > > > > > port@0 { > > > > reg = <0>; > > > > - label = "cpu"; > > > > + phy-mode = "rmii"; > > > > ethernet = <&fec1>; > > > > > > > > fixed-link { > > > > > > Shouldn't these have been rev-rmii to be consistent with what was done > > > for arm64? > > > > Should I drop the patch for now, or can this be changed incrementally if > > needed? > > What we have here is something that is "close enough". It isn't 100% > correct, but acceptable for the time being, and isn't something that > will ever become a problem, since the hardware itself can not have > its interface mode changed (it's set by pin strapping.) > > It's something that can be fixed later. Thanks for the clarification, Russell! Shawn
diff --git a/arch/arm/boot/dts/vf610-zii-cfu1.dts b/arch/arm/boot/dts/vf610-zii-cfu1.dts index 96495d965163..1a19aec8957b 100644 --- a/arch/arm/boot/dts/vf610-zii-cfu1.dts +++ b/arch/arm/boot/dts/vf610-zii-cfu1.dts @@ -202,7 +202,7 @@ port@5 { port@6 { reg = <6>; - label = "cpu"; + phy-mode = "rmii"; ethernet = <&fec1>; fixed-link { diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts index 6280c5e86a12..6071eb6b33a0 100644 --- a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts +++ b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts @@ -75,7 +75,7 @@ fixed-link { port@6 { reg = <6>; - label = "cpu"; + phy-mode = "rmii"; ethernet = <&fec1>; fixed-link { diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts index c00d39562a10..6f9878f124c4 100644 --- a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts +++ b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts @@ -44,7 +44,7 @@ ports { port@0 { reg = <0>; - label = "cpu"; + phy-mode = "rmii"; ethernet = <&fec1>; fixed-link { @@ -82,6 +82,11 @@ switch0port10: port@10 { label = "dsa"; phy-mode = "xaui"; link = <&switch1port10>; + + fixed-link { + speed = <10000>; + full-duplex; + }; }; }; @@ -174,6 +179,11 @@ switch1port10: port@10 { label = "dsa"; phy-mode = "xaui"; link = <&switch0port10>; + + fixed-link { + speed = <10000>; + full-duplex; + }; }; }; mdio { diff --git a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts index 7b3276cd470f..df1335492a19 100644 --- a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts +++ b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts @@ -59,7 +59,7 @@ ports { port@0 { reg = <0>; - label = "cpu"; + phy-mode = "rmii"; ethernet = <&fec1>; fixed-link { @@ -115,6 +115,11 @@ switch0port10: port@10 { link = <&switch1port10 &switch3port10 &switch2port10>; + + fixed-link { + speed = <10000>; + full-duplex; + }; }; }; }; @@ -156,6 +161,11 @@ switch1port9: port@9 { phy-mode = "xgmii"; link = <&switch3port10 &switch2port10>; + + fixed-link { + speed = <10000>; + full-duplex; + }; }; switch1port10: port@10 { @@ -163,6 +173,11 @@ switch1port10: port@10 { label = "dsa"; phy-mode = "xgmii"; link = <&switch0port10>; + + fixed-link { + speed = <10000>; + full-duplex; + }; }; }; }; @@ -246,6 +261,11 @@ switch2port10: port@10 { link = <&switch3port9 &switch1port9 &switch0port10>; + + fixed-link { + speed = <2500>; + full-duplex; + }; }; }; }; @@ -295,6 +315,11 @@ switch3port9: port@9 { label = "dsa"; phy-mode = "2500base-x"; link = <&switch2port10>; + + fixed-link { + speed = <2500>; + full-duplex; + }; }; switch3port10: port@10 { @@ -303,6 +328,11 @@ switch3port10: port@10 { phy-mode = "xgmii"; link = <&switch1port9 &switch0port10>; + + fixed-link { + speed = <10000>; + full-duplex; + }; }; }; }; diff --git a/arch/arm/boot/dts/vf610-zii-spb4.dts b/arch/arm/boot/dts/vf610-zii-spb4.dts index 180acb0795b9..1461804ecaea 100644 --- a/arch/arm/boot/dts/vf610-zii-spb4.dts +++ b/arch/arm/boot/dts/vf610-zii-spb4.dts @@ -140,7 +140,7 @@ ports { port@0 { reg = <0>; - label = "cpu"; + phy-mode = "rmii"; ethernet = <&fec1>; fixed-link { diff --git a/arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts b/arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts index 73fdace4cb42..463c2452b9b7 100644 --- a/arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts +++ b/arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts @@ -129,7 +129,7 @@ ports { port@0 { reg = <0>; - label = "cpu"; + phy-mode = "rmii"; ethernet = <&fec1>; fixed-link { diff --git a/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts b/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts index 20beaa8433b6..f5ae0d5de315 100644 --- a/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts +++ b/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts @@ -154,7 +154,7 @@ ports { port@0 { reg = <0>; - label = "cpu"; + phy-mode = "rmii"; ethernet = <&fec1>; fixed-link {
The DSA framework has got more picky about always having a phy-mode for the CPU port. The Vybrid FEC is a Fast Ethrnet using RMII. Additionally, the cpu label has never actually been used in the binding, so remove it. Lastly, for DSA links between switches, add a fixed-link node indicating the expected speed/duplex of the link. Signed-off-by: Andrew Lunn <andrew@lunn.ch> --- v2: Blank line before fixed-link arch/arm/boot/dts/vf610-zii-cfu1.dts | 2 +- arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 2 +- arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 12 ++++++++- arch/arm/boot/dts/vf610-zii-scu4-aib.dts | 32 ++++++++++++++++++++++- arch/arm/boot/dts/vf610-zii-spb4.dts | 2 +- arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts | 2 +- arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts | 2 +- 7 files changed, 47 insertions(+), 7 deletions(-)