Skip to contentSkip to conversation

add support for Renesas RZ/N1 ethernet subsystem devices

PATCH Superseded Clément Léger 5 participants 35 messages May 9, 2022 – May 19, 2022

Subsystems (6)

v4 of 9 Superseded Latest is v9 →

lore
Share & tools
lore

Clément Léger

author maintainer
#0 lore raw

v4 cover add support for Renesas RZ/N1 ethernet subsystem devices

The Renesas RZ/N1 SoCs features an ethernet subsystem which contains (most notably) a switch, two GMACs, and a MII converter [1]. This series adds support for the switch and the MII converter.

The MII converter present on this SoC has been represented as a PCS which sit between the MACs and the PHY. This PCS driver is probed from the device-tree since it requires to be configured. Indeed the MII converter also contains the registers that are handling the muxing of ports (Switch, MAC, HSR, RTOS, etc) internally to the SoC.

The switch driver is based on DSA and exposes 4 ports + 1 CPU management port. It include basic bridging support as well as FDB and statistics support.

This series needs commits 14f11da778ff6421 ("soc: renesas: rzn1: Select PM and PM_GENERIC_DOMAINS configs") and ed66b37f916ee23b ("ARM: dts:
r9a06g032: Add missing '#power-domain-cells'") which are available on the renesas-devel tree in order to enable generic power domain on RZ/N1.

-----
Changes in V4:
- Add ETH_P_DSA_A5PSW in uapi/linux/if_ether.h
- PCS:
- Use devm_pm_runtime_enable() instead of pm_runtime_enable()
- Switch:
- Return -EOPNOTSUPP and set extack when multiple bdridge are created
- Remove error messages in fdb_del if entry does not exists
- Add compatibility with "ethernet-ports" device-tree property
- Tag driver:
- Use ETH_ZLEN as padding len

Changes in V3:
- PCS:
- Fixed reverse christmas tree declaration
- Remove spurious pr_err
- Use pm_runtime functions
- Tag driver:
- Remove packed attribute from the tag struct
- Switch:
- Fix missing spin_unlock in fdb_dump in case of error
- Add static qualifier to dsa_switch_ops
- Add missing documentation for hclk and clk members of struct a5psw
- Changed types of fdb_entry to u16 to discard GCC note on char packed bitfields and add reserved field
- Added Reviewed-by tag from Florian Fainelli

Changes in V2:
- PCS:
- Fix Reverse Christmas tree declaration
- Removed stray newline
- Add PCS remove function and disable clocks in them
- Fix miic_validate function to return correct values
- Split PCS CONV_MODE definition
- Reordered phylink_pcs_ops in definition order
- Remove interface setting in miic_link_up
- Remove useless checks for invalid interface/speed and error prints
- Replace phylink_pcs_to_miic_port macro by a static function
- Add comment in miic_probe about platform_set_drvdata
- Bindings:
- Fix wrong path for mdio.yaml $ref
- Fix yamllint errors
- Tag driver:
- Squashed commit that added tag value with tag driver
- Add BUILD_BUG_ON for tag size
- Split control_data2 in 2 16bits values
- Switch:
- Use .phylink_get_caps instead of .phylink_validate and fill supported_interface correctly
- Use fixed size (ETH_GSTRING_LEN) string for stats and use memcpy
- Remove stats access locking since RTNL lock is used in upper layers
- Check for non C45 addresses in mdio_read/write and return -EOPNOTSUPP
- Add get_eth_mac_stats, get_eth_mac_ctrl_stat, get_rmon_stats
- Fix a few indentation problems
- Remove reset callback from MDIO bus operation
- Add phy/mac/rmon stats
- Add get_rmon_stat to dsa_ops

Clément Léger (12):
net: dsa: add support for ethtool get_rmon_stats()
net: dsa: add Renesas RZ/N1 switch tag driver
dt-bindings: net: pcs: add bindings for Renesas RZ/N1 MII converter
net: pcs: add Renesas MII converter driver
dt-bindings: net: dsa: add bindings for Renesas RZ/N1 Advanced 5 port
switch
net: dsa: rzn1-a5psw: add Renesas RZ/N1 advanced 5 port switch driver
net: dsa: rzn1-a5psw: add statistics support
net: dsa: rzn1-a5psw: add FDB support
ARM: dts: r9a06g032: describe MII converter
ARM: dts: r9a06g032: describe GMAC2
ARM: dts: r9a06g032: describe switch
MAINTAINERS: add Renesas RZ/N1 switch related driver entry

 .../bindings/net/dsa/renesas,rzn1-a5psw.yaml  |  132 ++
 .../bindings/net/pcs/renesas,rzn1-miic.yaml   |  162 +++
 MAINTAINERS                                   |   11 +
 arch/arm/boot/dts/r9a06g032.dtsi              |   64 +
 drivers/net/dsa/Kconfig                       |    9 +
 drivers/net/dsa/Makefile                      |    1 +
 drivers/net/dsa/rzn1_a5psw.c                  | 1065 +++++++++++++++++
 drivers/net/dsa/rzn1_a5psw.h                  |  259 ++++
 drivers/net/pcs/Kconfig                       |    8 +
 drivers/net/pcs/Makefile                      |    1 +
 drivers/net/pcs/pcs-rzn1-miic.c               |  505 ++++++++
 include/dt-bindings/net/pcs-rzn1-miic.h       |   33 +
 include/linux/pcs-rzn1-miic.h                 |   18 +
 include/net/dsa.h                             |    5 +
 include/uapi/linux/if_ether.h                 |    1 +
 net/dsa/Kconfig                               |    7 +
 net/dsa/Makefile                              |    1 +
 net/dsa/slave.c                               |   13 +
 net/dsa/tag_rzn1_a5psw.c                      |  113 ++
 19 files changed, 2408 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml
 create mode 100644 Documentation/devicetree/bindings/net/pcs/renesas,rzn1-miic.yaml
 create mode 100644 drivers/net/dsa/rzn1_a5psw.c
 create mode 100644 drivers/net/dsa/rzn1_a5psw.h
 create mode 100644 drivers/net/pcs/pcs-rzn1-miic.c
 create mode 100644 include/dt-bindings/net/pcs-rzn1-miic.h
 create mode 100644 include/linux/pcs-rzn1-miic.h
 create mode 100644 net/dsa/tag_rzn1_a5psw.c
Signature · 1 line
2.36.0
author maintainer
#1 lore raw

PATCH v4 1/12 net: dsa: add support for ethtool get_rmon_stats()

Add support to allow dsa drivers to specify the .get_rmon_stats() operation.

---
 include/net/dsa.h |  3 +++
 net/dsa/slave.c   | 13 +++++++++++++
 2 files changed, 16 insertions(+)
include/net/dsa.h +3 -0
index 934958fda962..d9da32aacbf1 100644
@@ -873,6 +873,9 @@ struct dsa_switch_ops {
 				     struct ethtool_eth_mac_stats *mac_stats);
 	void	(*get_eth_ctrl_stats)(struct dsa_switch *ds, int port,
 				      struct ethtool_eth_ctrl_stats *ctrl_stats);
+	void	(*get_rmon_stats)(struct dsa_switch *ds, int port,
+				  struct ethtool_rmon_stats *rmon_stats,
+				  const struct ethtool_rmon_hist_range **ranges);
 	void	(*get_stats64)(struct dsa_switch *ds, int port,
 				   struct rtnl_link_stats64 *s);
 	void	(*self_test)(struct dsa_switch *ds, int port,
net/dsa/slave.c +13 -0
index 5ee0aced9410..27c8d28fd9d8 100644
@@ -1026,6 +1026,18 @@ dsa_slave_get_eth_ctrl_stats(struct net_device *dev,
 		ds->ops->get_eth_ctrl_stats(ds, dp->index, ctrl_stats);
 }
 
+static void
+dsa_slave_get_rmon_stats(struct net_device *dev,
+			 struct ethtool_rmon_stats *rmon_stats,
+			 const struct ethtool_rmon_hist_range **ranges)
+{
+	struct dsa_port *dp = dsa_slave_to_port(dev);
+	struct dsa_switch *ds = dp->ds;
+
+	if (ds->ops->get_rmon_stats)
+		ds->ops->get_rmon_stats(ds, dp->index, rmon_stats, ranges);
+}
+
 static void dsa_slave_net_selftest(struct net_device *ndev,
 				   struct ethtool_test *etest, u64 *buf)
 {
@@ -2105,6 +2117,7 @@ static const struct ethtool_ops dsa_slave_ethtool_ops = {
 	.get_eth_phy_stats	= dsa_slave_get_eth_phy_stats,
 	.get_eth_mac_stats	= dsa_slave_get_eth_mac_stats,
 	.get_eth_ctrl_stats	= dsa_slave_get_eth_ctrl_stats,
+	.get_rmon_stats		= dsa_slave_get_rmon_stats,
 	.set_wol		= dsa_slave_set_wol,
 	.get_wol		= dsa_slave_get_wol,
 	.set_eee		= dsa_slave_set_eee,
Signature · 1 line
2.36.0
author maintainer
#2 lore raw

PATCH v4 2/12 net: dsa: add Renesas RZ/N1 switch tag driver

In reply to Clément Léger

The switch that is present on the Renesas RZ/N1 SoC uses a specific VLAN value followed by 6 bytes which contains forwarding configuration.

---
 include/net/dsa.h             |   2 +
 include/uapi/linux/if_ether.h |   1 +
 net/dsa/Kconfig               |   7 +++
 net/dsa/Makefile              |   1 +
 net/dsa/tag_rzn1_a5psw.c      | 113 ++++++++++++++++++++++++++++++++++
 5 files changed, 124 insertions(+)
 create mode 100644 net/dsa/tag_rzn1_a5psw.c
include/net/dsa.h +2 -0
index d9da32aacbf1..9aaaa7deb102 100644
@@ -53,6 +53,7 @@ struct phylink_link_state;
 #define DSA_TAG_PROTO_SJA1110_VALUE		23
 #define DSA_TAG_PROTO_RTL8_4_VALUE		24
 #define DSA_TAG_PROTO_RTL8_4T_VALUE		25
+#define DSA_TAG_PROTO_RZN1_A5PSW_VALUE		26
 
 enum dsa_tag_protocol {
 	DSA_TAG_PROTO_NONE		= DSA_TAG_PROTO_NONE_VALUE,
@@ -81,6 +82,7 @@ enum dsa_tag_protocol {
 	DSA_TAG_PROTO_SJA1110		= DSA_TAG_PROTO_SJA1110_VALUE,
 	DSA_TAG_PROTO_RTL8_4		= DSA_TAG_PROTO_RTL8_4_VALUE,
 	DSA_TAG_PROTO_RTL8_4T		= DSA_TAG_PROTO_RTL8_4T_VALUE,
+	DSA_TAG_PROTO_RZN1_A5PSW	= DSA_TAG_PROTO_RZN1_A5PSW_VALUE,
 };
 
 struct dsa_switch;
include/uapi/linux/if_ether.h +1 -0
index 1d0bccc3fa54..d370165bc621 100644
@@ -116,6 +116,7 @@
 #define ETH_P_QINQ3	0x9300		/* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
 #define ETH_P_EDSA	0xDADA		/* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */
 #define ETH_P_DSA_8021Q	0xDADB		/* Fake VLAN Header for DSA [ NOT AN OFFICIALLY REGISTERED ID ] */
+#define ETH_P_DSA_A5PSW	0xE001		/* A5PSW Tag Value [ NOT AN OFFICIALLY REGISTERED ID ] */
 #define ETH_P_IFE	0xED3E		/* ForCES inter-FE LFB type */
 #define ETH_P_AF_IUCV   0xFBFB		/* IBM af_iucv [ NOT AN OFFICIALLY REGISTERED ID ] */
 
net/dsa/Kconfig +7 -0
index 8cb87b5067ee..63853fff4e2f 100644
@@ -132,6 +132,13 @@ config NET_DSA_TAG_RTL8_4
 	  Say Y or M if you want to enable support for tagging frames for Realtek
 	  switches with 8 byte protocol 4 tags, such as the Realtek RTL8365MB-VC.
 
+config NET_DSA_TAG_RZN1_A5PSW
+	tristate "Tag driver for Renesas RZ/N1 A5PSW switch"
+	help
+	  Say Y or M if you want to enable support for tagging frames for
+	  Renesas RZ/N1 embedded switch that uses an 8 byte tag located after
+	  destination MAC address.
+
 config NET_DSA_TAG_LAN9303
 	tristate "Tag driver for SMSC/Microchip LAN9303 family of switches"
 	help
net/dsa/Makefile +1 -0
index 9f75820e7c98..af28c24ead18 100644
@@ -17,6 +17,7 @@ obj-$(CONFIG_NET_DSA_TAG_OCELOT_8021Q) += tag_ocelot_8021q.o
 obj-$(CONFIG_NET_DSA_TAG_QCA) += tag_qca.o
 obj-$(CONFIG_NET_DSA_TAG_RTL4_A) += tag_rtl4_a.o
 obj-$(CONFIG_NET_DSA_TAG_RTL8_4) += tag_rtl8_4.o
+obj-$(CONFIG_NET_DSA_TAG_RZN1_A5PSW) += tag_rzn1_a5psw.o
 obj-$(CONFIG_NET_DSA_TAG_SJA1105) += tag_sja1105.o
 obj-$(CONFIG_NET_DSA_TAG_TRAILER) += tag_trailer.o
 obj-$(CONFIG_NET_DSA_TAG_XRS700X) += tag_xrs700x.o
net/dsa/tag_rzn1_a5psw.c new file +113 -0

113 lines not on this page · raw message

Signature · 1 line
2.36.0
author maintainer
#5 lore raw

PATCH v4 3/12 dt-bindings: net: pcs: add bindings for Renesas RZ/N1 MII converter

In reply to Clément Léger

This MII converter can be found on the RZ/N1 processor family. The MII converter ports are declared as subnodes which are then referenced by users of the PCS driver such as the switch.

---
 .../bindings/net/pcs/renesas,rzn1-miic.yaml   | 162 ++++++++++++++++++
 include/dt-bindings/net/pcs-rzn1-miic.h       |  33 ++++
 2 files changed, 195 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/net/pcs/renesas,rzn1-miic.yaml
 create mode 100644 include/dt-bindings/net/pcs-rzn1-miic.h
Documentation/devicetree/bindings/net/pcs/renesas,rzn1-miic.yaml new file +162 -0
new file mode 100644
index 000000000000..c3f5f772c885
@@ -0,0 +1,162 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/net/pcs/renesas,rzn1-miic.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Renesas RZ/N1 MII converter
+
+maintainers:
+  - Clément Léger <[email protected]>
+
+description: |
+  This MII converter is present on the Renesas RZ/N1 SoC family. It is
+  responsible to do MII passthrough or convert it to RMII/RGMII.
+
+properties:
+  '#address-cells':
+    const: 1
+
+  '#size-cells':
+    const: 0
+
+  compatible:
+    items:
+      - enum:
+          - renesas,r9a06g032-miic
+      - const: renesas,rzn1-miic
+
+  reg:
+    maxItems: 1
+
+  clocks:
+    items:
+      - description: MII reference clock
+      - description: RGMII reference clock
+      - description: RMII reference clock
+      - description: AHB clock used for the MII converter register interface
+
+  renesas,miic-switch-portin:
+    description: MII Switch PORTIN configuration. This value should use one of
+      the values defined in dt-bindings/net/pcs-rzn1-miic.h.
+    $ref: /schemas/types.yaml#/definitions/uint32
+    enum: [1, 2]
+
+  power-domains:
+    maxItems: 1
+
+patternProperties:
+  "^mii-conv@[0-9]+$":
+    type: object
+    description: MII converter port
+
+    properties:
+      reg:
+        description: MII Converter port number.
+        enum: [1, 2, 3, 4, 5]
+
+      renesas,miic-input:
+        description: Converter input port configuration. This value should use
+          one of the values defined in dt-bindings/net/pcs-rzn1-miic.h.
+        $ref: /schemas/types.yaml#/definitions/uint32
+
+    required:
+      - reg
+      - renesas,miic-input
+
+    additionalProperties: false
+
+    allOf:
+      - if:
+          properties:
+            reg:
+              const: 1
+        then:
+          properties:
+            renesas,miic-input:
+              enum: [0]
+      - if:
+          properties:
+            reg:
+              const: 2
+        then:
+          properties:
+            renesas,miic-input:
+              enum: [1, 11]
+      - if:
+          properties:
+            reg:
+              const: 3
+        then:
+          properties:
+            renesas,miic-input:
+              enum: [7, 10]
+      - if:
+          properties:
+            reg:
+              const: 4
+        then:
+          properties:
+            renesas,miic-input:
+              enum: [4, 6, 9, 13]
+      - if:
+          properties:
+            reg:
+              const: 5
+        then:
+          properties:
+            renesas,miic-input:
+              enum: [3, 5, 8, 12]
+
+required:
+  - '#address-cells'
+  - '#size-cells'
+  - compatible
+  - reg
+  - clocks
+  - power-domains
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/net/pcs-rzn1-miic.h>
+    #include <dt-bindings/clock/r9a06g032-sysctrl.h>
+
+    eth-miic@44030000 {
+      #address-cells = <1>;
+      #size-cells = <0>;
+      compatible = "renesas,r9a06g032-miic", "renesas,rzn1-miic";
+      reg = <0x44030000 0x10000>;
+      clocks = <&sysctrl R9A06G032_CLK_MII_REF>,
+              <&sysctrl R9A06G032_CLK_RGMII_REF>,
+              <&sysctrl R9A06G032_CLK_RMII_REF>,
+              <&sysctrl R9A06G032_HCLK_SWITCH_RG>;
+      renesas,miic-switch-portin = <MIIC_GMAC2_PORT>;
+      power-domains = <&sysctrl>;
+
+      mii_conv1: mii-conv@1 {
+        renesas,miic-input = <MIIC_GMAC1_PORT>;
+        reg = <1>;
+      };
+
+      mii_conv2: mii-conv@2 {
+        renesas,miic-input = <MIIC_SWITCH_PORTD>;
+        reg = <2>;
+      };
+
+      mii_conv3: mii-conv@3 {
+        renesas,miic-input = <MIIC_SWITCH_PORTC>;
+        reg = <3>;
+      };
+
+      mii_conv4: mii-conv@4 {
+        renesas,miic-input = <MIIC_SWITCH_PORTB>;
+        reg = <4>;
+      };
+
+      mii_conv5: mii-conv@5 {
+        renesas,miic-input = <MIIC_SWITCH_PORTA>;
+        reg = <5>;
+      };
+    };
include/dt-bindings/net/pcs-rzn1-miic.h new file +33 -0
new file mode 100644
index 000000000000..784782eaec9e
@@ -0,0 +1,33 @@
+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
+/*
+ * Copyright (C) 2022 Schneider-Electric
+ *
+ * Clément Léger <[email protected]>
+ */
+
+#ifndef _DT_BINDINGS_PCS_RZN1_MIIC
+#define _DT_BINDINGS_PCS_RZN1_MIIC
+
+/*
+ * Reefer to the datasheet [1] section 8.2.1, Internal Connection of Ethernet
+ * Ports to check the available combination
+ *
+ * [1] REN_r01uh0750ej0140-rzn1-introduction_MAT_20210228.pdf
+ */
+
+#define MIIC_GMAC1_PORT			0
+#define MIIC_GMAC2_PORT			1
+#define MIIC_RTOS_PORT			2
+#define MIIC_SERCOS_PORTA		3
+#define MIIC_SERCOS_PORTB		4
+#define MIIC_ETHERCAT_PORTA		5
+#define MIIC_ETHERCAT_PORTB		6
+#define MIIC_ETHERCAT_PORTC		7
+#define MIIC_SWITCH_PORTA		8
+#define MIIC_SWITCH_PORTB		9
+#define MIIC_SWITCH_PORTC		10
+#define MIIC_SWITCH_PORTD		11
+#define MIIC_HSR_PORTA			12
+#define MIIC_HSR_PORTB			13
+
+#endif
Signature · 1 line
2.36.0
author maintainer
#8 lore raw

PATCH v4 4/12 net: pcs: add Renesas MII converter driver

In reply to Clément Léger

Add a PCS driver for the MII converter that is present on the Renesas RZ/N1 SoC. This MII converter is reponsible for converting MII to RMII/RGMII or act as a MII pass-trough. Exposing it as a PCS allows to reuse it in both the switch driver and the stmmac driver. Currently, this driver only allows the PCS to be used by the dual Cortex-A7 subsystem since the register locking system is not used.

---
 drivers/net/pcs/Kconfig         |   8 +
 drivers/net/pcs/Makefile        |   1 +
 drivers/net/pcs/pcs-rzn1-miic.c | 505 ++++++++++++++++++++++++++++++++
 include/linux/pcs-rzn1-miic.h   |  18 ++
 4 files changed, 532 insertions(+)
 create mode 100644 drivers/net/pcs/pcs-rzn1-miic.c
 create mode 100644 include/linux/pcs-rzn1-miic.h
drivers/net/pcs/Kconfig +8 -0
index 22ba7b0b476d..6a500d30ca4c 100644
@@ -18,4 +18,12 @@ config PCS_LYNX
 	  This module provides helpers to phylink for managing the Lynx PCS
 	  which is part of the Layerscape and QorIQ Ethernet SERDES.
 
+config PCS_RZN1_MIIC
+	tristate "Renesas RZ/N1 MII converter"
+	depends on ARCH_RZN1 || COMPILE_TEST
+	help
+	  This module provides a driver for the MII converter that is available
+	  on RZ/N1 SoCs. This PCS converts MII to RMII/RGMII or can be set in
+	  pass-through mode for MII.
+
 endmenu
drivers/net/pcs/Makefile +1 -0
index 0603d469bd57..0ff5388fcdea 100644
@@ -5,3 +5,4 @@ pcs_xpcs-$(CONFIG_PCS_XPCS)	:= pcs-xpcs.o pcs-xpcs-nxp.o
 
 obj-$(CONFIG_PCS_XPCS)		+= pcs_xpcs.o
 obj-$(CONFIG_PCS_LYNX)		+= pcs-lynx.o
+obj-$(CONFIG_PCS_RZN1_MIIC)	+= pcs-rzn1-miic.o
drivers/net/pcs/pcs-rzn1-miic.c new file +505 -0

505 lines not on this page · raw message

include/linux/pcs-rzn1-miic.h new file +18 -0
new file mode 100644
index 000000000000..7a303af57e40
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2022 Schneider Electric
+ *
+ * Clément Léger <[email protected]>
+ */
+
+#ifndef __LINUX_PCS_MIIC_H
+#define __LINUX_PCS_MIIC_H
+
+struct phylink;
+struct device_node;
+
+struct phylink_pcs *miic_create(struct device_node *np);
+
+void miic_destroy(struct phylink_pcs *pcs);
+
+#endif /* __LINUX_PCS_MIIC_H */
Signature · 1 line
2.36.0
author maintainer
#11 lore raw

PATCH v4 5/12 dt-bindings: net: dsa: add bindings for Renesas RZ/N1 Advanced 5 port switch

In reply to Clément Léger

Add bindings for Renesas RZ/N1 Advanced 5 port switch. This switch is present on Renesas RZ/N1 SoC and was probably provided by MoreThanIP. This company does not exists anymore and has been bought by Synopsys. Since this IP can't be find anymore in the Synospsy portfolio, lets use Renesas as the vendor compatible for this IP.

---
 .../bindings/net/dsa/renesas,rzn1-a5psw.yaml  | 132 ++++++++++++++++++
 1 file changed, 132 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml
Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml new file +132 -0
new file mode 100644
index 000000000000..f0f6748e1f01
@@ -0,0 +1,132 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/net/dsa/renesas,rzn1-a5psw.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Renesas RZ/N1 Advanced 5 ports ethernet switch
+
+maintainers:
+  - Clément Léger <[email protected]>
+
+description: |
+  The advanced 5 ports switch is present on the Renesas RZ/N1 SoC family and
+  handles 4 ports + 1 CPU management port.
+
+allOf:
+  - $ref: dsa.yaml#
+
+properties:
+  compatible:
+    items:
+      - enum:
+          - renesas,r9a06g032-a5psw
+      - const: renesas,rzn1-a5psw
+
+  reg:
+    maxItems: 1
+
+  mdio:
+    $ref: /schemas/net/mdio.yaml#
+    unevaluatedProperties: false
+
+  clocks:
+    items:
+      - description: AHB clock used for the switch register interface
+      - description: Switch system clock
+
+  clock-names:
+    items:
+      - const: hclk
+      - const: clk
+
+patternProperties:
+  "^ethernet-ports$":
+    type: object
+    properties:
+      '#address-cells':
+        const: 1
+      '#size-cells':
+        const: 0
+
+    patternProperties:
+      "^(ethernet-)?port@[0-6]$":
+        type: object
+        description: Ethernet switch ports
+
+        properties:
+          pcs-handle:
+            description:
+              phandle pointing to a PCS sub-node compatible with
+              renesas,rzn1-miic.yaml#
+            $ref: /schemas/types.yaml#/definitions/phandle
+
+unevaluatedProperties: false
+
+required:
+  - compatible
+  - reg
+  - clocks
+  - clock-names
+
+examples:
+  - |
+    #include <dt-bindings/gpio/gpio.h>
+    #include <dt-bindings/clock/r9a06g032-sysctrl.h>
+
+    switch@44050000 {
+        compatible = "renesas,r9a06g032-a5psw", "renesas,rzn1-a5psw";
+        reg = <0x44050000 0x10000>;
+        clocks = <&sysctrl R9A06G032_HCLK_SWITCH>, <&sysctrl R9A06G032_CLK_SWITCH>;
+        clock-names = "hclk", "clk";
+        pinctrl-names = "default";
+        pinctrl-0 = <&pins_mdio1>, <&pins_eth3>, <&pins_eth4>;
+
+        dsa,member = <0 0>;
+
+        ethernet-ports {
+            #address-cells = <1>;
+            #size-cells = <0>;
+
+            port@0 {
+                reg = <0>;
+                label = "lan0";
+                phy-handle = <&switch0phy3>;
+                pcs-handle = <&mii_conv4>;
+            };
+
+            port@1 {
+                reg = <1>;
+                label = "lan1";
+                phy-handle = <&switch0phy1>;
+                pcs-handle = <&mii_conv3>;
+            };
+
+            port@4 {
+                reg = <4>;
+                ethernet = <&gmac1>;
+                label = "cpu";
+                fixed-link {
+                  speed = <1000>;
+                  full-duplex;
+                };
+            };
+        };
+
+        mdio {
+            #address-cells = <1>;
+            #size-cells = <0>;
+
+            reset-gpios = <&gpio0a 2 GPIO_ACTIVE_HIGH>;
+            reset-delay-us = <15>;
+            clock-frequency = <2500000>;
+
+            switch0phy1: ethernet-phy@1{
+                reg = <1>;
+            };
+
+            switch0phy3: ethernet-phy@3{
+                reg = <3>;
+            };
+        };
+    };
Signature · 1 line
2.36.0
author maintainer
#18 lore raw

PATCH v4 6/12 net: dsa: rzn1-a5psw: add Renesas RZ/N1 advanced 5 port switch driver

In reply to Clément Léger

Add Renesas RZ/N1 advanced 5 port switch driver. This switch handles 5 ports including 1 CPU management port. A MDIO bus is also exposed by this switch and allows to communicate with PHYs connected to the ports. Each switch port (except for the CPU management ports) is connected to the MII converter.

This driver includes basic bridging support, more support will be added later (vlan, etc).

---
 drivers/net/dsa/Kconfig      |   9 +
 drivers/net/dsa/Makefile     |   1 +
 drivers/net/dsa/rzn1_a5psw.c | 718 +++++++++++++++++++++++++++++++++++
 drivers/net/dsa/rzn1_a5psw.h | 198 ++++++++++
 4 files changed, 926 insertions(+)
 create mode 100644 drivers/net/dsa/rzn1_a5psw.c
 create mode 100644 drivers/net/dsa/rzn1_a5psw.h
drivers/net/dsa/Kconfig +9 -0
index 37a3dabdce31..0896c5fd9dec 100644
@@ -70,6 +70,15 @@ config NET_DSA_QCA8K
 
 source "drivers/net/dsa/realtek/Kconfig"
 
+config NET_DSA_RZN1_A5PSW
+	tristate "Renesas RZ/N1 A5PSW Ethernet switch support"
+	depends on NET_DSA
+	select NET_DSA_TAG_RZN1_A5PSW
+	select PCS_RZN1_MIIC
+	help
+	  This driver supports the A5PSW switch, which is embedded in Renesas
+	  RZ/N1 SoC.
+
 config NET_DSA_SMSC_LAN9303
 	tristate
 	depends on VLAN_8021Q || VLAN_8021Q=n
drivers/net/dsa/Makefile +1 -0
index e73838c12256..b32907afa702 100644
@@ -9,6 +9,7 @@ obj-$(CONFIG_NET_DSA_LANTIQ_GSWIP) += lantiq_gswip.o
 obj-$(CONFIG_NET_DSA_MT7530)	+= mt7530.o
 obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o
 obj-$(CONFIG_NET_DSA_QCA8K)	+= qca8k.o
+obj-$(CONFIG_NET_DSA_RZN1_A5PSW) += rzn1_a5psw.o
 obj-$(CONFIG_NET_DSA_SMSC_LAN9303) += lan9303-core.o
 obj-$(CONFIG_NET_DSA_SMSC_LAN9303_I2C) += lan9303_i2c.o
 obj-$(CONFIG_NET_DSA_SMSC_LAN9303_MDIO) += lan9303_mdio.o
drivers/net/dsa/rzn1_a5psw.c new file +718 -0

718 lines not on this page · raw message

drivers/net/dsa/rzn1_a5psw.h new file +198 -0

198 lines not on this page · raw message

Signature · 1 line
2.36.0
author maintainer
#27 lore raw

PATCH v4 8/12 net: dsa: rzn1-a5psw: add FDB support

In reply to Clément Léger

This commits add forwarding database support to the driver. It implements fdb_add(), fdb_del() and fdb_dump().

---
 drivers/net/dsa/rzn1_a5psw.c | 169 +++++++++++++++++++++++++++++++++++
 drivers/net/dsa/rzn1_a5psw.h |  17 ++++
 2 files changed, 186 insertions(+)
drivers/net/dsa/rzn1_a5psw.c +169 -0
index 46ba25672593..ef9d8ef961b5 100644
@@ -380,6 +380,172 @@ static void a5psw_port_fast_age(struct dsa_switch *ds, int port)
 	a5psw_port_fdb_flush(a5psw, port);
 }
 
+static int a5psw_lk_execute_lookup(struct a5psw *a5psw, union lk_data *lk_data,
+				   u16 *entry)
+{
+	u32 ctrl;
+	int ret;
+
+	a5psw_reg_writel(a5psw, A5PSW_LK_DATA_LO, lk_data->lo);
+	a5psw_reg_writel(a5psw, A5PSW_LK_DATA_HI, lk_data->hi);
+
+	ctrl = A5PSW_LK_ADDR_CTRL_LOOKUP;
+	ret = a5psw_lk_execute_ctrl(a5psw, &ctrl);
+	if (ret)
+		return ret;
+
+	*entry = ctrl & A5PSW_LK_ADDR_CTRL_ADDRESS;
+
+	return 0;
+}
+
+static int a5psw_port_fdb_add(struct dsa_switch *ds, int port,
+			      const unsigned char *addr, u16 vid,
+			      struct dsa_db db)
+{
+	struct a5psw *a5psw = ds->priv;
+	union lk_data lk_data = {0};
+	bool inc_learncount = false;
+	int ret = 0;
+	u16 entry;
+	u32 reg;
+
+	ether_addr_copy(lk_data.entry.mac, addr);
+	lk_data.entry.port_mask = BIT(port);
+
+	spin_lock(&a5psw->lk_lock);
+
+	/* Set the value to be written in the lookup table */
+	ret = a5psw_lk_execute_lookup(a5psw, &lk_data, &entry);
+	if (ret)
+		goto lk_unlock;
+
+	lk_data.hi = a5psw_reg_readl(a5psw, A5PSW_LK_DATA_HI);
+	if (!lk_data.entry.valid) {
+		inc_learncount = true;
+		/* port_mask set to 0x1f when entry is not valid, clear it */
+		lk_data.entry.port_mask = 0;
+		lk_data.entry.prio = 0;
+	}
+
+	lk_data.entry.port_mask |= BIT(port);
+	lk_data.entry.is_static = 1;
+	lk_data.entry.valid = 1;
+
+	a5psw_reg_writel(a5psw, A5PSW_LK_DATA_HI, lk_data.hi);
+
+	reg = A5PSW_LK_ADDR_CTRL_WRITE | entry;
+	ret = a5psw_lk_execute_ctrl(a5psw, &reg);
+	if (ret)
+		goto lk_unlock;
+
+	if (inc_learncount) {
+		reg = A5PSW_LK_LEARNCOUNT_MODE_INC;
+		a5psw_reg_writel(a5psw, A5PSW_LK_LEARNCOUNT, reg);
+	}
+
+lk_unlock:
+	spin_unlock(&a5psw->lk_lock);
+
+	return ret;
+}
+
+static int a5psw_port_fdb_del(struct dsa_switch *ds, int port,
+			      const unsigned char *addr, u16 vid,
+			      struct dsa_db db)
+{
+	struct a5psw *a5psw = ds->priv;
+	union lk_data lk_data = {0};
+	bool clear = false;
+	u16 entry;
+	u32 reg;
+	int ret;
+
+	ether_addr_copy(lk_data.entry.mac, addr);
+
+	spin_lock(&a5psw->lk_lock);
+
+	ret = a5psw_lk_execute_lookup(a5psw, &lk_data, &entry);
+	if (ret)
+		goto lk_unlock;
+
+	lk_data.hi = a5psw_reg_readl(a5psw, A5PSW_LK_DATA_HI);
+
+	/* Our hardware does not associate any VID to the FDB entries so this
+	 * means that if two entries were added for the same mac but for
+	 * different VID, then, on the deletion of the first one, we would also
+	 * delete the second one. Since there is unfortunately nothing we can do
+	 * about that, do not return an error...
+	 */
+	if (!lk_data.entry.valid)
+		goto lk_unlock;
+
+	lk_data.entry.port_mask &= ~BIT(port);
+	/* If there is no more port in the mask, clear the entry */
+	if (lk_data.entry.port_mask == 0)
+		clear = true;
+
+	a5psw_reg_writel(a5psw, A5PSW_LK_DATA_HI, lk_data.hi);
+
+	reg = entry;
+	if (clear)
+		reg |= A5PSW_LK_ADDR_CTRL_CLEAR;
+	else
+		reg |= A5PSW_LK_ADDR_CTRL_WRITE;
+
+	ret = a5psw_lk_execute_ctrl(a5psw, &reg);
+	if (ret)
+		goto lk_unlock;
+
+	/* Decrement LEARNCOUNT */
+	if (clear) {
+		reg = A5PSW_LK_LEARNCOUNT_MODE_DEC;
+		a5psw_reg_writel(a5psw, A5PSW_LK_LEARNCOUNT, reg);
+	}
+
+lk_unlock:
+	spin_unlock(&a5psw->lk_lock);
+
+	return ret;
+}
+
+static int a5psw_port_fdb_dump(struct dsa_switch *ds, int port,
+			       dsa_fdb_dump_cb_t *cb, void *data)
+{
+	struct a5psw *a5psw = ds->priv;
+	union lk_data lk_data;
+	int i = 0, ret;
+	u32 reg;
+
+	for (i = 0; i < A5PSW_TABLE_ENTRIES; i++) {
+		reg = A5PSW_LK_ADDR_CTRL_READ | A5PSW_LK_ADDR_CTRL_WAIT | i;
+		spin_lock(&a5psw->lk_lock);
+
+		ret = a5psw_lk_execute_ctrl(a5psw, &reg);
+		if (ret) {
+			spin_unlock(&a5psw->lk_lock);
+			return ret;
+		}
+
+		lk_data.hi = a5psw_reg_readl(a5psw, A5PSW_LK_DATA_HI);
+		/* If entry is not valid or does not contain the port, skip */
+		if (!lk_data.entry.valid ||
+		    !(lk_data.entry.port_mask & BIT(port))) {
+			spin_unlock(&a5psw->lk_lock);
+			continue;
+		}
+
+		lk_data.lo = a5psw_reg_readl(a5psw, A5PSW_LK_DATA_LO);
+		spin_unlock(&a5psw->lk_lock);
+
+		ret = cb(lk_data.entry.mac, 0, lk_data.entry.is_static, data);
+		if (ret)
+			return ret;
+	}
+
+	return 0;
+}
+
 static u64 a5psw_read_stat(struct a5psw *a5psw, u32 offset, int port)
 {
 	u32 reg_lo, reg_hi;
@@ -596,6 +762,9 @@ static const struct dsa_switch_ops a5psw_switch_ops = {
 	.port_bridge_leave = a5psw_port_bridge_leave,
 	.port_stp_state_set = a5psw_port_stp_state_set,
 	.port_fast_age = a5psw_port_fast_age,
+	.port_fdb_add = a5psw_port_fdb_add,
+	.port_fdb_del = a5psw_port_fdb_del,
+	.port_fdb_dump = a5psw_port_fdb_dump,
 };
 
 static int a5psw_mdio_wait_busy(struct a5psw *a5psw)
drivers/net/dsa/rzn1_a5psw.h +17 -0
index 649165d37fde..14fffff10621 100644
@@ -211,6 +211,23 @@
 #define A5PSW_CTRL_TIMEOUT		1000
 #define A5PSW_TABLE_ENTRIES		8192
 
+struct fdb_entry {
+	u8 mac[ETH_ALEN];
+	u16 valid:1;
+	u16 is_static:1;
+	u16 prio:3;
+	u16 port_mask:5;
+	u16 reserved:6;
+} __packed;
+
+union lk_data {
+	struct {
+		u32 lo;
+		u32 hi;
+	};
+	struct fdb_entry entry;
+};
+
 /**
  * struct a5psw - switch struct
  * @base: Base address of the switch
Signature · 1 line
2.36.0
author maintainer
#24 lore raw

PATCH v4 7/12 net: dsa: rzn1-a5psw: add statistics support

In reply to Clément Léger

Add statistics support to the rzn1-a5psw driver by implementing the following dsa_switch_ops callbacks:
- get_sset_count()
- get_strings()
- get_ethtool_stats()
- get_eth_mac_stats()
- get_eth_ctrl_stats()
- get_rmon_stats()

---
 drivers/net/dsa/rzn1_a5psw.c | 178 +++++++++++++++++++++++++++++++++++
 drivers/net/dsa/rzn1_a5psw.h |  46 ++++++++-
 2 files changed, 223 insertions(+), 1 deletion(-)
drivers/net/dsa/rzn1_a5psw.c +178 -0
index 1e2fac80f3e0..46ba25672593 100644
@@ -17,6 +17,61 @@
 
 #include "rzn1_a5psw.h"
 
+struct a5psw_stats {
+	u16 offset;
+	const char name[ETH_GSTRING_LEN];
+};
+
+#define STAT_DESC(_offset, _name) {.offset = _offset, .name = _name}
+
+static const struct a5psw_stats a5psw_stats[] = {
+	STAT_DESC(A5PSW_aFramesTransmittedOK, "aFrameTransmittedOK"),
+	STAT_DESC(A5PSW_aFramesReceivedOK, "aFrameReceivedOK"),
+	STAT_DESC(A5PSW_aFrameCheckSequenceErrors, "aFrameCheckSequenceErrors"),
+	STAT_DESC(A5PSW_aAlignmentErrors, "aAlignmentErrors"),
+	STAT_DESC(A5PSW_aOctetsTransmittedOK, "aOctetsTransmittedOK"),
+	STAT_DESC(A5PSW_aOctetsReceivedOK, "aOctetsReceivedOK"),
+	STAT_DESC(A5PSW_aTxPAUSEMACCtrlFrames, "aTxPAUSEMACCtrlFrames"),
+	STAT_DESC(A5PSW_aRxPAUSEMACCtrlFrames, "aRxPAUSEMACCtrlFrames"),
+	STAT_DESC(A5PSW_ifInErrors, "ifInErrors"),
+	STAT_DESC(A5PSW_ifOutErrors, "ifOutErrors"),
+	STAT_DESC(A5PSW_ifInUcastPkts, "ifInUcastPkts"),
+	STAT_DESC(A5PSW_ifInMulticastPkts, "ifInMulticastPkts"),
+	STAT_DESC(A5PSW_ifInBroadcastPkts, "ifInBroadcastPkts"),
+	STAT_DESC(A5PSW_ifOutDiscards, "ifOutDiscards"),
+	STAT_DESC(A5PSW_ifOutUcastPkts, "ifOutUcastPkts"),
+	STAT_DESC(A5PSW_ifOutMulticastPkts, "ifOutMulticastPkts"),
+	STAT_DESC(A5PSW_ifOutBroadcastPkts, "ifOutBroadcastPkts"),
+	STAT_DESC(A5PSW_etherStatsDropEvents, "etherStatsDropEvents"),
+	STAT_DESC(A5PSW_etherStatsOctets, "etherStatsOctets"),
+	STAT_DESC(A5PSW_etherStatsPkts, "etherStatsPkts"),
+	STAT_DESC(A5PSW_etherStatsUndersizePkts, "etherStatsUndersizePkts"),
+	STAT_DESC(A5PSW_etherStatsOversizePkts, "etherStatsOversizePkts"),
+	STAT_DESC(A5PSW_etherStatsPkts64Octets, "etherStatsPkts64Octets"),
+	STAT_DESC(A5PSW_etherStatsPkts65to127Octets,
+		  "etherStatsPkts65to127Octets"),
+	STAT_DESC(A5PSW_etherStatsPkts128to255Octets,
+		  "etherStatsPkts128to255Octets"),
+	STAT_DESC(A5PSW_etherStatsPkts256to511Octets,
+		  "etherStatsPkts256to511Octets"),
+	STAT_DESC(A5PSW_etherStatsPkts512to1023Octets,
+		  "etherStatsPkts512to1023Octets"),
+	STAT_DESC(A5PSW_etherStatsPkts1024to1518Octets,
+		  "etherStatsPkts1024to1518Octets"),
+	STAT_DESC(A5PSW_etherStatsPkts1519toXOctets,
+		  "etherStatsPkts1519toXOctets"),
+	STAT_DESC(A5PSW_etherStatsJabbers, "etherStatsJabbers"),
+	STAT_DESC(A5PSW_etherStatsFragments, "etherStatsFragments"),
+	STAT_DESC(A5PSW_VLANReceived, "VLANReceived"),
+	STAT_DESC(A5PSW_VLANTransmitted, "VLANTransmitted"),
+	STAT_DESC(A5PSW_aDeferred, "aDeferred"),
+	STAT_DESC(A5PSW_aMultipleCollisions, "aMultipleCollisions"),
+	STAT_DESC(A5PSW_aSingleCollisions, "aSingleCollisions"),
+	STAT_DESC(A5PSW_aLateCollisions, "aLateCollisions"),
+	STAT_DESC(A5PSW_aExcessiveCollisions, "aExcessiveCollisions"),
+	STAT_DESC(A5PSW_aCarrierSenseErrors, "aCarrierSenseErrors"),
+};
+
 static void a5psw_reg_writel(struct a5psw *a5psw, int offset, u32 value)
 {
 	writel(value, a5psw->base + offset);
@@ -325,6 +380,123 @@ static void a5psw_port_fast_age(struct dsa_switch *ds, int port)
 	a5psw_port_fdb_flush(a5psw, port);
 }
 
+static u64 a5psw_read_stat(struct a5psw *a5psw, u32 offset, int port)
+{
+	u32 reg_lo, reg_hi;
+
+	reg_lo = a5psw_reg_readl(a5psw, offset + A5PSW_PORT_OFFSET(port));
+	/* A5PSW_STATS_HIWORD is latched on stat read */
+	reg_hi = a5psw_reg_readl(a5psw, A5PSW_STATS_HIWORD);
+
+	return ((u64)reg_hi << 32) | reg_lo;
+}
+
+static void a5psw_get_strings(struct dsa_switch *ds, int port, u32 stringset,
+			      uint8_t *data)
+{
+	unsigned int u;
+
+	if (stringset != ETH_SS_STATS)
+		return;
+
+	for (u = 0; u < ARRAY_SIZE(a5psw_stats); u++) {
+		memcpy(data + u * ETH_GSTRING_LEN, a5psw_stats[u].name,
+		       ETH_GSTRING_LEN);
+	}
+}
+
+static void a5psw_get_ethtool_stats(struct dsa_switch *ds, int port,
+				    uint64_t *data)
+{
+	struct a5psw *a5psw = ds->priv;
+	unsigned int u;
+
+	for (u = 0; u < ARRAY_SIZE(a5psw_stats); u++)
+		data[u] = a5psw_read_stat(a5psw, a5psw_stats[u].offset, port);
+}
+
+static int a5psw_get_sset_count(struct dsa_switch *ds, int port, int sset)
+{
+	if (sset != ETH_SS_STATS)
+		return 0;
+
+	return ARRAY_SIZE(a5psw_stats);
+}
+
+static void a5psw_get_eth_mac_stats(struct dsa_switch *ds, int port,
+				    struct ethtool_eth_mac_stats *mac_stats)
+{
+	struct a5psw *a5psw = ds->priv;
+
+#define RD(name) a5psw_read_stat(a5psw, A5PSW_##name, port)
+	mac_stats->FramesTransmittedOK = RD(aFramesTransmittedOK);
+	mac_stats->SingleCollisionFrames = RD(aSingleCollisions);
+	mac_stats->MultipleCollisionFrames = RD(aMultipleCollisions);
+	mac_stats->FramesReceivedOK = RD(aFramesReceivedOK);
+	mac_stats->FrameCheckSequenceErrors = RD(aFrameCheckSequenceErrors);
+	mac_stats->AlignmentErrors = RD(aAlignmentErrors);
+	mac_stats->OctetsTransmittedOK = RD(aOctetsTransmittedOK);
+	mac_stats->FramesWithDeferredXmissions = RD(aDeferred);
+	mac_stats->LateCollisions = RD(aLateCollisions);
+	mac_stats->FramesAbortedDueToXSColls = RD(aExcessiveCollisions);
+	mac_stats->FramesLostDueToIntMACXmitError = RD(ifOutErrors);
+	mac_stats->CarrierSenseErrors = RD(aCarrierSenseErrors);
+	mac_stats->OctetsReceivedOK = RD(aOctetsReceivedOK);
+	mac_stats->FramesLostDueToIntMACRcvError = RD(ifInErrors);
+	mac_stats->MulticastFramesXmittedOK = RD(ifOutMulticastPkts);
+	mac_stats->BroadcastFramesXmittedOK = RD(ifOutBroadcastPkts);
+	mac_stats->FramesWithExcessiveDeferral = RD(aDeferred);
+	mac_stats->MulticastFramesReceivedOK = RD(ifInMulticastPkts);
+	mac_stats->BroadcastFramesReceivedOK = RD(ifInBroadcastPkts);
+#undef RD
+}
+
+static const struct ethtool_rmon_hist_range a5psw_rmon_ranges[] = {
+	{ 0, 64 },
+	{ 65, 127 },
+	{ 128, 255 },
+	{ 256, 511 },
+	{ 512, 1023 },
+	{ 1024, 1518 },
+	{ 1519, A5PSW_MAX_MTU },
+	{}
+};
+
+static void a5psw_get_rmon_stats(struct dsa_switch *ds, int port,
+				 struct ethtool_rmon_stats *rmon_stats,
+				 const struct ethtool_rmon_hist_range **ranges)
+{
+	struct a5psw *a5psw = ds->priv;
+
+#define RD(name) a5psw_read_stat(a5psw, A5PSW_##name, port)
+	rmon_stats->undersize_pkts = RD(etherStatsUndersizePkts);
+	rmon_stats->oversize_pkts = RD(etherStatsOversizePkts);
+	rmon_stats->fragments = RD(etherStatsFragments);
+	rmon_stats->jabbers = RD(etherStatsJabbers);
+	rmon_stats->hist[0] = RD(etherStatsPkts64Octets);
+	rmon_stats->hist[1] = RD(etherStatsPkts65to127Octets);
+	rmon_stats->hist[2] = RD(etherStatsPkts128to255Octets);
+	rmon_stats->hist[3] = RD(etherStatsPkts256to511Octets);
+	rmon_stats->hist[4] = RD(etherStatsPkts512to1023Octets);
+	rmon_stats->hist[5] = RD(etherStatsPkts1024to1518Octets);
+	rmon_stats->hist[6] = RD(etherStatsPkts1519toXOctets);
+#undef RD
+
+	*ranges = a5psw_rmon_ranges;
+}
+
+static void a5psw_get_eth_ctrl_stats(struct dsa_switch *ds, int port,
+				     struct ethtool_eth_ctrl_stats *ctrl_stats)
+{
+	struct a5psw *a5psw = ds->priv;
+	u64 stat;
+
+	stat = a5psw_read_stat(a5psw, A5PSW_aTxPAUSEMACCtrlFrames, port);
+	ctrl_stats->MACControlFramesTransmitted = stat;
+	stat = a5psw_read_stat(a5psw, A5PSW_aRxPAUSEMACCtrlFrames, port);
+	ctrl_stats->MACControlFramesReceived = stat;
+}
+
 static int a5psw_setup(struct dsa_switch *ds)
 {
 	struct a5psw *a5psw = ds->priv;
@@ -413,6 +585,12 @@ static const struct dsa_switch_ops a5psw_switch_ops = {
 	.phylink_mac_link_up = a5psw_phylink_mac_link_up,
 	.port_change_mtu = a5psw_port_change_mtu,
 	.port_max_mtu = a5psw_port_max_mtu,
+	.get_sset_count = a5psw_get_sset_count,
+	.get_strings = a5psw_get_strings,
+	.get_ethtool_stats = a5psw_get_ethtool_stats,
+	.get_eth_mac_stats = a5psw_get_eth_mac_stats,
+	.get_eth_ctrl_stats = a5psw_get_eth_ctrl_stats,
+	.get_rmon_stats = a5psw_get_rmon_stats,
 	.set_ageing_time = a5psw_set_ageing_time,
 	.port_bridge_join = a5psw_port_bridge_join,
 	.port_bridge_leave = a5psw_port_bridge_leave,
drivers/net/dsa/rzn1_a5psw.h +45 -1

58 lines not on this page · raw message

Signature · 1 line
2.36.0
author maintainer
#31 lore raw

PATCH v4 12/12 MAINTAINERS: add Renesas RZ/N1 switch related driver entry

In reply to Clément Léger

After contributing the drivers, volunteer for maintenance and add myself as the maintainer for Renesas RZ/N1 switch related drivers.

---
 MAINTAINERS | 11 +++++++++++
 1 file changed, 11 insertions(+)
MAINTAINERS +11 -0
index fa6896e8b2d8..9e1d2647f8bc 100644
@@ -16872,6 +16872,17 @@ S:	Supported
 F:	Documentation/devicetree/bindings/iio/adc/renesas,rzg2l-adc.yaml
 F:	drivers/iio/adc/rzg2l_adc.c
 
+RENESAS RZ/N1 A5PSW SWITCH DRIVER
+M:	Clément Léger <[email protected]>
+S:	Maintained
+F:	Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml
+F:	Documentation/devicetree/bindings/net/pcs/renesas,rzn1-miic.yaml
+F:	drivers/net/dsa/rzn1_a5psw*
+F:	drivers/net/pcs/pcs-rzn1-miic.c
+F:	include/dt-bindings/net/pcs-rzn1-miic.h
+F:	include/linux/pcs-rzn1-miic.h
+F:	net/dsa/tag_rzn1_a5psw.c
+
 RENESAS R-CAR GEN3 & RZ/N1 NAND CONTROLLER DRIVER
 M:	Miquel Raynal <[email protected]>
 L:	[email protected]
Signature · 1 line
2.36.0
author maintainer
#29 lore raw

PATCH v4 10/12 ARM: dts: r9a06g032: describe GMAC2

In reply to Clément Léger

RZ/N1 SoC includes two MAC named GMACx that are compatible with the "snps,dwmac" driver. GMAC1 is connected directly to the MII converter port 1. GMAC2 however can be used as the MAC for the switch CPU management port or can be muxed to be connected directly to the MII converter port 2. This commit add description for the GMAC2 which will be used by the switch description.

---
 arch/arm/boot/dts/r9a06g032.dtsi | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
arch/arm/boot/dts/r9a06g032.dtsi +17 -0
index ada5b1db0790..21246a48a66b 100644
@@ -201,6 +201,23 @@ nand_controller: nand-controller@40102000 {
 			status = "disabled";
 		};
 
+		gmac2: ethernet@44002000 {
+			compatible = "snps,dwmac";
+			reg = <0x44002000 0x2000>;
+			interrupt-parent = <&gic>;
+			interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-names = "macirq", "eth_wake_irq", "eth_lpi";
+			clock-names = "stmmaceth";
+			clocks = <&sysctrl R9A06G032_HCLK_GMAC1>;
+			snps,multicast-filter-bins = <256>;
+			snps,perfect-filter-entries = <128>;
+			tx-fifo-depth = <2048>;
+			rx-fifo-depth = <4096>;
+			status = "disabled";
+		};
+
 		eth_miic: eth-miic@44030000 {
 			compatible = "renesas,r9a06g032-miic", "renesas,rzn1-miic";
 			#address-cells = <1>;
Signature · 1 line
2.36.0
author maintainer
#30 lore raw

PATCH v4 11/12 ARM: dts: r9a06g032: describe switch

In reply to Clément Léger

Add description of the switch that is present on the RZ/N1 SoC.

---
 arch/arm/boot/dts/r9a06g032.dtsi | 9 +++++++++
 1 file changed, 9 insertions(+)
arch/arm/boot/dts/r9a06g032.dtsi +9 -0
index 21246a48a66b..ce13b29f5c10 100644
@@ -256,6 +256,15 @@ mii_conv5: mii-conv@5 {
 			};
 		};
 
+		switch: switch@44050000 {
+			compatible = "renesas,r9a06g032-a5psw", "renesas,rzn1-a5psw";
+			reg = <0x44050000 0x10000>;
+			clocks = <&sysctrl R9A06G032_HCLK_SWITCH>,
+				 <&sysctrl R9A06G032_CLK_SWITCH>;
+			clock-names = "hclk", "clk";
+			status = "disabled";
+		};
+
 		gic: interrupt-controller@44101000 {
 			compatible = "arm,gic-400", "arm,cortex-a7-gic";
 			interrupt-controller;
Signature · 1 line
2.36.0
author maintainer
#28 lore raw

PATCH v4 9/12 ARM: dts: r9a06g032: describe MII converter

In reply to Clément Léger

Add the MII converter node which describes the MII converter that is present on the RZ/N1 SoC.

---
 arch/arm/boot/dts/r9a06g032.dtsi | 38 ++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
arch/arm/boot/dts/r9a06g032.dtsi +38 -0
index 20286433d3c6..ada5b1db0790 100644
@@ -201,6 +201,44 @@ nand_controller: nand-controller@40102000 {
 			status = "disabled";
 		};
 
+		eth_miic: eth-miic@44030000 {
+			compatible = "renesas,r9a06g032-miic", "renesas,rzn1-miic";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x44030000 0x10000>;
+			clocks = <&sysctrl R9A06G032_CLK_MII_REF>,
+				 <&sysctrl R9A06G032_CLK_RGMII_REF>,
+				 <&sysctrl R9A06G032_CLK_RMII_REF>,
+				 <&sysctrl R9A06G032_HCLK_SWITCH_RG>;
+			power-domains = <&sysctrl>;
+			status = "disabled";
+
+			mii_conv1: mii-conv@1 {
+				reg = <1>;
+				status = "disabled";
+			};
+
+			mii_conv2: mii-conv@2 {
+				reg = <2>;
+				status = "disabled";
+			};
+
+			mii_conv3: mii-conv@3 {
+				reg = <3>;
+				status = "disabled";
+			};
+
+			mii_conv4: mii-conv@4 {
+				reg = <4>;
+				status = "disabled";
+			};
+
+			mii_conv5: mii-conv@5 {
+				reg = <5>;
+				status = "disabled";
+			};
+		};
+
 		gic: interrupt-controller@44101000 {
 			compatible = "arm,gic-400", "arm,cortex-a7-gic";
 			interrupt-controller;
Signature · 1 line
2.36.0
maintainer
#19 lore raw

Re: [PATCH net-next v4 06/12] net: dsa: rzn1-a5psw: add Renesas RZ/N1 advanced 5 port switch driver

In reply to Clément Léger
Quoted 14 lines · Clément Léger

Add Renesas RZ/N1 advanced 5 port switch driver. This switch handles 5 ports including 1 CPU management port. A MDIO bus is also exposed by this switch and allows to communicate with PHYs connected to the ports. Each switch port (except for the CPU management ports) is connected to the MII converter.

This driver includes basic bridging support, more support will be added later (vlan, etc).

---

drivers/net/dsa/rzn1_a5psw.c new file +1 -0
+static int a5psw_port_bridge_join(struct dsa_switch *ds, int port,

drivers/net/dsa/rzn1_a5psw.c line 271

Quoted 10 lines
drivers/net/dsa/rzn1_a5psw.c new file +10 -0
+				  struct dsa_bridge bridge,
+				  bool *tx_fwd_offload,
+				  struct netlink_ext_ack *extack)
+{
+	struct a5psw *a5psw = ds->priv;
+
+	/* We only support 1 bridge device */
+	if (a5psw->br_dev && bridge.dev != a5psw->br_dev) {
+		NL_SET_ERR_MSG_MOD(extack,
+				   "Forwarding offload supported for a single bridge");

I don't think I saw the dsa_slave_changeupper() patch that avoids overwriting the extack when dsa_port_bridge_join() returns -EOPNOTSUPP.

drivers/net/dsa/rzn1_a5psw.c line 279

Quoted 8 lines
drivers/net/dsa/rzn1_a5psw.c new file +8 -0
+		return -EOPNOTSUPP;
+	}
+
+	a5psw->br_dev = bridge.dev;
+	a5psw_flooding_set_resolution(a5psw, port, true);
+	a5psw_port_mgmtfwd_set(a5psw, port, false);
+
+	return 0;

By the way, does this switch pass tools/testing/selftests/drivers/net/dsa/no_forwarding.sh?

Quoted 49 lines
drivers/net/dsa/rzn1_a5psw.c new file +49 -0
+}
+
+static void a5psw_port_bridge_leave(struct dsa_switch *ds, int port,
+				    struct dsa_bridge bridge)
+{
+	struct a5psw *a5psw = ds->priv;
+
+	a5psw_flooding_set_resolution(a5psw, port, false);
+	a5psw_port_mgmtfwd_set(a5psw, port, true);
+
+	/* No more ports bridged */
+	if (a5psw->bridged_ports == BIT(A5PSW_CPU_PORT))
+		a5psw->br_dev = NULL;
+}
+
+static int a5psw_pcs_get(struct a5psw *a5psw)
+{
+	struct device_node *ports, *port, *pcs_node;
+	struct phylink_pcs *pcs;
+	int ret;
+	u32 reg;
+
+	ports = of_get_child_by_name(a5psw->dev->of_node, "ethernet-ports");
+	if (!ports)
+		ports = of_get_child_by_name(a5psw->dev->of_node, "ports");
+
+	if (!ports)
+		return -EINVAL;
+
+	for_each_available_child_of_node(ports, port) {
+		pcs_node = of_parse_phandle(port, "pcs-handle", 0);
+		if (!pcs_node)
+			continue;
+
+		if (of_property_read_u32(port, "reg", &reg)) {
+			ret = -EINVAL;
+			goto free_pcs;
+		}
+
+		if (reg >= ARRAY_SIZE(a5psw->pcs)) {
+			ret = -ENODEV;
+			goto free_pcs;
+		}
+
+		pcs = miic_create(pcs_node);
+		if (IS_ERR(pcs)) {
+			dev_err(a5psw->dev, "Failed to create PCS for port %d\n",
+				reg);
+			ret = PTR_ERR(pcs);

drivers/net/dsa/rzn1_a5psw.c

Quoted 10 lines
drivers/net/dsa/rzn1_a5psw.c new file +10 -0
+			goto free_pcs;
+		}
+
+		a5psw->pcs[reg] = pcs;
+	}
+	of_node_put(ports);
+
+	return 0;
+
+free_pcs:

The error path is missing of_node_put(ports).

Quoted 49 lines
drivers/net/dsa/rzn1_a5psw.c new file +49 -0
+	a5psw_pcs_free(a5psw);
+
+	return ret;
+}
+
+static int a5psw_probe(struct platform_device *pdev)
+{
+	struct device *dev = &pdev->dev;
+	struct device_node *mdio;
+	struct dsa_switch *ds;
+	struct a5psw *a5psw;
+	int ret;
+
+	a5psw = devm_kzalloc(dev, sizeof(*a5psw), GFP_KERNEL);
+	if (!a5psw)
+		return -ENOMEM;
+
+	a5psw->dev = dev;
+	spin_lock_init(&a5psw->lk_lock);
+	spin_lock_init(&a5psw->reg_lock);
+	a5psw->base = devm_platform_ioremap_resource(pdev, 0);
+	if (!a5psw->base)
+		return -EINVAL;
+
+	ret = a5psw_pcs_get(a5psw);
+	if (ret)
+		return ret;
+
+	a5psw->hclk = devm_clk_get(dev, "hclk");
+	if (IS_ERR(a5psw->hclk)) {
+		dev_err(dev, "failed get hclk clock\n");
+		ret = PTR_ERR(a5psw->hclk);
+		goto free_pcs;
+	}
+
+	a5psw->clk = devm_clk_get(dev, "clk");
+	if (IS_ERR(a5psw->clk)) {
+		dev_err(dev, "failed get clk_switch clock\n");
+		ret = PTR_ERR(a5psw->clk);
+		goto free_pcs;
+	}
+
+	ret = clk_prepare_enable(a5psw->clk);
+	if (ret)
+		goto free_pcs;
+
+	ret = clk_prepare_enable(a5psw->hclk);
+	if (ret)
+		goto clk_disable;

drivers/net/dsa/rzn1_a5psw.c line 646

Quoted 10 lines
drivers/net/dsa/rzn1_a5psw.c new file +10 -0
+
+	mdio = of_get_child_by_name(dev->of_node, "mdio");
+	if (of_device_is_available(mdio)) {
+		ret = a5psw_probe_mdio(a5psw, mdio);
+		if (ret) {
+			of_node_put(mdio);
+			dev_err(&pdev->dev, "Failed to register MDIO: %d\n",
+				ret);
+			goto hclk_disable;
+		}

Missing an of_node_put(mdio) if the device is available and ret == 0.

Quoted 21 lines
drivers/net/dsa/rzn1_a5psw.c new file +21 -0
+	} else {
+		of_node_put(mdio);
+	}
+
+	ds = &a5psw->ds;
+	ds->dev = &pdev->dev;
+	ds->num_ports = A5PSW_PORTS_NUM;
+	ds->ops = &a5psw_switch_ops;
+	ds->priv = a5psw;
+
+	ret = dsa_register_switch(ds);
+	if (ret) {
+		dev_err(&pdev->dev, "Failed to register DSA switch: %d\n", ret);
+		goto hclk_disable;
+	}
+
+	return 0;
+
+hclk_disable:
+	clk_disable_unprepare(a5psw->hclk);
+clk_disable:

drivers/net/dsa/rzn1_a5psw.c line 677

Quoted 10 lines
drivers/net/dsa/rzn1_a5psw.c new file +10 -0
+	clk_disable_unprepare(a5psw->clk);
+free_pcs:
+	a5psw_pcs_free(a5psw);
+
+	return ret;
+}
+
+static int a5psw_remove(struct platform_device *pdev)
+{
+	struct a5psw *a5psw = platform_get_drvdata(pdev);

I hate to repeat myself, but drivers in general can be removed after the device was shut down. If that happens, you will dereference a platform_get_drvdata() which is NULL, as set by yourself in a5psw_shutdown().

Quoted 20 lines
drivers/net/dsa/rzn1_a5psw.c new file +20 -0
+
+	dsa_unregister_switch(&a5psw->ds);
+	a5psw_pcs_free(a5psw);
+	clk_disable_unprepare(a5psw->hclk);
+	clk_disable_unprepare(a5psw->clk);
+
+	return 0;
+}
+
+static void a5psw_shutdown(struct platform_device *pdev)
+{
+	struct a5psw *a5psw = platform_get_drvdata(pdev);
+
+	if (!a5psw)
+		return;
+
+	dsa_switch_shutdown(&a5psw->ds);
+
+	platform_set_drvdata(pdev, NULL);
+}
#9 lore raw

Re: [PATCH net-next v4 04/12] net: pcs: add Renesas MII converter driver

In reply to Clément Léger

Hi,

drivers/net/pcs/pcs-rzn1-miic.c line 28

Quoted 12 lines · Clément Léger
drivers/net/pcs/pcs-rzn1-miic.c new file +12 -0
+#define MIIC_PRCMD			0x0
+#define MIIC_ESID_CODE			0x4
+
+#define MIIC_MODCTRL			0x20
+#define MIIC_MODCTRL_SW_MODE		GENMASK(4, 0)
+
+#define MIIC_CONVCTRL(port)		(0x100 + (port) * 4)
+
+#define MIIC_CONVCTRL_CONV_SPEED	GENMASK(1, 0)
+#define CONV_MODE_10MBPS		0
+#define CONV_MODE_100MBPS		BIT(0)
+#define CONV_MODE_1000MBPS		BIT(1)

I think this is an inappropriate use of the BIT() macro. BIT() should be used for single bit rather than for field values.

You seem to have a two bit field in bits 1 and 0 of a register, which has the values of:
0 - 10MBPS
1 - 100MBPS
2 - 1GBPS

I'd guess 3 is listed as "undefined", "do not use" or something similar?

drivers/net/pcs/pcs-rzn1-miic.c line 33

Quoted 5 lines
drivers/net/pcs/pcs-rzn1-miic.c new file +5 -0
+
+#define MIIC_CONVCTRL_CONV_MODE		GENMASK(3, 2)
+#define CONV_MODE_MII			0
+#define CONV_MODE_RMII			BIT(0)
+#define CONV_MODE_RGMII			BIT(1)

This looks similar. a 2-bit field in bits 3 and 2 taking values:
0 - MII
1 - RMII
2 - RGMII

...

Quoted 9 lines
drivers/net/pcs/pcs-rzn1-miic.c new file +9 -0
+static int miic_config(struct phylink_pcs *pcs, unsigned int mode,
+		       phy_interface_t interface,
+		       const unsigned long *advertising, bool permit)
+{
+	u32 speed = CONV_MODE_10MBPS, conv_mode = CONV_MODE_MII, val;
+	struct miic_port *miic_port = phylink_pcs_to_miic_port(pcs);
+	struct miic *miic = miic_port->miic;
+	int port = miic_port->port;
+

drivers/net/pcs/pcs-rzn1-miic.c line 204

Quoted 10 lines
drivers/net/pcs/pcs-rzn1-miic.c new file +10 -0
+	switch (interface) {
+	case PHY_INTERFACE_MODE_RMII:
+		conv_mode = CONV_MODE_RMII;
+		speed = CONV_MODE_100MBPS;
+		break;
+	case PHY_INTERFACE_MODE_RGMII:
+		conv_mode = CONV_MODE_RGMII;
+		speed = CONV_MODE_1000MBPS;
+		break;
+	case PHY_INTERFACE_MODE_MII:

I'm not sure why you need to initialise "speed" and "conv_mode" above when you could set them here.

Thanks.

Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!
author maintainer
#10 lore raw

Re: [PATCH net-next v4 04/12] net: pcs: add Renesas MII converter driver

Quoted 19 lines · Russell King (Oracle)

Hi,

drivers/net/pcs/pcs-rzn1-miic.c line 28

Quoted 12 lines · Clément Léger
drivers/net/pcs/pcs-rzn1-miic.c new file +12 -0
+#define MIIC_PRCMD			0x0
+#define MIIC_ESID_CODE			0x4
+
+#define MIIC_MODCTRL			0x20
+#define MIIC_MODCTRL_SW_MODE		GENMASK(4, 0)
+
+#define MIIC_CONVCTRL(port)		(0x100 + (port) * 4)
+
+#define MIIC_CONVCTRL_CONV_SPEED	GENMASK(1, 0)
+#define CONV_MODE_10MBPS		0
+#define CONV_MODE_100MBPS		BIT(0)
+#define CONV_MODE_1000MBPS		BIT(1)  

I think this is an inappropriate use of the BIT() macro. BIT() should be used for single bit rather than for field values.

Quoted 8 lines

You seem to have a two bit field in bits 1 and 0 of a register, which has the values of:
0 - 10MBPS
1 - 100MBPS
2 - 1GBPS

I'd guess 3 is listed as "undefined", "do not use" or something similar?

You are right, this is actually values rather than individual bits.

Quoted 30 lines

drivers/net/pcs/pcs-rzn1-miic.c line 33

Quoted 6 lines
drivers/net/pcs/pcs-rzn1-miic.c new file +5 -0
+
+#define MIIC_CONVCTRL_CONV_MODE		GENMASK(3, 2)
+#define CONV_MODE_MII			0
+#define CONV_MODE_RMII			BIT(0)
+#define CONV_MODE_RGMII			BIT(1)  

This looks similar. a 2-bit field in bits 3 and 2 taking values:
0 - MII
1 - RMII
2 - RGMII

...

Quoted 16 lines
drivers/net/pcs/pcs-rzn1-miic.c new file +3 -0
+static int miic_config(struct phylink_pcs *pcs, unsigned int mode,
+		       phy_interface_t interface,
+		       const unsigned long *advertising, bool

permit) +{

(quoted diff) +1 -0
+	u32 speed = CONV_MODE_10MBPS, conv_mode = CONV_MODE_MII,

val;

(quoted diff) +1 -0
+	struct miic_port *miic_port =

phylink_pcs_to_miic_port(pcs);

drivers/net/pcs/pcs-rzn1-miic.c new file +8 -0
+	struct miic *miic = miic_port->miic;
+	int port = miic_port->port;
+
+	switch (interface) {
+	case PHY_INTERFACE_MODE_RMII:
+		conv_mode = CONV_MODE_RMII;
+		speed = CONV_MODE_100MBPS;
+		break;
Quoted 8 lines

drivers/net/pcs/pcs-rzn1-miic.c line 204

Quoted 5 lines
drivers/net/pcs/pcs-rzn1-miic.c new file +5 -0
+	case PHY_INTERFACE_MODE_RGMII:
+		conv_mode = CONV_MODE_RGMII;
+		speed = CONV_MODE_1000MBPS;
+		break;
+	case PHY_INTERFACE_MODE_MII:  

I'm not sure why you need to initialise "speed" and "conv_mode" above when you could set them here.

It only seemed to me that 0 value was the default init one but I'll move that in that case.

Quoted 3 lines

Thanks.

author maintainer
#20 lore raw

Re: [PATCH net-next v4 06/12] net: dsa: rzn1-a5psw: add Renesas RZ/N1 advanced 5 port switch driver

In reply to Vladimir Oltean
Quoted 22 lines · Vladimir Oltean
Quoted 21 lines · Clément Léger

Add Renesas RZ/N1 advanced 5 port switch driver. This switch handles 5 ports including 1 CPU management port. A MDIO bus is also exposed by this switch and allows to communicate with PHYs connected to the ports. Each switch port (except for the CPU management ports) is connected to the MII converter.

This driver includes basic bridging support, more support will be added later (vlan, etc).

---

drivers/net/dsa/rzn1_a5psw.c new file +8 -0
+static int a5psw_port_bridge_join(struct dsa_switch *ds, int port,
+				  struct dsa_bridge bridge,
+				  bool *tx_fwd_offload,
+				  struct netlink_ext_ack *extack)
+{
+	struct a5psw *a5psw = ds->priv;
+
+	/* We only support 1 bridge device */
Quoted 8 lines
Quoted 4 lines
drivers/net/dsa/rzn1_a5psw.c new file +3 -0
+	if (a5psw->br_dev && bridge.dev != a5psw->br_dev) {
+		NL_SET_ERR_MSG_MOD(extack,
+				   "Forwarding offload supported

for a single bridge");

I don't think I saw the dsa_slave_changeupper() patch that avoids overwriting the extack when dsa_port_bridge_join() returns -EOPNOTSUPP.

Ok, I did not understood that dsa_slave_changeupper() *did* needed to be modified. I'll do that.

Quoted 12 lines

drivers/net/dsa/rzn1_a5psw.c line 279

Quoted 9 lines
drivers/net/dsa/rzn1_a5psw.c new file +8 -0
+		return -EOPNOTSUPP;
+	}
+
+	a5psw->br_dev = bridge.dev;
+	a5psw_flooding_set_resolution(a5psw, port, true);
+	a5psw_port_mgmtfwd_set(a5psw, port, false);
+
+	return 0;  

By the way, does this switch pass tools/testing/selftests/drivers/net/dsa/no_forwarding.sh?

Unfortunately, the board I have only has 2 ports availables and thus, I can only test one bridge or two separated ports at a time... I *should* receive a 4 ports one in a near future but that not yet sure.

Reviewed-by on v4 3/12
#6 lore raw

Re: [PATCH net-next v4 03/12] dt-bindings: net: pcs: add bindings for Renesas RZ/N1 MII converter

In reply to Clément Léger
Quoted 5 lines · Clément Léger

This MII converter can be found on the RZ/N1 processor family. The MII converter ports are declared as subnodes which are then referenced by users of the PCS driver such as the switch.

Signature · 1 line
Florian
#33 lore raw
In reply to Clément Léger
Quoted 14 lines · Clément Léger

The Renesas RZ/N1 SoCs features an ethernet subsystem which contains (most notably) a switch, two GMACs, and a MII converter [1]. This series adds support for the switch and the MII converter.

The MII converter present on this SoC has been represented as a PCS which sit between the MACs and the PHY. This PCS driver is probed from the device-tree since it requires to be configured. Indeed the MII converter also contains the registers that are handling the muxing of ports (Switch, MAC, HSR, RTOS, etc) internally to the SoC.

The switch driver is based on DSA and exposes 4 ports + 1 CPU management port. It include basic bridging support as well as FDB and statistics support.

Quoted 7 lines

This series needs commits 14f11da778ff6421 ("soc: renesas: rzn1: Select PM and PM_GENERIC_DOMAINS configs") and ed66b37f916ee23b ("ARM: dts:
r9a06g032: Add missing '#power-domain-cells'") which are available on the renesas-devel tree in order to enable generic power domain on RZ/N1.

Build testing this patch set gave me the following Kconfig warnings:

WARNING: unmet direct dependencies detected for PCS_RZN1_MIIC
Depends on [n]: NETDEVICES [=y] && (ARCH_RZN1 [=n] || COMPILE_TEST [=n]) Selected by [m]:
- NET_DSA_RZN1_A5PSW [=m] && NETDEVICES [=y] && NET_DSA [=m]

WARNING: unmet direct dependencies detected for PCS_RZN1_MIIC
Depends on [n]: NETDEVICES [=y] && (ARCH_RZN1 [=n] || COMPILE_TEST [=n]) Selected by [m]:
- NET_DSA_RZN1_A5PSW [=m] && NETDEVICES [=y] && NET_DSA [=m]

WARNING: unmet direct dependencies detected for PCS_RZN1_MIIC
Depends on [n]: NETDEVICES [=y] && (ARCH_RZN1 [=n] || COMPILE_TEST [=n]) Selected by [m]:
- NET_DSA_RZN1_A5PSW [=m] && NETDEVICES [=y] && NET_DSA [=m]

I started off with arm64's defconfig and then enabled all of the DSA drivers.

Signature · 1 line
Florian
#25 lore raw

Re: [PATCH net-next v4 07/12] net: dsa: rzn1-a5psw: add statistics support

In reply to Clément Léger
Quoted 20 lines · Clément Léger

Add statistics support to the rzn1-a5psw driver by implementing the following dsa_switch_ops callbacks:
- get_sset_count()
- get_strings()
- get_ethtool_stats()
- get_eth_mac_stats()
- get_eth_ctrl_stats()
- get_rmon_stats()

---
  drivers/net/dsa/rzn1_a5psw.c | 178 +++++++++++++++++++++++++++++++++++
  drivers/net/dsa/rzn1_a5psw.h |  46 ++++++++-
  2 files changed, 223 insertions(+), 1 deletion(-)
drivers/net/dsa/rzn1_a5psw.c +0 -0
index 1e2fac80f3e0..46ba25672593 100644

drivers/net/dsa/rzn1_a5psw.c line 25

Quoted 9 lines
drivers/net/dsa/rzn1_a5psw.c +6 -0
@@ -17,6 +17,61 @@
 
  #include "rzn1_a5psw.h"
 
+struct a5psw_stats {
+	u16 offset;
+	const char name[ETH_GSTRING_LEN];
+};
+
+#define STAT_DESC(_offset, _name) {.offset = _offset, .name = _name}

You can build a more compact representation as long as you keep the offset constant and the name in sync, the attached patch and leverage the __stringify() macro to construct the name field:

-#define STAT_DESC(_offset, _name) {.offset = _offset, .name = _name}
+#define STAT_DESC(_offset) { \

+       .offset = A5PSW_##_offset,      \
+       .name = __stringify(_offset),   \

+}

The attached patch does the conversion if you want to fixup into your commit.

Signature · 1 line
Florian
drivers/net/dsa/rzn1_a5psw.c +42 -46
index ef9d8ef961b5..4e52898187a5 100644
@@ -22,54 +22,50 @@ struct a5psw_stats {
 	const char name[ETH_GSTRING_LEN];
 };
 
-#define STAT_DESC(_offset, _name) {.offset = _offset, .name = _name}
+#define STAT_DESC(_offset) {	\
+	.offset = A5PSW_##_offset, 	\
+	.name = __stringify(_offset),	\
+}
 
 static const struct a5psw_stats a5psw_stats[] = {
-	STAT_DESC(A5PSW_aFramesTransmittedOK, "aFrameTransmittedOK"),
-	STAT_DESC(A5PSW_aFramesReceivedOK, "aFrameReceivedOK"),
-	STAT_DESC(A5PSW_aFrameCheckSequenceErrors, "aFrameCheckSequenceErrors"),
-	STAT_DESC(A5PSW_aAlignmentErrors, "aAlignmentErrors"),
-	STAT_DESC(A5PSW_aOctetsTransmittedOK, "aOctetsTransmittedOK"),
-	STAT_DESC(A5PSW_aOctetsReceivedOK, "aOctetsReceivedOK"),
-	STAT_DESC(A5PSW_aTxPAUSEMACCtrlFrames, "aTxPAUSEMACCtrlFrames"),
-	STAT_DESC(A5PSW_aRxPAUSEMACCtrlFrames, "aRxPAUSEMACCtrlFrames"),
-	STAT_DESC(A5PSW_ifInErrors, "ifInErrors"),
-	STAT_DESC(A5PSW_ifOutErrors, "ifOutErrors"),
-	STAT_DESC(A5PSW_ifInUcastPkts, "ifInUcastPkts"),
-	STAT_DESC(A5PSW_ifInMulticastPkts, "ifInMulticastPkts"),
-	STAT_DESC(A5PSW_ifInBroadcastPkts, "ifInBroadcastPkts"),
-	STAT_DESC(A5PSW_ifOutDiscards, "ifOutDiscards"),
-	STAT_DESC(A5PSW_ifOutUcastPkts, "ifOutUcastPkts"),
-	STAT_DESC(A5PSW_ifOutMulticastPkts, "ifOutMulticastPkts"),
-	STAT_DESC(A5PSW_ifOutBroadcastPkts, "ifOutBroadcastPkts"),
-	STAT_DESC(A5PSW_etherStatsDropEvents, "etherStatsDropEvents"),
-	STAT_DESC(A5PSW_etherStatsOctets, "etherStatsOctets"),
-	STAT_DESC(A5PSW_etherStatsPkts, "etherStatsPkts"),
-	STAT_DESC(A5PSW_etherStatsUndersizePkts, "etherStatsUndersizePkts"),
-	STAT_DESC(A5PSW_etherStatsOversizePkts, "etherStatsOversizePkts"),
-	STAT_DESC(A5PSW_etherStatsPkts64Octets, "etherStatsPkts64Octets"),
-	STAT_DESC(A5PSW_etherStatsPkts65to127Octets,
-		  "etherStatsPkts65to127Octets"),
-	STAT_DESC(A5PSW_etherStatsPkts128to255Octets,
-		  "etherStatsPkts128to255Octets"),
-	STAT_DESC(A5PSW_etherStatsPkts256to511Octets,
-		  "etherStatsPkts256to511Octets"),
-	STAT_DESC(A5PSW_etherStatsPkts512to1023Octets,
-		  "etherStatsPkts512to1023Octets"),
-	STAT_DESC(A5PSW_etherStatsPkts1024to1518Octets,
-		  "etherStatsPkts1024to1518Octets"),
-	STAT_DESC(A5PSW_etherStatsPkts1519toXOctets,
-		  "etherStatsPkts1519toXOctets"),
-	STAT_DESC(A5PSW_etherStatsJabbers, "etherStatsJabbers"),
-	STAT_DESC(A5PSW_etherStatsFragments, "etherStatsFragments"),
-	STAT_DESC(A5PSW_VLANReceived, "VLANReceived"),
-	STAT_DESC(A5PSW_VLANTransmitted, "VLANTransmitted"),
-	STAT_DESC(A5PSW_aDeferred, "aDeferred"),
-	STAT_DESC(A5PSW_aMultipleCollisions, "aMultipleCollisions"),
-	STAT_DESC(A5PSW_aSingleCollisions, "aSingleCollisions"),
-	STAT_DESC(A5PSW_aLateCollisions, "aLateCollisions"),
-	STAT_DESC(A5PSW_aExcessiveCollisions, "aExcessiveCollisions"),
-	STAT_DESC(A5PSW_aCarrierSenseErrors, "aCarrierSenseErrors"),
+	STAT_DESC(aFramesTransmittedOK),
+	STAT_DESC(aFramesReceivedOK),
+	STAT_DESC(aFrameCheckSequenceErrors),
+	STAT_DESC(aAlignmentErrors),
+	STAT_DESC(aOctetsTransmittedOK),
+	STAT_DESC(aOctetsReceivedOK),
+	STAT_DESC(aTxPAUSEMACCtrlFrames),
+	STAT_DESC(aRxPAUSEMACCtrlFrames),
+	STAT_DESC(ifInErrors),
+	STAT_DESC(ifOutErrors),
+	STAT_DESC(ifInUcastPkts),
+	STAT_DESC(ifInMulticastPkts),
+	STAT_DESC(ifInBroadcastPkts),
+	STAT_DESC(ifOutDiscards),
+	STAT_DESC(ifOutUcastPkts),
+	STAT_DESC(ifOutMulticastPkts),
+	STAT_DESC(ifOutBroadcastPkts),
+	STAT_DESC(etherStatsDropEvents),
+	STAT_DESC(etherStatsOctets),
+	STAT_DESC(etherStatsPkts),
+	STAT_DESC(etherStatsUndersizePkts),
+	STAT_DESC(etherStatsOversizePkts),
+	STAT_DESC(etherStatsPkts64Octets),
+	STAT_DESC(etherStatsPkts65to127Octets),
+	STAT_DESC(etherStatsPkts128to255Octets),
+	STAT_DESC(etherStatsPkts256to511Octets),
+	STAT_DESC(etherStatsPkts1024to1518Octets),
+	STAT_DESC(etherStatsPkts1519toXOctets),
+	STAT_DESC(etherStatsJabbers),
+	STAT_DESC(etherStatsFragments),
+	STAT_DESC(VLANReceived),
+	STAT_DESC(VLANTransmitted),
+	STAT_DESC(aDeferred),
+	STAT_DESC(aMultipleCollisions),
+	STAT_DESC(aSingleCollisions),
+	STAT_DESC(aLateCollisions),
+	STAT_DESC(aExcessiveCollisions),
+	STAT_DESC(aCarrierSenseErrors),
 };
 
 static void a5psw_reg_writel(struct a5psw *a5psw, int offset, u32 value)
author maintainer
#26 lore raw

Re: [PATCH net-next v4 07/12] net: dsa: rzn1-a5psw: add statistics support

Quoted 36 lines · Florian Fainelli
Quoted 20 lines · Clément Léger

Add statistics support to the rzn1-a5psw driver by implementing the following dsa_switch_ops callbacks:
- get_sset_count()
- get_strings()
- get_ethtool_stats()
- get_eth_mac_stats()
- get_eth_ctrl_stats()
- get_rmon_stats()

---
  drivers/net/dsa/rzn1_a5psw.c | 178

+++++++++++++++++++++++++++++++++++ drivers/net/dsa/rzn1_a5psw.h | 46 ++++++++- 2 files changed, 223 insertions(+), 1 deletion(-)

(quoted diff) +0 -0

b/drivers/net/dsa/rzn1_a5psw.c index 1e2fac80f3e0..46ba25672593 100644 --- a/drivers/net/dsa/rzn1_a5psw.c
+++ b/drivers/net/dsa/rzn1_a5psw.c

Review line 26

Quoted 10 lines
(quoted diff) +6 -0
@@ -17,6 +17,61 @@
 
  #include "rzn1_a5psw.h"
 
+struct a5psw_stats {
+	u16 offset;
+	const char name[ETH_GSTRING_LEN];
+};
+
+#define STAT_DESC(_offset, _name) {.offset = _offset, .name =
 _name}  

You can build a more compact representation as long as you keep the offset constant and the name in sync, the attached patch and leverage the __stringify() macro to construct the name field:

drivers/net/dsa/rzn1_a5psw.c struct a5psw_stats { · line 28

Quoted 5 lines
drivers/net/dsa/rzn1_a5psw.c +4 -1
-#define STAT_DESC(_offset, _name) {.offset = _offset, .name = _name}
+#define STAT_DESC(_offset) {   \
+       .offset = A5PSW_##_offset,      \
+       .name = __stringify(_offset),   \
+}

Indeed, nice catch ! Thanks for the patch !

Quoted 3 lines

The attached patch does the conversion if you want to fixup into your commit.

author maintainer
#34 lore raw
In reply to Florian Fainelli
Quoted 36 lines · Florian Fainelli
Quoted 14 lines · Clément Léger

The Renesas RZ/N1 SoCs features an ethernet subsystem which contains (most notably) a switch, two GMACs, and a MII converter [1]. This series adds support for the switch and the MII converter.

The MII converter present on this SoC has been represented as a PCS which sit between the MACs and the PHY. This PCS driver is probed from the device-tree since it requires to be configured. Indeed the MII converter also contains the registers that are handling the muxing of ports (Switch, MAC, HSR, RTOS, etc) internally to the SoC.

The switch driver is based on DSA and exposes 4 ports + 1 CPU management port. It include basic bridging support as well as FDB and statistics support.

Quoted 9 lines

This series needs commits 14f11da778ff6421 ("soc: renesas: rzn1:
Select PM and PM_GENERIC_DOMAINS configs") and ed66b37f916ee23b ("ARM: dts: r9a06g032: Add missing '#power-domain-cells'") which are available on the renesas-devel tree in order to enable generic power domain on RZ/N1.

Link: [1]
https://www.renesas.com/us/en/document/mah/rzn1d-group-rzn1s-group-rzn1l-group-users-manual-r-engine-and-ethernet-peripherals

Build testing this patch set gave me the following Kconfig warnings:

WARNING: unmet direct dependencies detected for PCS_RZN1_MIIC
Depends on [n]: NETDEVICES [=y] && (ARCH_RZN1 [=n] || COMPILE_TEST
[=n]) Selected by [m]:
- NET_DSA_RZN1_A5PSW [=m] && NETDEVICES [=y] && NET_DSA [=m]

WARNING: unmet direct dependencies detected for PCS_RZN1_MIIC
Depends on [n]: NETDEVICES [=y] && (ARCH_RZN1 [=n] || COMPILE_TEST
[=n]) Selected by [m]:
- NET_DSA_RZN1_A5PSW [=m] && NETDEVICES [=y] && NET_DSA [=m]

Quoted 7 lines

WARNING: unmet direct dependencies detected for PCS_RZN1_MIIC
Depends on [n]: NETDEVICES [=y] && (ARCH_RZN1 [=n] || COMPILE_TEST
[=n]) Selected by [m]:
- NET_DSA_RZN1_A5PSW [=m] && NETDEVICES [=y] && NET_DSA [=m]

I started off with arm64's defconfig and then enabled all of the DSA drivers.

Ok, I'll fix that.

Clément

maintainer
#21 lore raw

Re: [PATCH net-next v4 06/12] net: dsa: rzn1-a5psw: add Renesas RZ/N1 advanced 5 port switch driver

In reply to Clément Léger
Quoted 6 lines · Clément Léger
Quoted 2 lines

By the way, does this switch pass tools/testing/selftests/drivers/net/dsa/no_forwarding.sh?

Unfortunately, the board I have only has 2 ports availables and thus, I can only test one bridge or two separated ports at a time... I *should* receive a 4 ports one in a near future but that not yet sure.

2 switch ports or 2 ports in total? h1 and h2 can be non-switch ports (should work with USB-Ethernet adapters etc).

maintainer Reviewed-by on v4 3/12
#7 lore raw

Re: [PATCH net-next v4 03/12] dt-bindings: net: pcs: add bindings for Renesas RZ/N1 MII converter

In reply to Clément Léger
Quoted 57 lines · Clément Léger

This MII converter can be found on the RZ/N1 processor family. The MII converter ports are declared as subnodes which are then referenced by users of the PCS driver such as the switch.

---
 .../bindings/net/pcs/renesas,rzn1-miic.yaml   | 162 ++++++++++++++++++
 include/dt-bindings/net/pcs-rzn1-miic.h       |  33 ++++
 2 files changed, 195 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/net/pcs/renesas,rzn1-miic.yaml
 create mode 100644 include/dt-bindings/net/pcs-rzn1-miic.h
Documentation/devicetree/bindings/net/pcs/renesas,rzn1-miic.yaml new file +39 -0
new file mode 100644
index 000000000000..c3f5f772c885
@@ -0,0 +1,162 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/net/pcs/renesas,rzn1-miic.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Renesas RZ/N1 MII converter
+
+maintainers:
+  - Clément Léger <[email protected]>
+
+description: |
+  This MII converter is present on the Renesas RZ/N1 SoC family. It is
+  responsible to do MII passthrough or convert it to RMII/RGMII.
+
+properties:
+  '#address-cells':
+    const: 1
+
+  '#size-cells':
+    const: 0
+
+  compatible:
+    items:
+      - enum:
+          - renesas,r9a06g032-miic
+      - const: renesas,rzn1-miic
+
+  reg:
+    maxItems: 1
+
+  clocks:
+    items:
+      - description: MII reference clock
+      - description: RGMII reference clock
+      - description: RMII reference clock
+      - description: AHB clock used for the MII converter register interface
+
+  renesas,miic-switch-portin:

Documentation/devicetree/bindings/net/pcs/renesas,rzn1-miic.yaml line 49

Quoted 10 lines
Documentation/devicetree/bindings/net/pcs/renesas,rzn1-miic.yaml new file +10 -0
+    description: MII Switch PORTIN configuration. This value should use one of
+      the values defined in dt-bindings/net/pcs-rzn1-miic.h.
+    $ref: /schemas/types.yaml#/definitions/uint32
+    enum: [1, 2]
+
+  power-domains:
+    maxItems: 1
+
+patternProperties:
+  "^mii-conv@[0-9]+$":

^mii-conv@[0-5]$

Quoted 18 lines
Documentation/devicetree/bindings/net/pcs/renesas,rzn1-miic.yaml new file +18 -0
+    type: object
+    description: MII converter port
+
+    properties:
+      reg:
+        description: MII Converter port number.
+        enum: [1, 2, 3, 4, 5]
+
+      renesas,miic-input:
+        description: Converter input port configuration. This value should use
+          one of the values defined in dt-bindings/net/pcs-rzn1-miic.h.
+        $ref: /schemas/types.yaml#/definitions/uint32
+
+    required:
+      - reg
+      - renesas,miic-input
+
+    additionalProperties: false

Documentation/devicetree/bindings/net/pcs/renesas,rzn1-miic.yaml line 77

Quoted 10 lines
Documentation/devicetree/bindings/net/pcs/renesas,rzn1-miic.yaml new file +10 -0
+
+    allOf:
+      - if:
+          properties:
+            reg:
+              const: 1
+        then:
+          properties:
+            renesas,miic-input:
+              enum: [0]

const: 0

With those fixes,

maintainer Reviewed-by on v4 5/12
#12 lore raw

Re: [PATCH net-next v4 05/12] dt-bindings: net: dsa: add bindings for Renesas RZ/N1 Advanced 5 port switch

In reply to Clément Léger
Quoted 52 lines · Clément Léger

Add bindings for Renesas RZ/N1 Advanced 5 port switch. This switch is present on Renesas RZ/N1 SoC and was probably provided by MoreThanIP. This company does not exists anymore and has been bought by Synopsys. Since this IP can't be find anymore in the Synospsy portfolio, lets use Renesas as the vendor compatible for this IP.

---
 .../bindings/net/dsa/renesas,rzn1-a5psw.yaml  | 132 ++++++++++++++++++
 1 file changed, 132 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml
Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml new file +34 -0
new file mode 100644
index 000000000000..f0f6748e1f01
@@ -0,0 +1,132 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/net/dsa/renesas,rzn1-a5psw.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Renesas RZ/N1 Advanced 5 ports ethernet switch
+
+maintainers:
+  - Clément Léger <[email protected]>
+
+description: |
+  The advanced 5 ports switch is present on the Renesas RZ/N1 SoC family and
+  handles 4 ports + 1 CPU management port.
+
+allOf:
+  - $ref: dsa.yaml#
+
+properties:
+  compatible:
+    items:
+      - enum:
+          - renesas,r9a06g032-a5psw
+      - const: renesas,rzn1-a5psw
+
+  reg:
+    maxItems: 1
+
+  mdio:
+    $ref: /schemas/net/mdio.yaml#
+    unevaluatedProperties: false
+
+  clocks:
+    items:

Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml line 44

Quoted 10 lines
Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml new file +10 -0
+      - description: AHB clock used for the switch register interface
+      - description: Switch system clock
+
+  clock-names:
+    items:
+      - const: hclk
+      - const: clk
+
+patternProperties:
+  "^ethernet-ports$":

Move to 'properties', not a pattern.

With that,

maintainer
#13 lore raw

Re: [PATCH net-next v4 05/12] dt-bindings: net: dsa: add bindings for Renesas RZ/N1 Advanced 5 port switch

Quoted 8 lines · Rob Herring

Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml line 44

Quoted 2 lines
Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml new file +2 -0
+patternProperties:
+  "^ethernet-ports$":

Move to 'properties', not a pattern.

With that,

Even if it should have been "^(ethernet-)?ports$"?

author maintainer
#22 lore raw

Re: [PATCH net-next v4 06/12] net: dsa: rzn1-a5psw: add Renesas RZ/N1 advanced 5 port switch driver

In reply to Vladimir Oltean
Quoted 11 lines · Vladimir Oltean
Quoted 7 lines · Clément Léger
Quoted 2 lines

By the way, does this switch pass tools/testing/selftests/drivers/net/dsa/no_forwarding.sh?

Unfortunately, the board I have only has 2 ports availables and thus, I can only test one bridge or two separated ports at a time... I *should* receive a 4 ports one in a near future but that not yet sure.

2 switch ports or 2 ports in total? h1 and h2 can be non-switch ports (should work with USB-Ethernet adapters etc).

2 switchs ports only but I now have a board with 2 switch ports + 2 non-switch ports so I'll try that on that new board.

Clément

maintainer
#14 lore raw

Re: [PATCH net-next v4 05/12] dt-bindings: net: dsa: add bindings for Renesas RZ/N1 Advanced 5 port switch

In reply to Vladimir Oltean
Quoted 11 lines · Vladimir Oltean
Quoted 8 lines · Rob Herring

Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml line 44

Quoted 2 lines
Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml new file +2 -0
+patternProperties:
+  "^ethernet-ports$":

Move to 'properties', not a pattern.

With that,

Even if it should have been "^(ethernet-)?ports$"?

Why? Allowing 'ports' is for existing users. New ones don't need the variability and should use just 'ethernet-ports'.

Rob

maintainer
#15 lore raw

Re: [PATCH net-next v4 05/12] dt-bindings: net: dsa: add bindings for Renesas RZ/N1 Advanced 5 port switch

Quoted 9 lines · Rob Herring
Quoted 8 lines · Vladimir Oltean
Quoted 7 lines · Rob Herring

Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml line 44

Quoted 2 lines
Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml new file +2 -0
+patternProperties:
+  "^ethernet-ports$":

Move to 'properties', not a pattern.

With that,

Quoted 8 lines
Quoted 3 lines
Quoted 1 line

Even if it should have been "^(ethernet-)?ports$"?

Why? Allowing 'ports' is for existing users. New ones don't need the variability and should use just 'ethernet-ports'.

Rob

Yeah, ok, somehow the memo that new DSA drivers shouldn't support "ports" didn't reach me. They invariably will though, since the DSA framework is the main parser of the property, and that is shared by both old and new drivers.

author maintainer
#16 lore raw

Re: [PATCH net-next v4 05/12] dt-bindings: net: dsa: add bindings for Renesas RZ/N1 Advanced 5 port switch

Quoted 17 lines · Vladimir Oltean
Quoted 16 lines · Rob Herring
Quoted 11 lines · Vladimir Oltean
Quoted 8 lines · Rob Herring

Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml line 44

Quoted 2 lines
Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml new file +2 -0
+patternProperties:
+  "^ethernet-ports$":  

Move to 'properties', not a pattern.

With that,

Even if it should have been "^(ethernet-)?ports$"?

Why? Allowing 'ports' is for existing users. New ones don't need the variability and should use just 'ethernet-ports'.

Quoted 6 lines
Quoted 1 line

Rob

Yeah, ok, somehow the memo that new DSA drivers shouldn't support "ports" didn't reach me. They invariably will though, since the DSA framework is the main parser of the property, and that is shared by both old and new drivers.

Should also the subnodes of "ethernet-ports" use the "ethernet-port@[0-9]*" naming ? Or keeping the existing pattern is ok (ie "^(ethernet-)?port@[0-4]$") ?

Thanks,

Signature · 3 lines
Clément Léger,
Embedded Linux and Kernel engineer at Bootlin
https://bootlin.com
maintainer
#17 lore raw

Re: [PATCH net-next v4 05/12] dt-bindings: net: dsa: add bindings for Renesas RZ/N1 Advanced 5 port switch

Quoted 22 lines · Clément Léger
Quoted 19 lines · Vladimir Oltean
Quoted 17 lines · Rob Herring
Quoted 11 lines · Vladimir Oltean
Quoted 8 lines · Rob Herring

Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml line 44

Quoted 2 lines
Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml new file +2 -0
+patternProperties:
+  "^ethernet-ports$":  

Move to 'properties', not a pattern.

With that,

Even if it should have been "^(ethernet-)?ports$"?

Why? Allowing 'ports' is for existing users. New ones don't need the variability and should use just 'ethernet-ports'.

Rob

Quoted 8 lines
Quoted 4 lines

Yeah, ok, somehow the memo that new DSA drivers shouldn't support "ports" didn't reach me. They invariably will though, since the DSA framework is the main parser of the property, and that is shared by both old and new drivers.

Should also the subnodes of "ethernet-ports" use the "ethernet-port@[0-9]*" naming ? Or keeping the existing pattern is ok (ie "^(ethernet-)?port@[0-4]$") ?

I prefer the former, but care less. The whole reason for 'ethernet-' prefix is to make this distinct from the graph binding that uses ports and port.

Rob

author maintainer
#23 lore raw

Re: [PATCH net-next v4 06/12] net: dsa: rzn1-a5psw: add Renesas RZ/N1 advanced 5 port switch driver

In reply to Vladimir Oltean
Quoted 10 lines · Vladimir Oltean
Quoted 6 lines · Clément Léger
Quoted 2 lines

By the way, does this switch pass tools/testing/selftests/drivers/net/dsa/no_forwarding.sh?

Unfortunately, the board I have only has 2 ports availables and thus, I can only test one bridge or two separated ports at a time... I *should* receive a 4 ports one in a near future but that not yet sure.

2 switch ports or 2 ports in total? h1 and h2 can be non-switch ports (should work with USB-Ethernet adapters etc).

Ok, I finally got the tests running. They seems to work for the standalone variant.

TEST: Standalone switch ports: Unicast non-IP untagged [ OK ]
TEST: Standalone switch ports: Multicast non-IP untagged [ OK ]
TEST: Standalone switch ports: Broadcast non-IP untagged [ OK ]
TEST: Standalone switch ports: Unicast IPv4 untagged [ OK ]
TEST: Standalone switch ports: Multicast IPv4 untagged [ OK ]
TEST: Standalone switch ports: Unicast IPv6 untagged [ OK ]
TEST: Standalone switch ports: Multicast IPv6 untagged [ OK ]

I disabled tests two_bridges and one_bridge_two_pvids since the switch driver does only support 1 bridge and do not have vlan support yet.

I also ran ./test_bridge_fdb_stress.sh which did reveal some sleep in spin_lock() issue due to poll_io_timeout() being used. I switch the FDB lock to use a mutex instead of a spinlock.

Signature · 3 lines
Clément Léger,
Embedded Linux and Kernel engineer at Bootlin
https://bootlin.com