Skip to contentSkip to conversation

NXP LS1028A DT changes for multiple switch CPU ports

PATCH Applied Vladimir Oltean 3 participants 6 messages Aug 31, 2022 – Sep 5, 2022

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

v2 cover NXP LS1028A DT changes for multiple switch CPU ports

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

 .../dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts  | 9 ++++++++-
 .../boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts | 9 ++++++++-
 arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts        | 9 ++++++++-
 arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi           | 2 ++
 4 files changed, 26 insertions(+), 3 deletions(-)
Signature · 1 line
2.34.1
#1 lore raw

PATCH v2 1/3 arm64: dts: ls1028a: move DSA CPU port property to the common SoC dtsi

From: Vladimir Oltean <[email protected]>

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.

---
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(-)
arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts +0 -1
index 6b575efd84a7..52ef2e8e5492 100644
@@ -104,7 +104,6 @@ &mscc_felix_port3 {
 };
 
 &mscc_felix_port4 {
-	ethernet = <&enetc_port2>;
 	status = "okay";
 };
 
arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts +0 -1
index 330e34f933a3..37c20cb6c152 100644
@@ -60,6 +60,5 @@ &mscc_felix_port1 {
 };
 
 &mscc_felix_port4 {
-	ethernet = <&enetc_port2>;
 	status = "okay";
 };
arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts +0 -1
index e0cd1516d05b..7285bdcf2302 100644
@@ -278,7 +278,6 @@ &mscc_felix_port3 {
 };
 
 &mscc_felix_port4 {
-	ethernet = <&enetc_port2>;
 	status = "okay";
 };
 
arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +1 -0
index 5627dd7734f3..1215fcdf70fa 100644
@@ -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 {
Signature · 1 line
2.34.1
#2 lore raw

PATCH v2 2/3 arm64: dts: ls1028a: mark enetc port 3 as a DSA master too

In reply to Vladimir Oltean

From: Vladimir Oltean <[email protected]>

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.

---
v1->v2: keep 'status' property last

 arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +1 -0
index 1215fcdf70fa..ac1c3a7e5f7a 100644
@@ -1169,6 +1169,7 @@ fixed-link {
 					mscc_felix_port5: port@5 {
 						reg = <5>;
 						phy-mode = "internal";
+						ethernet = <&enetc_port3>;
 						status = "disabled";
 
 						fixed-link {
Signature · 1 line
2.34.1
Reviewed-by on v2 2/3
#3 lore raw

Re: [PATCH v2 devicetree 2/3] arm64: dts: ls1028a: mark enetc port 3 as a DSA master too

Am 2022-08-31 18:01, schrieb Vladimir Oltean:

Quoted 8 lines

From: Vladimir Oltean <[email protected]>

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.

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#4 lore raw

PATCH v2 3/3 arm64: dts: ls1028a: enable swp5 and eno3 for all boards

In reply to Vladimir Oltean

From: Vladimir Oltean <[email protected]>

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.

---
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(+)
arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts +8 -0
index 52ef2e8e5492..73eb6061c73e 100644
@@ -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";
 };
arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts +8 -0
index 37c20cb6c152..113b1df74bf8 100644
@@ -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";
+};
arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts +8 -0
index 7285bdcf2302..e33725c60169 100644
@@ -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";
 };
Signature · 1 line
2.34.1
Applied
#5 lore raw
In reply to Vladimir Oltean
Quoted 11 lines · Vladimir Oltean

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.

Quoted 4 lines

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!