* [PATCH v2 devicetree 1/3] arm64: dts: ls1028a: move DSA CPU port property to the common SoC dtsi
2022-08-31 16:01 [PATCH v2 devicetree 0/3] NXP LS1028A DT changes for multiple switch CPU ports Vladimir Oltean
@ 2022-08-31 16:01 ` Vladimir Oltean
2022-08-31 16:01 ` [PATCH v2 devicetree 2/3] arm64: dts: ls1028a: mark enetc port 3 as a DSA master too Vladimir Oltean
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Vladimir Oltean @ 2022-08-31 16:01 UTC (permalink / raw)
To: devicetree
Cc: netdev, Shawn Guo, Li Yang, Rob Herring, Krzysztof Kozlowski,
linux-arm-kernel, linux-kernel, Michael Walle, Vladimir Oltean
From: Vladimir Oltean <vladimir.oltean@nxp.com>
Since the CPU port 4 of the switch is hardwired inside the SoC to go to
the enetc port 2, this shouldn't be something that the board files need
to set (but whether that CPU port is used or not is another discussion).
So move the DSA "ethernet" property to the common dtsi.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Acked-by: Michael Walle <michael@walle.cc>
---
v1->v2: keep 'status' property last
.../boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts | 1 -
arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts | 1 -
arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 1 -
arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 1 +
4 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts
index 6b575efd84a7..52ef2e8e5492 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts
@@ -104,7 +104,6 @@ &mscc_felix_port3 {
};
&mscc_felix_port4 {
- ethernet = <&enetc_port2>;
status = "okay";
};
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts
index 330e34f933a3..37c20cb6c152 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts
@@ -60,6 +60,5 @@ &mscc_felix_port1 {
};
&mscc_felix_port4 {
- ethernet = <&enetc_port2>;
status = "okay";
};
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
index e0cd1516d05b..7285bdcf2302 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
@@ -278,7 +278,6 @@ &mscc_felix_port3 {
};
&mscc_felix_port4 {
- ethernet = <&enetc_port2>;
status = "okay";
};
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
index 5627dd7734f3..1215fcdf70fa 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -1156,6 +1156,7 @@ mscc_felix_port3: port@3 {
mscc_felix_port4: port@4 {
reg = <4>;
phy-mode = "internal";
+ ethernet = <&enetc_port2>;
status = "disabled";
fixed-link {
--
2.34.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v2 devicetree 2/3] arm64: dts: ls1028a: mark enetc port 3 as a DSA master too
2022-08-31 16:01 [PATCH v2 devicetree 0/3] NXP LS1028A DT changes for multiple switch CPU ports Vladimir Oltean
2022-08-31 16:01 ` [PATCH v2 devicetree 1/3] arm64: dts: ls1028a: move DSA CPU port property to the common SoC dtsi Vladimir Oltean
@ 2022-08-31 16:01 ` Vladimir Oltean
2022-09-01 7:32 ` Michael Walle
2022-08-31 16:01 ` [PATCH v2 devicetree 3/3] arm64: dts: ls1028a: enable swp5 and eno3 for all boards Vladimir Oltean
2022-09-05 3:24 ` [PATCH v2 devicetree 0/3] NXP LS1028A DT changes for multiple switch CPU ports Shawn Guo
3 siblings, 1 reply; 6+ messages in thread
From: Vladimir Oltean @ 2022-08-31 16:01 UTC (permalink / raw)
To: devicetree
Cc: netdev, Shawn Guo, Li Yang, Rob Herring, Krzysztof Kozlowski,
linux-arm-kernel, linux-kernel, Michael Walle, Vladimir Oltean
From: Vladimir Oltean <vladimir.oltean@nxp.com>
The LS1028A switch has 2 internal links to the ENETC controller.
With DSA's ability to support multiple CPU ports, we should mark both
ENETC ports as DSA masters.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
v1->v2: keep 'status' property last
arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
index 1215fcdf70fa..ac1c3a7e5f7a 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -1169,6 +1169,7 @@ fixed-link {
mscc_felix_port5: port@5 {
reg = <5>;
phy-mode = "internal";
+ ethernet = <&enetc_port3>;
status = "disabled";
fixed-link {
--
2.34.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v2 devicetree 2/3] arm64: dts: ls1028a: mark enetc port 3 as a DSA master too
2022-08-31 16:01 ` [PATCH v2 devicetree 2/3] arm64: dts: ls1028a: mark enetc port 3 as a DSA master too Vladimir Oltean
@ 2022-09-01 7:32 ` Michael Walle
0 siblings, 0 replies; 6+ messages in thread
From: Michael Walle @ 2022-09-01 7:32 UTC (permalink / raw)
To: Vladimir Oltean
Cc: devicetree, netdev, Shawn Guo, Li Yang, Rob Herring,
Krzysztof Kozlowski, linux-arm-kernel, linux-kernel,
Vladimir Oltean
Am 2022-08-31 18:01, schrieb Vladimir Oltean:
> From: Vladimir Oltean <vladimir.oltean@nxp.com>
>
> The LS1028A switch has 2 internal links to the ENETC controller.
>
> With DSA's ability to support multiple CPU ports, we should mark both
> ENETC ports as DSA masters.
>
> Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Michael Walle <michael@walle.cc>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 devicetree 3/3] arm64: dts: ls1028a: enable swp5 and eno3 for all boards
2022-08-31 16:01 [PATCH v2 devicetree 0/3] NXP LS1028A DT changes for multiple switch CPU ports Vladimir Oltean
2022-08-31 16:01 ` [PATCH v2 devicetree 1/3] arm64: dts: ls1028a: move DSA CPU port property to the common SoC dtsi Vladimir Oltean
2022-08-31 16:01 ` [PATCH v2 devicetree 2/3] arm64: dts: ls1028a: mark enetc port 3 as a DSA master too Vladimir Oltean
@ 2022-08-31 16:01 ` Vladimir Oltean
2022-09-05 3:24 ` [PATCH v2 devicetree 0/3] NXP LS1028A DT changes for multiple switch CPU ports Shawn Guo
3 siblings, 0 replies; 6+ messages in thread
From: Vladimir Oltean @ 2022-08-31 16:01 UTC (permalink / raw)
To: devicetree
Cc: netdev, Shawn Guo, Li Yang, Rob Herring, Krzysztof Kozlowski,
linux-arm-kernel, linux-kernel, Michael Walle, Vladimir Oltean
From: Vladimir Oltean <vladimir.oltean@nxp.com>
In order for the LS1028A based boards to benefit from support for
multiple CPU ports, the second DSA master and its associated CPU port
must be enabled in the device trees. This does not change the default
CPU port from the current port 4.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Acked-by: Michael Walle <michael@walle.cc>
---
v1->v2: none
.../dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts | 8 ++++++++
.../boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts | 8 ++++++++
arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 8 ++++++++
3 files changed, 24 insertions(+)
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts
index 52ef2e8e5492..73eb6061c73e 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts
@@ -59,6 +59,10 @@ &enetc_port2 {
status = "okay";
};
+&enetc_port3 {
+ status = "okay";
+};
+
&i2c3 {
eeprom@57 {
compatible = "atmel,24c32";
@@ -107,6 +111,10 @@ &mscc_felix_port4 {
status = "okay";
};
+&mscc_felix_port5 {
+ status = "okay";
+};
+
&sata {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts
index 37c20cb6c152..113b1df74bf8 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts
@@ -39,6 +39,10 @@ &enetc_port2 {
status = "okay";
};
+&enetc_port3 {
+ status = "okay";
+};
+
&mscc_felix {
status = "okay";
};
@@ -62,3 +66,7 @@ &mscc_felix_port1 {
&mscc_felix_port4 {
status = "okay";
};
+
+&mscc_felix_port5 {
+ status = "okay";
+};
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
index 7285bdcf2302..e33725c60169 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
@@ -151,6 +151,10 @@ &enetc_port2 {
status = "okay";
};
+&enetc_port3 {
+ status = "okay";
+};
+
&esdhc {
sd-uhs-sdr104;
sd-uhs-sdr50;
@@ -281,6 +285,10 @@ &mscc_felix_port4 {
status = "okay";
};
+&mscc_felix_port5 {
+ status = "okay";
+};
+
&optee {
status = "okay";
};
--
2.34.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v2 devicetree 0/3] NXP LS1028A DT changes for multiple switch CPU ports
2022-08-31 16:01 [PATCH v2 devicetree 0/3] NXP LS1028A DT changes for multiple switch CPU ports Vladimir Oltean
` (2 preceding siblings ...)
2022-08-31 16:01 ` [PATCH v2 devicetree 3/3] arm64: dts: ls1028a: enable swp5 and eno3 for all boards Vladimir Oltean
@ 2022-09-05 3:24 ` Shawn Guo
3 siblings, 0 replies; 6+ messages in thread
From: Shawn Guo @ 2022-09-05 3:24 UTC (permalink / raw)
To: Vladimir Oltean
Cc: devicetree, netdev, Li Yang, Rob Herring, Krzysztof Kozlowski,
linux-arm-kernel, linux-kernel, Michael Walle
On Wed, Aug 31, 2022 at 07:01:21PM +0300, Vladimir Oltean wrote:
> The Ethernet switch embedded within the NXP LS1028A has 2 Ethernet ports
> towards the host, for local packet termination. In current device trees,
> only the first port is enabled. Enabling the second port allows having a
> higher termination throughput.
>
> Care has been taken that this change does not produce regressions when
> using updated device trees with old kernels that do not support multiple
> DSA CPU ports. The only difference for old kernels will be the
> appearance of a new net device (for &enetc_port3) which will not be very
> useful for much of anything.
>
> Vladimir Oltean (3):
> arm64: dts: ls1028a: move DSA CPU port property to the common SoC dtsi
> arm64: dts: ls1028a: mark enetc port 3 as a DSA master too
> arm64: dts: ls1028a: enable swp5 and eno3 for all boards
Applied all, thanks!
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread