add support for Renesas RZ/N1 ethernet subsystem devices
Subsystems (6)
Clément Léger
maintainerv7 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.
-----
Resent V7 due to messed up cover letter.
Changes in V7:
- Commits:
- Add Rob Herring Acked-by for commit "dt-bindings: net: snps,dwmac: add "power-domains" property"
- Rebased on net-next/master
- MAINTAINERS:
- Add renesas-soc and netdev mailing lists
Changes in V6:
- Commits:
- Add commit which enable ethernet switch on RZ/N1D-DB board
- Add commit which adds "renesas,rzn1-gmac" compatible t "snps,dwmac" bindings
- Fix mutex change being done in FDB feature commit
- Add commit which adds"power-domains" to "snps,dwmac" bindings
- Bindings and DT
- Add clock-names to MII converter and make it required
- Added Reviewed-by Geert on MII converter binding
- Added "power-domains" to switch bindings and to switch description
- Use new compatible "renesas,rzn1-gmac" for GMAC2
- Describe all switch ports in ethernet switch node
- Add phy-mode = "internal" to cpu port
- PCS:
- use phy_interface_mode_is_rgmii() instead of open coded check
- Add device_link_add() call in miic_create()
- Switch:
- Fix missing of_node_put(port) in case of loop break.
- Fix comment alignment for statistics defines
- Move lk_lock mutex locking outside of the fdb_dump loop
Changes in V5:
- MAINTAINERS:
- Add Florian Fainelli Reviewed-by
- Switch:
- Switch Lookup table lock to a mutex instead of a spinlock
- Only handle "ethernet-ports" property for switch ports
- Handle RGMII_ID/RXID/TXID
- Add check for pdata to be non null in remove
- Add missing of_node_put() for mdio and ports
- Applied Florian Fainelli patch which makes stats description shorter
- Add Kconfig dependency on ARCH_RZN1 to avoid Kconfig "unmet direct dependency"
- PCS:
- Handle RGMII_ID/RXID/TXID
- Use value instead of BIT() for speed/mode
- Tag driver:
- Add Florian Fainelli Reviewed-by
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 bridges 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 (16):
net: dsa: allow port_bridge_join() to override extack message
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
dt-bindings: net: snps,dwmac: add "power-domains" property
dt-bindings: net: snps,dwmac: add "renesas,rzn1" compatible
ARM: dts: r9a06g032: describe MII converter
ARM: dts: r9a06g032: describe GMAC2
ARM: dts: r9a06g032: describe switch
ARM: dts: r9a06g032-rzn1d400-db: add switch description
MAINTAINERS: add Renesas RZ/N1 switch related driver entry
.../bindings/net/dsa/renesas,rzn1-a5psw.yaml | 134 +++ .../bindings/net/pcs/renesas,rzn1-miic.yaml | 171 +++ .../devicetree/bindings/net/snps,dwmac.yaml | 5 + MAINTAINERS | 13 + arch/arm/boot/dts/r9a06g032-rzn1d400-db.dts | 117 ++ arch/arm/boot/dts/r9a06g032.dtsi | 108 ++ drivers/net/dsa/Kconfig | 9 + drivers/net/dsa/Makefile | 1 + drivers/net/dsa/rzn1_a5psw.c | 1062 +++++++++++++++++ drivers/net/dsa/rzn1_a5psw.h | 259 ++++ drivers/net/pcs/Kconfig | 8 + drivers/net/pcs/Makefile | 1 + drivers/net/pcs/pcs-rzn1-miic.c | 519 ++++++++ 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 | 18 +- net/dsa/tag_rzn1_a5psw.c | 113 ++ 21 files changed, 2601 insertions(+), 2 deletions(-) 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.1
Clément Léger
maintainerPATCH RESEND v7 1/16 net: dsa: allow port_bridge_join() to override extack message
Some drivers might report that they are unable to bridge ports by returning -EOPNOTSUPP, but still wants to override extack message. In order to do so, in dsa_slave_changeupper(), if port_bridge_join() returns -EOPNOTSUPP, check if extack message is set and if so, do not override it.
--- net/dsa/slave.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/dsa/slave.c +3 -2
@@ -2460,8 +2460,9 @@ static int dsa_slave_changeupper(struct net_device *dev,if (!err)dsa_bridge_mtu_normalization (dp);if (err == -EOPNOTSUPP ) { -NL_SET_ERR_MSG_MOD (extack, -"Offloading not supported" ); +if (!extack->_msg) +NL_SET_ERR_MSG_MOD (extack, +"Offloading not supported" ); err =0 ; } err =notifier_from_errno (err);
Signature · 1 line
2.36.1
Re: [PATCH RESEND net-next v7 01/16] net: dsa: allow port_bridge_join() to override extack message
Quoted 8 lines · Clément Léger
Some drivers might report that they are unable to bridge ports by returning
-EOPNOTSUPP, but still wants to override extack message. In order to do so, indsa_slave_changeupper(), ifport_bridge_join()returns-EOPNOTSUPP, check if extack message is set and if so, do not override it.Reviewed-by Vladimir Oltean <[email protected]>Signed-off-by Clément Léger <[email protected]>
Signature · 1 line
Florian
Clément Léger
maintainerPATCH RESEND v7 2/16 net: dsa: add support for ethtool get_rmon_stats()
In reply to Clément LégerAdd 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
@@ -888,6 +888,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
@@ -1002,6 +1002,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) {
@@ -2081,6 +2093,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.1
Clément Léger
maintainerPATCH RESEND v7 3/16 net: dsa: add Renesas RZ/N1 switch tag driver
In reply to Clément LégerThe 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
@@ -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 26enum 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
@@ -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
@@ -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
@@ -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.1
Clément Léger
maintainerPATCH RESEND v7 4/16 dt-bindings: net: pcs: add bindings for Renesas RZ/N1 MII converter
In reply to Clément LégerThis 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 | 171 ++++++++++++++++++ include/dt-bindings/net/pcs-rzn1-miic.h | 33 ++++ 2 files changed, 204 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 +171 -0
@@ -0,0 +1,171 @@ +# 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 + + clock-names: + items: + - const: mii_ref + - const: rgmii_ref + - const: rmii_ref + - const: hclk + + 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-5]$": + 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: + const: 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 + - clock-names + - 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>; + clock-names = "mii_ref", "rgmii_ref", "rmii_ref", "hclk"; + 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
@@ -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.1
Clément Léger
maintainerPATCH RESEND v7 5/16 net: pcs: add Renesas MII converter driver
In reply to Clément LégerAdd 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 | 519 ++++++++++++++++++++++++++++++++ include/linux/pcs-rzn1-miic.h | 18 ++ 4 files changed, 546 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
@@ -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
@@ -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 +519 -0
519 lines not on this page · raw message
include/linux/pcs-rzn1-miic.h new file +18 -0
@@ -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 *dev,struct device_node *np); + +void miic_destroy (struct phylink_pcs *pcs); + +#endif /* __LINUX_PCS_MIIC_H */
Signature · 1 line
2.36.1
Jakub Kicinski
maintainerRe: [PATCH RESEND net-next v7 05/16] net: pcs: add Renesas MII converter driver
Quoted 8 lines · On Fri, 10 Jun 2022 12:37:01 +0200 Clément Léger wrote:
Subject: [PATCH RESEND net-next v7 05/16] net: pcs: add Renesas MII converter driver
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.
Could someone with MII &| PCS knowledge cast an eye over this code? All I can do is point out error path issues...
Quoted 9 lines
drivers/net/pcs/pcs-rzn1-miic.c new file +9
-0+struct phylink_pcs *miic_create (struct device *dev,struct device_node *np) +{ +struct platform_device *pdev; +struct miic_port *miic_port; +struct device_node *pcs_np; +struct miic *miic; +u32 port; + +if (!of_device_is_available (np))
drivers/net/pcs/pcs-rzn1-miic.c line 298
Quoted 10 lines
drivers/net/pcs/pcs-rzn1-miic.c new file +10
-0+return ERR_PTR (-ENODEV ); + +if (of_property_read_u32 (np,"reg" , &port)) +return ERR_PTR (-EINVAL ); + +if (port >MIIC_MAX_NR_PORTS || port <1 ) +return ERR_PTR (-EINVAL ); + +/* The PCS pdev is attached to the parent node */ + pcs_np =of_get_parent (np);
of_get_parent()? ..
drivers/net/pcs/pcs-rzn1-miic.c line 303
Quoted 5 lines
drivers/net/pcs/pcs-rzn1-miic.c new file +5
-0+if (!pcs_np) +return ERR_PTR (-ENODEV ); + +if (!of_device_is_available (pcs_np)) +return ERR_PTR (-ENODEV );
.. more like of_leak_parent()
Quoted 33 lines
drivers/net/pcs/pcs-rzn1-miic.c new file +32
-0+ pdev =of_find_device_by_node (pcs_np); +if (!pdev || !platform_get_drvdata (pdev)) +return ERR_PTR (-EPROBE_DEFER ); + + miic_port =kzalloc (sizeof (*miic_port),GFP_KERNEL ); +if (!miic_port) +return ERR_PTR (-ENOMEM ); + + miic =platform_get_drvdata (pdev); +device_link_add (dev, miic->dev,DL_FLAG_AUTOREMOVE_CONSUMER ); + + miic_port->miic = miic; + miic_port->port = port -1 ; + miic_port->pcs.ops = &miic_phylink_ops; + +return &miic_port->pcs; +} +EXPORT_SYMBOL (miic_create); +static int miic_parse_dt (struct device *dev,u32 *mode_cfg) +{ +s8 dt_val[MIIC_MODCTRL_CONF_CONV_NUM ]; +struct device_node *np = dev->of_node; +struct device_node *conv; +u32 conf; +int port; + +memset (dt_val,MIIC_MODCTRL_CONF_NONE ,sizeof (dt_val)); + +of_property_read_u32 (np,"renesas,miic-switch-portin" , &conf); + dt_val[0 ] = conf; + +for_each_child_of_node (np, conv) {
drivers/net/pcs/pcs-rzn1-miic.c line 439
Quoted 10 lines
drivers/net/pcs/pcs-rzn1-miic.c new file +10
-0+if (of_property_read_u32 (conv,"reg" , &port)) +continue ; + +if (!of_device_is_available (conv)) +continue ; + +if (of_property_read_u32 (conv,"renesas,miic-input" , &conf) ==0 ) + dt_val[port] = conf; + +of_node_put (conv);
Don't these iteration functions put() the current before taking the next one all by themselves? Or is there supposed to be a "break" here?
Quoted 4 lines
drivers/net/pcs/pcs-rzn1-miic.c new file +4
-0+ } + +return miic_match_dt_conf (dev, dt_val, mode_cfg); +}
Clément Léger
maintainerRe: [PATCH RESEND net-next v7 05/16] net: pcs: add Renesas MII converter driver
Quoted 35 lines · Jakub Kicinski
Quoted 8 lines · On Fri, 10 Jun 2022 12:37:01 +0200 Clément Léger wrote:
Subject: [PATCH RESEND net-next v7 05/16] net: pcs: add Renesas MII converter driver
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.
Could someone with MII &| PCS knowledge cast an eye over this code? All I can do is point out error path issues...
Quoted 9 lines
drivers/net/pcs/pcs-rzn1-miic.c new file +9
-0+struct phylink_pcs *miic_create (struct device *dev,struct device_node *np) +{ +struct platform_device *pdev; +struct miic_port *miic_port; +struct device_node *pcs_np; +struct miic *miic; +u32 port; + +if (!of_device_is_available (np))drivers/net/pcs/pcs-rzn1-miic.c line 298
Quoted 10 lines
drivers/net/pcs/pcs-rzn1-miic.c new file +10
-0+return ERR_PTR (-ENODEV ); + +if (of_property_read_u32 (np,"reg" , &port)) +return ERR_PTR (-EINVAL ); + +if (port >MIIC_MAX_NR_PORTS || port <1 ) +return ERR_PTR (-EINVAL ); + +/* The PCS pdev is attached to the parent node */ + pcs_np =of_get_parent (np);
of_get_parent()? ..
Quoted 7 lines
drivers/net/pcs/pcs-rzn1-miic.c line 303
Quoted 5 lines
drivers/net/pcs/pcs-rzn1-miic.c new file +5
-0+if (!pcs_np) +return ERR_PTR (-ENODEV ); + +if (!of_device_is_available (pcs_np)) +return ERR_PTR (-ENODEV );.. more like
of_leak_parent()
Indeed, I'll fix that.
Quoted 39 lines
Quoted 39 lines
drivers/net/pcs/pcs-rzn1-miic.c new file +37
-0+ pdev =of_find_device_by_node (pcs_np); +if (!pdev || !platform_get_drvdata (pdev)) +return ERR_PTR (-EPROBE_DEFER ); + + miic_port =kzalloc (sizeof (*miic_port),GFP_KERNEL ); +if (!miic_port) +return ERR_PTR (-ENOMEM ); + + miic =platform_get_drvdata (pdev); +device_link_add (dev, miic->dev,DL_FLAG_AUTOREMOVE_CONSUMER ); + + miic_port->miic = miic; + miic_port->port = port -1 ; + miic_port->pcs.ops = &miic_phylink_ops; + +return &miic_port->pcs; +} +EXPORT_SYMBOL (miic_create); +static int miic_parse_dt (struct device *dev,u32 *mode_cfg) +{ +s8 dt_val[MIIC_MODCTRL_CONF_CONV_NUM ]; +struct device_node *np = dev->of_node; +struct device_node *conv; +u32 conf; +int port; + +memset (dt_val,MIIC_MODCTRL_CONF_NONE ,sizeof (dt_val)); + +of_property_read_u32 (np,"renesas,miic-switch-portin" , &conf); + dt_val[0 ] = conf; + +for_each_child_of_node (np, conv) { +if (of_property_read_u32 (conv,"reg" , &port)) +continue ; + +if (!of_device_is_available (conv)) +continue ;
Quoted 8 lines
drivers/net/pcs/pcs-rzn1-miic.c line 439
Quoted 5 lines
drivers/net/pcs/pcs-rzn1-miic.c new file +5
-0+ +if (of_property_read_u32 (conv,"renesas,miic-input" , &conf) ==0 ) + dt_val[port] = conf; + +of_node_put (conv);Don't these iteration functions
put()the current before taking the next one all by themselves? Or is there supposed to be a "break" here?
Yes, of_node_put() should actually only be called in case of early exit. I'll fix that.
Signature · 3 lines
Clément Léger, Embedded Linux and Kernel engineer at Bootlin https://bootlin.com
Clément Léger
maintainerPATCH RESEND v7 6/16 dt-bindings: net: dsa: add bindings for Renesas RZ/N1 Advanced 5 port switch
In reply to Clément LégerAdd 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 | 134 ++++++++++++++++++ 1 file changed, 134 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml
Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml new file +134 -0
@@ -0,0 +1,134 @@ +# 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 + + power-domains: + 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 + + ethernet-ports: + type: object + properties: + '#address-cells': + const: 1 + '#size-cells': + const: 0 + + patternProperties: + "^(ethernet-)?port@[0-4]$": + 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 + - power-domains + +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"; + power-domains = <&sysctrl>; + + 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 = <&gmac2>; + 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.1
Re: [PATCH RESEND net-next v7 06/16] dt-bindings: net: dsa: add bindings for Renesas RZ/N1 Advanced 5 port switch
Quoted 9 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.
Reviewed-by Rob Herring <[email protected]>Reviewed-by Geert Uytterhoeven <[email protected]>Signed-off-by Clément Léger <[email protected]>
Signature · 1 line
Florian
Clément Léger
maintainerPATCH RESEND v7 7/16 net: dsa: rzn1-a5psw: add Renesas RZ/N1 advanced 5 port switch driver
In reply to Clément LégerAdd 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 | 720 +++++++++++++++++++++++++++++++++++ drivers/net/dsa/rzn1_a5psw.h | 196 ++++++++++ 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
@@ -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 ARCH_RZN1 + 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 select NET_DSA_TAG_LAN9303
drivers/net/dsa/Makefile +1 -0
@@ -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 +720 -0
720 lines not on this page · raw message
drivers/net/dsa/rzn1_a5psw.h new file +196 -0
196 lines not on this page · raw message
Signature · 1 line
2.36.1
Clément Léger
maintainerPATCH RESEND v7 8/16 net: dsa: rzn1-a5psw: add statistics support
In reply to Clément LégerAdd 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 | 174 +++++++++++++++++++++++++++++++++++ drivers/net/dsa/rzn1_a5psw.h | 46 +++++++++ 2 files changed, 220 insertions(+)
drivers/net/dsa/rzn1_a5psw.c +174 -0
@@ -17,6 +17,57 @@#include "rzn1_a5psw.h" +struct a5psw_stats { +u16 offset; +const char name[ETH_GSTRING_LEN ]; +}; + +#define STAT_DESC (_offset) { \ + .offset = A5PSW_##_offset, \ + .name = __stringify(_offset), \ +} + +static const struct a5psw_stats a5psw_stats[] = { +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) {writel (value, a5psw->base + offset);
@@ -324,6 +375,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;
@@ -412,6 +580,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 +46 -0
58 lines not on this page · raw message
Signature · 1 line
2.36.1
Re: [PATCH RESEND net-next v7 08/16] net: dsa: rzn1-a5psw: add statistics support
Quoted 10 lines · Clément Léger
Add statistics support to the rzn1-a5psw driver by implementing the following
dsa_switch_opscallbacks:
-get_sset_count()
-get_strings()
-get_ethtool_stats()
-get_eth_mac_stats()
-get_eth_ctrl_stats()
-get_rmon_stats()Signed-off-by Clément Léger <[email protected]>
Signature · 1 line
Florian
Clément Léger
maintainerPATCH RESEND v7 9/16 net: dsa: rzn1-a5psw: add FDB support
In reply to Clément LégerThis commits add forwarding database support to the driver. It implements fdb_add(), fdb_del() and fdb_dump().
--- drivers/net/dsa/rzn1_a5psw.c | 168 +++++++++++++++++++++++++++++++++++ drivers/net/dsa/rzn1_a5psw.h | 17 ++++ 2 files changed, 185 insertions(+)
drivers/net/dsa/rzn1_a5psw.c +168 -0
@@ -375,6 +375,171 @@ 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); + +mutex_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, ®); +if (ret) + goto lk_unlock; + +if (inc_learncount) { + reg =A5PSW_LK_LEARNCOUNT_MODE_INC ; +a5psw_reg_writel (a5psw,A5PSW_LK_LEARNCOUNT , reg); + } + +lk_unlock: +mutex_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); + +mutex_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, ®); +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: +mutex_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 =0 ; +u32 reg; + +mutex_lock (&a5psw->lk_lock); + +for (i =0 ; i <A5PSW_TABLE_ENTRIES ; i++) { + reg =A5PSW_LK_ADDR_CTRL_READ |A5PSW_LK_ADDR_CTRL_WAIT | i; + + ret =a5psw_lk_execute_ctrl (a5psw, ®); +if (ret) + goto out_unlock; + + 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))) +continue ; + + lk_data.lo =a5psw_reg_readl (a5psw,A5PSW_LK_DATA_LO ); + + ret =cb (lk_data.entry.mac,0 , lk_data.entry.is_static, data); +if (ret) + goto out_unlock; + } + +out_unlock: +mutex_unlock (&a5psw->lk_lock); + +return ret; +} +static u64 a5psw_read_stat (struct a5psw *a5psw,u32 offset,int port) {u32 reg_lo, reg_hi;
@@ -591,6 +756,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
@@ -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.1
Clément Léger
maintainerPATCH RESEND v7 10/16 dt-bindings: net: snps,dwmac: add "power-domains" property
In reply to Clément LégerSince the stmmac driver already uses pm_runtime*() functions, describe "power-domains" property in the binding.
--- Documentation/devicetree/bindings/net/snps,dwmac.yaml | 3 +++ 1 file changed, 3 insertions(+)
Documentation/devicetree/bindings/net/snps,dwmac.yaml +3 -0
@@ -135,6 +135,9 @@ properties: reset-names: const: stmmaceth + power-domains: + maxItems: 1 + mac-mode: $ref: ethernet-controller.yaml#/properties/phy-connection-type description:
Signature · 1 line
2.36.1
Re: [PATCH RESEND net-next v7 10/16] dt-bindings: net: snps,dwmac: add "power-domains" property
Quoted 6 lines · Clément Léger
Since the stmmac driver already uses pm_runtime*() functions, describe "power-domains" property in the binding.
Acked-by Rob Herring <[email protected]>Reported-by Geert Uytterhoeven <[email protected]>Signed-off-by Clément Léger <[email protected]>
Signature · 1 line
Florian
Clément Léger
maintainerPATCH RESEND v7 11/16 dt-bindings: net: snps,dwmac: add "renesas,rzn1" compatible
In reply to Clément LégerAdd "renesas,rzn1-gmac" and "renesas,r9a06g032-gmac" compatible strings.
--- Documentation/devicetree/bindings/net/snps,dwmac.yaml | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/net/snps,dwmac.yaml +2 -0
@@ -65,6 +65,8 @@ properties: - ingenic,x2000-mac - loongson,ls2k-dwmac - loongson,ls7a-dwmac + - renesas,r9a06g032-gmac + - renesas,rzn1-gmac - rockchip,px30-gmac - rockchip,rk3128-gmac - rockchip,rk3228-gmac
Signature · 1 line
2.36.1
Re: [PATCH RESEND net-next v7 11/16] dt-bindings: net: snps,dwmac: add "renesas,rzn1" compatible
Quoted 7 lines · Clément Léger
Add "renesas,rzn1-gmac" and "renesas,r9a06g032-gmac" compatible strings.
Signed-off-by Clément Léger <[email protected]>--- Documentation/devicetree/bindings/net/snps,dwmac.yaml | 2 ++ 1 file changed, 2 insertions(+)
Re: [PATCH RESEND net-next v7 11/16] dt-bindings: net: snps,dwmac: add "renesas,rzn1" compatible
In reply to Clément LégerQuoted 3 lines · Clément Léger
Add "renesas,rzn1-gmac" and "renesas,r9a06g032-gmac" compatible strings.
Signed-off-by Clément Léger <[email protected]>
Signature · 1 line
Florian
Clément Léger
maintainerPATCH RESEND v7 12/16 ARM: dts: r9a06g032: describe MII converter
In reply to Clément LégerAdd the MII converter node which describes the MII converter that is present on the RZ/N1 SoC.
--- arch/arm/boot/dts/r9a06g032.dtsi | 39 ++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+)
arch/arm/boot/dts/r9a06g032.dtsi +39 -0
@@ -304,6 +304,45 @@ dma1: dma-controller@40105000 { data-width = <8>; }; + 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>; + clock-names = "mii_ref", "rgmii_ref", "rmii_ref", "hclk"; + 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.1
Clément Léger
maintainerPATCH RESEND v7 13/16 ARM: dts: r9a06g032: describe GMAC2
In reply to Clément LégerRZ/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 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
arch/arm/boot/dts/r9a06g032.dtsi +18 -0
@@ -304,6 +304,24 @@ dma1: dma-controller@40105000 { data-width = <8>; }; + gmac2: ethernet@44002000 { + compatible = "renesas,r9a06g032-gmac", "renesas,rzn1-gmac", "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"; + clocks = <&sysctrl R9A06G032_HCLK_GMAC1>; + clock-names = "stmmaceth"; + power-domains = <&sysctrl>; + 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.1
Clément Léger
maintainerPATCH RESEND v7 14/16 ARM: dts: r9a06g032: describe switch
In reply to Clément LégerAdd description of the switch that is present on the RZ/N1 SoC. This description includes ethernet-ports description for all the ports that are present on the switch along with their connection to the MII converter ports and to the GMAC for the CPU port.
--- arch/arm/boot/dts/r9a06g032.dtsi | 51 ++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+)
arch/arm/boot/dts/r9a06g032.dtsi +51 -0
@@ -361,6 +361,57 @@ 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"; + power-domains = <&sysctrl>; + status = "disabled"; + + ethernet-ports { + #address-cells = <1>; + #size-cells = <0>; + + switch_port0: port@0 { + reg = <0>; + pcs-handle = <&mii_conv5>; + status = "disabled"; + }; + + switch_port1: port@1 { + reg = <1>; + pcs-handle = <&mii_conv4>; + status = "disabled"; + }; + + switch_port2: port@2 { + reg = <2>; + pcs-handle = <&mii_conv3>; + status = "disabled"; + }; + + switch_port3: port@3 { + reg = <3>; + pcs-handle = <&mii_conv2>; + status = "disabled"; + }; + + switch_port4: port@4 { + reg = <4>; + ethernet = <&gmac2>; + label = "cpu"; + phy-mode = "internal"; + status = "disabled"; + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + }; + }; + gic: interrupt-controller@44101000 { compatible = "arm,gic-400", "arm,cortex-a7-gic"; interrupt-controller;
Signature · 1 line
2.36.1
Clément Léger
maintainerPATCH RESEND v7 15/16 ARM: dts: r9a06g032-rzn1d400-db: add switch description
In reply to Clément LégerAdd description for the switch, GMAC2 and MII converter. With these definitions, the switch port 0 and 1 (MII port 5 and 4) are working on RZ/N1D-DB board.
--- arch/arm/boot/dts/r9a06g032-rzn1d400-db.dts | 117 ++++++++++++++++++++ 1 file changed, 117 insertions(+)
arch/arm/boot/dts/r9a06g032-rzn1d400-db.dts +117 -0
@@ -8,6 +8,8 @@ /dts-v1/; +#include <dt-bindings/pinctrl/rzn1-pinctrl.h> +#include <dt-bindings/net/pcs-rzn1-miic.h> #include "r9a06g032.dtsi" / {
@@ -31,3 +33,118 @@ &wdt0 { timeout-sec = <60>; status = "okay"; }; + +&gmac2 { + status = "okay"; + phy-mode = "gmii"; + fixed-link { + speed = <1000>; + full-duplex; + }; +}; + +&switch { + status = "okay"; + #address-cells = <1>; + #size-cells = <0>; + + pinctrl-names = "default"; + pinctrl-0 = <&pins_mdio1>, <&pins_eth3>, <&pins_eth4>; + + dsa,member = <0 0>; + + mdio { + clock-frequency = <2500000>; + + #address-cells = <1>; + #size-cells = <0>; + + switch0phy4: ethernet-phy@4{ + reg = <4>; + micrel,led-mode = <1>; + }; + + switch0phy5: ethernet-phy@5{ + reg = <5>; + micrel,led-mode = <1>; + }; + }; +}; + +&switch_port0 { + label = "lan0"; + phy-mode = "mii"; + phy-handle = <&switch0phy5>; + status = "okay"; +}; + +&switch_port1 { + label = "lan1"; + phy-mode = "mii"; + phy-handle = <&switch0phy4>; + status = "okay"; +}; + +&switch_port4 { + status = "okay"; +}; + +ð_miic { + status = "okay"; + renesas,miic-switch-portin = <MIIC_GMAC2_PORT>; +}; + +&mii_conv4 { + renesas,miic-input = <MIIC_SWITCH_PORTB>; + status = "okay"; +}; + +&mii_conv5 { + renesas,miic-input = <MIIC_SWITCH_PORTA>; + status = "okay"; +}; + +&pinctrl{ + pins_mdio1: pins_mdio1 { + pinmux = < + RZN1_PINMUX(152, RZN1_FUNC_MDIO1_SWITCH) + RZN1_PINMUX(153, RZN1_FUNC_MDIO1_SWITCH) + >; + }; + pins_eth3: pins_eth3 { + pinmux = < + RZN1_PINMUX(36, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII) + RZN1_PINMUX(37, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII) + RZN1_PINMUX(38, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII) + RZN1_PINMUX(39, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII) + RZN1_PINMUX(40, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII) + RZN1_PINMUX(41, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII) + RZN1_PINMUX(42, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII) + RZN1_PINMUX(43, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII) + RZN1_PINMUX(44, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII) + RZN1_PINMUX(45, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII) + RZN1_PINMUX(46, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII) + RZN1_PINMUX(47, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII) + >; + drive-strength = <6>; + bias-disable; + }; + pins_eth4: pins_eth4 { + pinmux = < + RZN1_PINMUX(48, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII) + RZN1_PINMUX(49, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII) + RZN1_PINMUX(50, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII) + RZN1_PINMUX(51, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII) + RZN1_PINMUX(52, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII) + RZN1_PINMUX(53, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII) + RZN1_PINMUX(54, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII) + RZN1_PINMUX(55, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII) + RZN1_PINMUX(56, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII) + RZN1_PINMUX(57, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII) + RZN1_PINMUX(58, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII) + RZN1_PINMUX(59, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII) + >; + drive-strength = <6>; + bias-disable; + }; +};
Signature · 1 line
2.36.1
Clément Léger
maintainerPATCH RESEND v7 16/16 MAINTAINERS: add Renesas RZ/N1 switch related driver entry
In reply to Clément LégerAfter contributing the drivers, volunteer for maintenance and add myself as the maintainer for Renesas RZ/N1 switch related drivers.
--- MAINTAINERS | 13 +++++++++++++ 1 file changed, 13 insertions(+)
MAINTAINERS +13 -0
@@ -17044,6 +17044,19 @@ 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 +L: [email protected] +L: [email protected] +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 RZ/N1 RTC CONTROLLER DRIVER M: Miquel Raynal <[email protected]> L: [email protected]
Signature · 1 line
2.36.1