Skip to contentSkip to conversation

net: dsa: initial support for MaxLinear MxL862xx switches

PATCH Superseded Daniel Golle 5 participants 17 messages Jan 22 – Jan 27

Subsystems (6)

v8 of 14 Superseded Latest is v14 →

lore
Share & tools
lore

Daniel Golle

author maintainer
#0 lore raw

v8 cover net: dsa: initial support for MaxLinear MxL862xx switches

PHY ports) and MxL86282 (8 PHY ports) switches.

MxL862xx integrates a firmware running on an embedded processor (running Zephyr RTOS). Host interaction uses a simple netlink-like API transported over MDIO/MMD.

This series includes only what's needed to pass traffic between user ports and the CPU port: relayed MDIO to internal PHYs, basic port enable/disable, and CPU-port special tagging.

Follow up series will bring bridge, VLAN, ... offloading, and support for using a 802.1Q-based special tag instead of the proprietary 8-byte tag.
---
basic DSA selftests were run, results:
* no_forwarding.sh: all tests PASS
* bridge_vlan_unaware.sh: all tests PASS
* bridge_vlan_mcast.sh: all tests PASS
* bridge_vlan_aware.sh: all tests PASS
* local_termination.sh: all tests PASS or XFAIL, except for
TEST: VLAN over vlan_filtering=1 bridged port: Unicast IPv4 to unknown MAC address [FAIL]
reception succeeded, but should have failed
TEST: VLAN over vlan_filtering=1 bridged port: Unicast IPv4 to unknown MAC address, allmulti [FAIL]
reception succeeded, but should have failed

As obviously this is mostly testing the Linux software bridge at this point I didn't bother to run any of the FDB or MDB related tests.

Changes since v7
1/4 dt-bindings: net: dsa: add MaxLinear MxL862xx
* no changes
2/4 net: dsa: add tag format for MxL862xx switches
* no changes
3/4 net: mdio: add unlocked mdiodev C45 bus accessors
* no changes
4/4 net: dsa: add basic initial driver for MxL862xx switches
* use little-endian in bridge_port_config API
* remove duplciate assignment of br_port_cfg.bridge_port_id when setting up CPU port

Changes since v6
1/4 dt-bindings: net: dsa: add MaxLinear MxL862xx
* no changes
2/4 net: dsa: add tag format for MxL862xx switches
* no changes
3/4 net: mdio: add unlocked mdiodev C45 bus accessors
* no changes
4/4 net: dsa: add basic initial driver for MxL862xx switches
* fix kerneldoc style

Changes since RFC v5
1/4 dt-bindings: net: dsa: add MaxLinear MxL862xx
* no changes

2/4 net: dsa: add tag format for MxL862xx switches
* remove unnecessary check for skb != NULL
* merge consecutively printed warnings into single dev_warn_ratelimited

3/4 net: mdio: add unlocked mdiodev C45 bus accessors
* no changes

4/4 net: dsa: add basic initial driver for MxL862xx switches
* include bridge and bridgeport API needed to isolate ports
* remove warning in .setup as ports are now isolated
* make ready-after-reset check more robust by adding delay
* sort structs in order of struct definitions
* best effort to sort functions without introducing additional prototypes
* always use enums with kerneldoc comments in mxl862xx-api.h
* remove bogus .phy_read and .phy_write DSA ops as the driver anyway registers a user MDIO bus with Clause-22 and Clause-45 operations
* various small style fixes

Changes since RFC v4
1/4 dt-bindings: net: dsa: add MaxLinear MxL862xx
* no changes

2/4 net: dsa: add tag format for MxL862xx switches
* drop unused precompiler macros

3/4 net: mdio: add unlocked mdiodev C45 bus accessors
* fix indentation

4/4 net: dsa: add basic initial driver for MxL862xx switches
* output warning in .setup regarding unknown pre-configuration
* add comment explaining why CFGGET is used in reset function

Changes since RFC v3
1/4 dt-bindings: net: dsa: add MaxLinear MxL862xx
* remove labels from example
* remove 'bindings for' from commit title

2/4 net: dsa: add tag format for MxL862xx switches
* describe fields and variables with comments
* sub-interface is only 5 bits
* harmonize Kconfig symbol name
* maintain alphabetic order in Kconfig
* fix typo s/beginnig/beginning/
* fix typo s/swtiches/switches/
* arrange local variables in reverse xmas tree order

3/4 net: mdio: add unlocked mdiodev C45 bus accessors
* unchanged

4/4 net: dsa: add basic initial driver for MxL862xx switches
* poll switch readiness after reset
* implement driver shutdown
* added port_fast_aging API call and driver op
* unified port setup in new .port_setup op
* improve comment explaining special handlign for unaligned API read
* various typos and formatting improvements

Changes since RFC v2
1/4, 2/4, 3/4: unchanged

4/4 net: dsa: add basic initial driver for MxL862xx switches
* fix return value being uninitialized on error in mxl862xx_api_wrap()
* add missing description in kerneldoc comment of
struct mxl862xx_ss_sp_tag

Changes since initial RFC

1/4 dt-bindings: net: dsa: add bindings for MaxLinear MxL862xx
* better description in dt-bindings doc

2/4 net: dsa: add tag formats for MxL862xx switches
* make sure all tag fields are initialized

3/4 net: mdio: add unlocked mdiodev C45 bus accessors
* new patch

4/4 net: dsa: add basic initial driver for MxL862xx switches
* make use of struct mdio_device
* add phylink_mac_ops stubs
* drop leftover nonsense from mxl862xx_phylink_get_caps()
* fix endian conversions
* use __le32 instead of enum types in over-the-wire structs
* use existing MDIO_* macros whenever possible
* simplify API constants to be more readable
* use readx_poll_timeout instead of open-coding poll timeout loop
* add mxl862xx_reg_read() and mxl862xx_reg_write() helpers
* demystify error codes returned by the firmware
* add #defines for mxl862xx_ss_sp_tag member values
* move reset to dedicated function, clarify magic number being the reset command ID

Daniel Golle (4):
dt-bindings: net: dsa: add MaxLinear MxL862xx
net: dsa: add tag format for MxL862xx switches
net: mdio: add unlocked mdiodev C45 bus accessors
net: dsa: add basic initial driver for MxL862xx switches

 .../bindings/net/dsa/maxlinear,mxl862xx.yaml  | 154 ++++++
 MAINTAINERS                                   |   8 +
 drivers/net/dsa/Kconfig                       |   2 +
 drivers/net/dsa/Makefile                      |   1 +
 drivers/net/dsa/mxl862xx/Kconfig              |  12 +
 drivers/net/dsa/mxl862xx/Makefile             |   3 +
 drivers/net/dsa/mxl862xx/mxl862xx-api.h       | 521 ++++++++++++++++++
 drivers/net/dsa/mxl862xx/mxl862xx-cmd.h       |  44 ++
 drivers/net/dsa/mxl862xx/mxl862xx-host.c      | 230 ++++++++
 drivers/net/dsa/mxl862xx/mxl862xx-host.h      |   5 +
 drivers/net/dsa/mxl862xx/mxl862xx.c           | 499 +++++++++++++++++
 drivers/net/dsa/mxl862xx/mxl862xx.h           |  25 +
 include/linux/mdio.h                          |  13 +
 include/net/dsa.h                             |   2 +
 net/dsa/Kconfig                               |   7 +
 net/dsa/Makefile                              |   1 +
 net/dsa/tag_mxl862xx.c                        | 112 ++++
 17 files changed, 1639 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/net/dsa/maxlinear,mxl862xx.yaml
 create mode 100644 drivers/net/dsa/mxl862xx/Kconfig
 create mode 100644 drivers/net/dsa/mxl862xx/Makefile
 create mode 100644 drivers/net/dsa/mxl862xx/mxl862xx-api.h
 create mode 100644 drivers/net/dsa/mxl862xx/mxl862xx-cmd.h
 create mode 100644 drivers/net/dsa/mxl862xx/mxl862xx-host.c
 create mode 100644 drivers/net/dsa/mxl862xx/mxl862xx-host.h
 create mode 100644 drivers/net/dsa/mxl862xx/mxl862xx.c
 create mode 100644 drivers/net/dsa/mxl862xx/mxl862xx.h
 create mode 100644 net/dsa/tag_mxl862xx.c
Signature · 1 line
2.52.0
author maintainer
#1 lore raw

PATCH v8 1/4 dt-bindings: net: dsa: add MaxLinear MxL862xx

Add documentation and an example for MaxLinear MxL86282 and MxL86252 switches.

---
v8: no changes
v7: no changes
v6: no changes
v5: no changes
RFC v4:
* remove labels from example
* remove 'bindings for' from commit title
RFC v3: no changes
RFC v2: better description in dt-bindings doc

---
 .../bindings/net/dsa/maxlinear,mxl862xx.yaml  | 154 ++++++++++++++++++
 MAINTAINERS                                   |   6 +
 2 files changed, 160 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/net/dsa/maxlinear,mxl862xx.yaml
Documentation/devicetree/bindings/net/dsa/maxlinear,mxl862xx.yaml new file +154 -0
new file mode 100644
index 0000000000000..77e48f0c7b1e3
@@ -0,0 +1,154 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/net/dsa/maxlinear,mxl862xx.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: MaxLinear MxL862xx Ethernet Switch Family
+
+maintainers:
+  - Daniel Golle <[email protected]>
+
+description:
+  The MaxLinear MxL862xx switch family are multi-port Ethernet switches with
+  integrated 2.5GE PHYs. The MxL86252 has five PHY ports and the MxL86282
+  has eight PHY ports. Both models come with two 10 Gigabit/s SerDes
+  interfaces to be used to connect external PHYs or SFP cages, or as CPU
+  port.
+
+allOf:
+  - $ref: dsa.yaml#/$defs/ethernet-ports
+
+properties:
+  compatible:
+    enum:
+      - maxlinear,mxl86252
+      - maxlinear,mxl86282
+
+  reg:
+    maxItems: 1
+    description: MDIO address of the switch
+
+  mdio:
+    $ref: /schemas/net/mdio.yaml#
+    unevaluatedProperties: false
+
+required:
+  - compatible
+  - reg
+
+unevaluatedProperties: false
+
+examples:
+  - |
+    mdio {
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        switch@0 {
+            compatible = "maxlinear,mxl86282";
+            reg = <0>;
+
+            ethernet-ports {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                port@0 {
+                    reg = <0>;
+                    phy-handle = <&phy0>;
+                    phy-mode = "internal";
+                };
+
+                port@1 {
+                    reg = <1>;
+                    phy-handle = <&phy1>;
+                    phy-mode = "internal";
+                };
+
+                port@2 {
+                    reg = <2>;
+                    phy-handle = <&phy2>;
+                    phy-mode = "internal";
+                };
+
+                port@3 {
+                    reg = <3>;
+                    phy-handle = <&phy3>;
+                    phy-mode = "internal";
+                };
+
+                port@4 {
+                    reg = <4>;
+                    phy-handle = <&phy4>;
+                    phy-mode = "internal";
+                };
+
+                port@5 {
+                    reg = <5>;
+                    phy-handle = <&phy5>;
+                    phy-mode = "internal";
+                };
+
+                port@6 {
+                    reg = <6>;
+                    phy-handle = <&phy6>;
+                    phy-mode = "internal";
+                };
+
+                port@7 {
+                    reg = <7>;
+                    phy-handle = <&phy7>;
+                    phy-mode = "internal";
+                };
+
+                port@8 {
+                    reg = <8>;
+                    label = "cpu";
+                    ethernet = <&gmac0>;
+                    phy-mode = "usxgmii";
+
+                    fixed-link {
+                        speed = <10000>;
+                        full-duplex;
+                    };
+                };
+            };
+
+            mdio {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                phy0: ethernet-phy@0 {
+                    reg = <0>;
+                };
+
+                phy1: ethernet-phy@1 {
+                    reg = <1>;
+                };
+
+                phy2: ethernet-phy@2 {
+                    reg = <2>;
+                };
+
+                phy3: ethernet-phy@3 {
+                    reg = <3>;
+                };
+
+                phy4: ethernet-phy@4 {
+                    reg = <4>;
+                };
+
+                phy5: ethernet-phy@5 {
+                    reg = <5>;
+                };
+
+                phy6: ethernet-phy@6 {
+                    reg = <6>;
+                };
+
+                phy7: ethernet-phy@7 {
+                    reg = <7>;
+                };
+            };
+        };
+    };
MAINTAINERS +6 -0
index 92768bceb929f..3c4990a90968c 100644
@@ -15614,6 +15614,12 @@ S:	Supported
 F:	drivers/net/phy/mxl-86110.c
 F:	drivers/net/phy/mxl-gpy.c
 
+MAXLINEAR MXL862XX SWITCH DRIVER
+M:	Daniel Golle <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	Documentation/devicetree/bindings/net/dsa/maxlinear,mxl862xx.yaml
+
 MCAN DEVICE DRIVER
 M:	Markus Schneider-Pargmann <[email protected]>
 L:	[email protected]
Signature · 1 line
2.52.0
author maintainer
#2 lore raw

PATCH v8 2/4 net: dsa: add tag format for MxL862xx switches

In reply to Daniel Golle

Add proprietary special tag format for the MaxLinear MXL862xx family of switches. While using the same Ethertype as MaxLinear's GSW1xx switches, the actual tag format differs significantly, hence we need a dedicated tag driver for that.

---
v8: no changes
v7: no changes
v6:
* remove unnecessary check for skb != NULL
* merge consecutively printed warnings into single dev_warn_ratelimited

v5:
* remove unused macro definitions

RFC v4:
* describe fields and variables with comments
* sub-interface is only 5 bits
* harmonize Kconfig symbol name
* maintain alphabetic order in Kconfig
* fix typo s/beginnig/beginning/
* fix typo s/swtiches/switches/
* arrange local variables in reverse xmas tree order

RFC v3: no changes
RFC v2: make sure all tag fields are initialized

---
 MAINTAINERS            |   1 +
 include/net/dsa.h      |   2 +
 net/dsa/Kconfig        |   7 +++
 net/dsa/Makefile       |   1 +
 net/dsa/tag_mxl862xx.c | 112 +++++++++++++++++++++++++++++++++++++++++
 5 files changed, 123 insertions(+)
 create mode 100644 net/dsa/tag_mxl862xx.c
MAINTAINERS +1 -0
index 3c4990a90968c..d1ce7e07ec96a 100644
@@ -15619,6 +15619,7 @@ M:	Daniel Golle <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	Documentation/devicetree/bindings/net/dsa/maxlinear,mxl862xx.yaml
+F:	net/dsa/tag_mxl862xx.c
 
 MCAN DEVICE DRIVER
 M:	Markus Schneider-Pargmann <[email protected]>
include/net/dsa.h +2 -0
index 6b2b5ed64ea4c..1e33242b6d94d 100644
@@ -57,6 +57,7 @@ struct tc_action;
 #define DSA_TAG_PROTO_BRCM_LEGACY_FCS_VALUE	29
 #define DSA_TAG_PROTO_YT921X_VALUE		30
 #define DSA_TAG_PROTO_MXL_GSW1XX_VALUE		31
+#define DSA_TAG_PROTO_MXL862_VALUE		32
 
 enum dsa_tag_protocol {
 	DSA_TAG_PROTO_NONE		= DSA_TAG_PROTO_NONE_VALUE,
@@ -91,6 +92,7 @@ enum dsa_tag_protocol {
 	DSA_TAG_PROTO_VSC73XX_8021Q	= DSA_TAG_PROTO_VSC73XX_8021Q_VALUE,
 	DSA_TAG_PROTO_YT921X		= DSA_TAG_PROTO_YT921X_VALUE,
 	DSA_TAG_PROTO_MXL_GSW1XX	= DSA_TAG_PROTO_MXL_GSW1XX_VALUE,
+	DSA_TAG_PROTO_MXL862		= DSA_TAG_PROTO_MXL862_VALUE,
 };
 
 struct dsa_switch;
net/dsa/Kconfig +7 -0
index f86b30742122f..efc95759a10e1 100644
@@ -104,6 +104,13 @@ config NET_DSA_TAG_MTK
 	  Say Y or M if you want to enable support for tagging frames for
 	  Mediatek switches.
 
+config NET_DSA_TAG_MXL_862XX
+	tristate "Tag driver for MxL862xx switches"
+	help
+	  Say Y or M if you want to enable support for tagging frames for the
+	  Maxlinear MxL86252 and MxL86282 switches using their native 8-byte
+	  tagging protocol.
+
 config NET_DSA_TAG_MXL_GSW1XX
 	tristate "Tag driver for MaxLinear GSW1xx switches"
 	help
net/dsa/Makefile +1 -0
index 42d173f5a7013..bf7247759a64a 100644
@@ -28,6 +28,7 @@ obj-$(CONFIG_NET_DSA_TAG_HELLCREEK) += tag_hellcreek.o
 obj-$(CONFIG_NET_DSA_TAG_KSZ) += tag_ksz.o
 obj-$(CONFIG_NET_DSA_TAG_LAN9303) += tag_lan9303.o
 obj-$(CONFIG_NET_DSA_TAG_MTK) += tag_mtk.o
+obj-$(CONFIG_NET_DSA_TAG_MXL_862XX) += tag_mxl862xx.o
 obj-$(CONFIG_NET_DSA_TAG_MXL_GSW1XX) += tag_mxl-gsw1xx.o
 obj-$(CONFIG_NET_DSA_TAG_NONE) += tag_none.o
 obj-$(CONFIG_NET_DSA_TAG_OCELOT) += tag_ocelot.o
net/dsa/tag_mxl862xx.c new file +112 -0

112 lines not on this page · raw message

Signature · 1 line
2.52.0
author maintainer
#3 lore raw

PATCH v8 3/4 net: mdio: add unlocked mdiodev C45 bus accessors

In reply to Daniel Golle

Add helper inline functions __mdiodev_c45_read() and __mdiodev_c45_write(), which are the C45 equivalents of the existing __mdiodev_read() and __mdiodev_write() added by commit e6a45700e7e1 ("net: mdio: add unlocked mdiobus and mdiodev bus accessors")

---
v8: no changes
v7: no changes
v6: no changes
v5: fix indentation
RFC v4: no changes
RFC v3: no changes
RFC v2: add this patch, initial submission

---
 include/linux/mdio.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)
include/linux/mdio.h +13 -0
index 42d6d47e445b7..52d94b8ae371e 100644
@@ -648,6 +648,19 @@ static inline int mdiodev_modify_changed(struct mdio_device *mdiodev,
 				      mask, set);
 }
 
+static inline int __mdiodev_c45_read(struct mdio_device *mdiodev, int devad,
+				     u16 regnum)
+{
+	return __mdiobus_c45_read(mdiodev->bus, mdiodev->addr, devad, regnum);
+}
+
+static inline int __mdiodev_c45_write(struct mdio_device *mdiodev, u32 devad,
+				      u16 regnum, u16 val)
+{
+	return __mdiobus_c45_write(mdiodev->bus, mdiodev->addr, devad, regnum,
+				   val);
+}
+
 static inline int mdiodev_c45_modify(struct mdio_device *mdiodev, int devad,
 				     u32 regnum, u16 mask, u16 set)
 {
Signature · 1 line
2.52.0
author maintainer
#4 lore raw

PATCH v8 4/4 net: dsa: add basic initial driver for MxL862xx switches

In reply to Daniel Golle

Add very basic DSA driver for MaxLinear's MxL862xx switches.

In contrast to previous MaxLinear switches the MxL862xx has a built-in processor that runs a sophisticated firmware based on Zephyr RTOS. Interaction between the host and the switch hence is organized using a software API of that firmware rather than accessing hardware registers directly.

Add descriptions of the most basic firmware API calls to access the built-in MDIO bus hosting the 2.5GE PHYs, basic port control as well as setting up the CPU port.

Implement a very basic DSA driver using that API which is sufficient to get packets flowing between the user ports and the CPU port.

The firmware offers all features one would expect from a modern switch hardware, they will be added one by one in follow-up patch series.

---
v8:
* use le32 endian in bridge_port_config API
* remove duplciate assignment of br_port_cfg.bridge_port_id when setting up CPU port

v7:
* fix kerneldoc style

v6:
* include bridge and bridgeport API needed to isolate ports
* remove warning in .setup as ports are now isolated
* make ready-after-reset check more robust by adding delay
* sort structs in order of struct definitions
* best effort to sort functions without introducing additional prototypes
* always use enums with kerneldoc comments in mxl862xx-api.h
* remove bogus .phy_read and .phy_write DSA ops as the driver anyway registers a user MDIO bus with Clause-22 and Clause-45 operations
* various small style fixes

v5:
* output warning in .setup regarding unknown pre-configuration
* add comment explaining why CFGGET is used in reset function

RFC v4:
* poll switch readiness after reset
* implement driver shutdown
* added port_fast_aging API call and driver op
* unified port setup in new .port_setup op
* improve comment explaining special handlign for unaligned API read
* various typos

RFC v3:
* fix return value being uninitialized on error in mxl862xx_api_wrap()
* add missing descrition in kerneldoc comment of
struct mxl862xx_ss_sp_tag

RFC v2:
* make use of struct mdio_device
* add phylink_mac_ops stubs
* drop leftover nonsense from mxl862xx_phylink_get_caps()
* use __le32 instead of enum types in over-the-wire structs
* use existing MDIO_* macros whenever possible
* simplify API constants to be more readable
* use readx_poll_timeout instead of open-coding poll timeout loop
* add mxl862xx_reg_read() and mxl862xx_reg_write() helpers
* demystify error codes returned by the firmware
* add #defines for mxl862xx_ss_sp_tag member values
* move reset to dedicated function, clarify magic number being the reset command ID

---
 MAINTAINERS                              |   1 +
 drivers/net/dsa/Kconfig                  |   2 +
 drivers/net/dsa/Makefile                 |   1 +
 drivers/net/dsa/mxl862xx/Kconfig         |  12 +
 drivers/net/dsa/mxl862xx/Makefile        |   3 +
 drivers/net/dsa/mxl862xx/mxl862xx-api.h  | 521 +++++++++++++++++++++++
 drivers/net/dsa/mxl862xx/mxl862xx-cmd.h  |  44 ++
 drivers/net/dsa/mxl862xx/mxl862xx-host.c | 230 ++++++++++
 drivers/net/dsa/mxl862xx/mxl862xx-host.h |   5 +
 drivers/net/dsa/mxl862xx/mxl862xx.c      | 499 ++++++++++++++++++++++
 drivers/net/dsa/mxl862xx/mxl862xx.h      |  25 ++
 11 files changed, 1343 insertions(+)
 create mode 100644 drivers/net/dsa/mxl862xx/Kconfig
 create mode 100644 drivers/net/dsa/mxl862xx/Makefile
 create mode 100644 drivers/net/dsa/mxl862xx/mxl862xx-api.h
 create mode 100644 drivers/net/dsa/mxl862xx/mxl862xx-cmd.h
 create mode 100644 drivers/net/dsa/mxl862xx/mxl862xx-host.c
 create mode 100644 drivers/net/dsa/mxl862xx/mxl862xx-host.h
 create mode 100644 drivers/net/dsa/mxl862xx/mxl862xx.c
 create mode 100644 drivers/net/dsa/mxl862xx/mxl862xx.h
MAINTAINERS +1 -0
index d1ce7e07ec96a..8d734aebff44c 100644
@@ -15619,6 +15619,7 @@ M:	Daniel Golle <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	Documentation/devicetree/bindings/net/dsa/maxlinear,mxl862xx.yaml
+F:	drivers/net/dsa/mxl862xx/
 F:	net/dsa/tag_mxl862xx.c
 
 MCAN DEVICE DRIVER
drivers/net/dsa/Kconfig +2 -0
index 7eb301fd987d1..18f6e8b7f4cb2 100644
@@ -74,6 +74,8 @@ source "drivers/net/dsa/microchip/Kconfig"
 
 source "drivers/net/dsa/mv88e6xxx/Kconfig"
 
+source "drivers/net/dsa/mxl862xx/Kconfig"
+
 source "drivers/net/dsa/ocelot/Kconfig"
 
 source "drivers/net/dsa/qca/Kconfig"
drivers/net/dsa/Makefile +1 -0
index 16de4ba3fa388..f5a463b87ec25 100644
@@ -20,6 +20,7 @@ obj-y				+= hirschmann/
 obj-y				+= lantiq/
 obj-y				+= microchip/
 obj-y				+= mv88e6xxx/
+obj-y				+= mxl862xx/
 obj-y				+= ocelot/
 obj-y				+= qca/
 obj-y				+= realtek/
drivers/net/dsa/mxl862xx/Kconfig new file +12 -0
new file mode 100644
index 0000000000000..3722260da7d82
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config NET_DSA_MXL862
+	tristate "MaxLinear MxL862xx"
+	depends on NET_DSA
+	select MAXLINEAR_GPHY
+	select NET_DSA_TAG_MXL_862XX
+	help
+	  This enables support for the MaxLinear MxL862xx switch family.
+	  These switches have two 10GE SerDes interfaces, one typically
+	  used as CPU port.
+	   MxL86282 has eight 2.5 Gigabit PHYs
+	   MxL86252 has five 2.5 Gigabit PHYs
drivers/net/dsa/mxl862xx/Makefile new file +3 -0
new file mode 100644
index 0000000000000..d23dd3cd511d4
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-$(CONFIG_NET_DSA_MXL862) += mxl862xx_dsa.o
+mxl862xx_dsa-y := mxl862xx.o mxl862xx-host.o
drivers/net/dsa/mxl862xx/mxl862xx-api.h new file +521 -0

521 lines not on this page · raw message

drivers/net/dsa/mxl862xx/mxl862xx-cmd.h new file +44 -0

44 lines not on this page · raw message

drivers/net/dsa/mxl862xx/mxl862xx-host.c new file +230 -0

230 lines not on this page · raw message

drivers/net/dsa/mxl862xx/mxl862xx-host.h new file +5 -0
new file mode 100644
index 0000000000000..0f558193d9d48
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+int mxl862xx_api_wrap(struct mxl862xx_priv *priv, u16 cmd, void *data, u16 size,
+		      bool read, bool quiet);
+int mxl862xx_reset(struct mxl862xx_priv *priv);
drivers/net/dsa/mxl862xx/mxl862xx.c new file +499 -0

499 lines not on this page · raw message

drivers/net/dsa/mxl862xx/mxl862xx.h new file +25 -0
new file mode 100644
index 0000000000000..7d8ec4c0b58e2
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#define MXL862XX_MAX_PHY_PORT_NUM	8
+#define MXL862XX_MAX_EXT_PORT_NUM	7
+#define MXL862XX_MAX_PORT_NUM		(MXL862XX_MAX_PHY_PORT_NUM + \
+					 MXL862XX_MAX_EXT_PORT_NUM)
+
+#define MXL86252_PHY_PORT_NUM		5
+#define MXL86282_PHY_PORT_NUM		8
+
+#define MXL862XX_EXT_PORT_NUM		2
+
+#define MXL862XX_MAX_BRIDGES		17
+
+struct mxl862xx_hw_info {
+	u8 max_ports;
+	u8 phy_ports;
+	u8 ext_ports;
+};
+
+struct mxl862xx_priv {
+	struct dsa_switch *ds;
+	struct mdio_device *mdiodev;
+	const struct mxl862xx_hw_info *hw_info;
+};
Signature · 1 line
2.52.0
maintainer
#5 lore raw

Re: [PATCH net-next v8 4/4] net: dsa: add basic initial driver for MxL862xx switches

Quoted 15 lines · Daniel Golle
drivers/net/dsa/mxl862xx/mxl862xx-host.c new file +15 -0
+static int mxl862xx_send_cmd(struct mxl862xx_priv *priv, u16 cmd, u16 size,
+			     bool quiet)
+{
+	int ret;
+
+	ret = mxl862xx_reg_write(priv, MXL862XX_MMD_REG_LEN_RET, size);
+	if (ret)
+		return ret;
+
+	ret = mxl862xx_reg_write(priv, MXL862XX_MMD_REG_CTRL,
+				 cmd | CTRL_BUSY_MASK);
+	if (ret)
+		return ret;
+
+	ret = mxl862xx_busy_wait(priv);

drivers/net/dsa/mxl862xx/mxl862xx-host.c line 124

Quoted 10 lines
drivers/net/dsa/mxl862xx/mxl862xx-host.c new file +10 -0
+	if (ret)
+		return ret;
+
+	ret = mxl862xx_reg_read(priv, MXL862XX_MMD_REG_LEN_RET);
+	/* handle errors returned by the firmware as -EIO
+	 * The firmware is based on Zephyr OS and uses the errors as
+	 * defined in errno.h of Zephyr OS. See
+	 * https://github.com/zephyrproject-rtos/zephyr/blob/v3.7.0/lib/libc/minimal/include/errno.h
+	 */
+	if ((s16)ret < 0) {

The cast is likely not needed above? if ret values < S16_MIN are possible this will return such values to the caller without the IO err printk.

Quoted 5 lines
drivers/net/dsa/mxl862xx/mxl862xx-host.c new file +5 -0
+		if (!quiet)
+			dev_err(&priv->mdiodev->dev,
+				"CMD %04x returned error %d\n", cmd, (s16)ret);
+		return -EIO;
+	}

drivers/net/dsa/mxl862xx/mxl862xx-host.c line 139

Quoted 10 lines
drivers/net/dsa/mxl862xx/mxl862xx-host.c new file +10 -0
+
+	return ret;
+}
+
+int mxl862xx_api_wrap(struct mxl862xx_priv *priv, u16 cmd, void *_data,
+		      u16 size, bool read, bool quiet)
+{
+	__le16 *data = _data;
+	u16 max, i;
+	int ret, cmd_ret;

Minor nit: reverse christmas tree above.

BTW the initial port isolation LGTM, but I would appreciate some DSA expert second opinion.

Thanks,

Paolo

author maintainer
#6 lore raw

Re: [PATCH net-next v8 4/4] net: dsa: add basic initial driver for MxL862xx switches

Quoted 22 lines · Paolo Abeni
Quoted 21 lines · Daniel Golle
drivers/net/dsa/mxl862xx/mxl862xx-host.c new file +21 -0
+static int mxl862xx_send_cmd(struct mxl862xx_priv *priv, u16 cmd, u16 size,
+			     bool quiet)
+{
+	int ret;
+
+	ret = mxl862xx_reg_write(priv, MXL862XX_MMD_REG_LEN_RET, size);
+	if (ret)
+		return ret;
+
+	ret = mxl862xx_reg_write(priv, MXL862XX_MMD_REG_CTRL,
+				 cmd | CTRL_BUSY_MASK);
+	if (ret)
+		return ret;
+
+	ret = mxl862xx_busy_wait(priv);
+	if (ret)
+		return ret;
+
+	ret = mxl862xx_reg_read(priv, MXL862XX_MMD_REG_LEN_RET);
+	/* handle errors returned by the firmware as -EIO
+	 * The firmware is based on Zephyr OS and uses the errors as
Quoted 8 lines

drivers/net/dsa/mxl862xx/mxl862xx-host.c line 124

Quoted 4 lines
drivers/net/dsa/mxl862xx/mxl862xx-host.c new file +4 -0
+	 * defined in errno.h of Zephyr OS. See
+	 * https://github.com/zephyrproject-rtos/zephyr/blob/v3.7.0/lib/libc/minimal/include/errno.h
+	 */
+	if ((s16)ret < 0) {

The cast is likely not needed above? if ret values < S16_MIN are possible this will return such values to the caller without the IO err printk.

Right, it should rather be

if (ret > S16_MAX && ret <= U16_MAX)

to really only catch the range of numbers which are negative 16-bit signed values represented as positive 32-bit signed values.

mxl862xx_reg_read() primarily returns a signed 32-bit integer, as it is basically just a wrapper around __mdiodev_c45_read(). Negative values of that 32-bit integer mean that the MDIO Clause-45 read has somehow failed, ie. it's the error the MDIO bus .read_c45() operation has returned.

In case __mdiodev_c45_read() succeeds it returns the 16-bit value of the register read. In this case, those 16-bit should be interpreted as a 16-bit signed integer here. A negative value denotes an error returned from the firmware running on the switch (see comment above the code).

Quoted 10 lines
Quoted 10 lines
drivers/net/dsa/mxl862xx/mxl862xx-host.c new file +9 -0
+		if (!quiet)
+			dev_err(&priv->mdiodev->dev,
+				"CMD %04x returned error %d\n", cmd, (s16)ret);
+		return -EIO;
+	}
+
+	return ret;
+}
+
Quoted 8 lines

drivers/net/dsa/mxl862xx/mxl862xx-host.c line 139

Quoted 6 lines
drivers/net/dsa/mxl862xx/mxl862xx-host.c new file +6 -0
+int mxl862xx_api_wrap(struct mxl862xx_priv *priv, u16 cmd, void *_data,
+		      u16 size, bool read, bool quiet)
+{
+	__le16 *data = _data;
+	u16 max, i;
+	int ret, cmd_ret;

Minor nit: reverse christmas tree above.

Oh right.... I anyway found another minor issue, so I'm going to send v9 with the above as well as the other minor issue fixed.

Quoted 2 lines

BTW the initial port isolation LGTM, but I would appreciate some DSA expert second opinion.

+1

maintainer
#7 lore raw

Re: [PATCH net-next v8 4/4] net: dsa: add basic initial driver for MxL862xx switches

Quoted 4 lines · Daniel Golle
Quoted 2 lines

BTW the initial port isolation LGTM, but I would appreciate some DSA expert second opinion.

+1

I will try to find some time to look this evening.

maintainer
#8 lore raw

Re: [PATCH net-next v8 4/4] net: dsa: add basic initial driver for MxL862xx switches

In reply to Daniel Golle
Quoted 24 lines
Quoted 10 lines

drivers/net/dsa/mxl862xx/mxl862xx-host.c line 124

Quoted 6 lines
drivers/net/dsa/mxl862xx/mxl862xx-host.c new file +6 -0
+	/* handle errors returned by the firmware as -EIO
+	 * The firmware is based on Zephyr OS and uses the errors as
+	 * defined in errno.h of Zephyr OS. See
+	 * https://github.com/zephyrproject-rtos/zephyr/blob/v3.7.0/lib/libc/minimal/include/errno.h
+	 */
+	if ((s16)ret < 0) {

The cast is likely not needed above? if ret values < S16_MIN are possible this will return such values to the caller without the IO err printk.

Right, it should rather be

if (ret > S16_MAX && ret <= U16_MAX)

to really only catch the range of numbers which are negative 16-bit signed values represented as positive 32-bit signed values.

mxl862xx_reg_read() primarily returns a signed 32-bit integer, as it is basically just a wrapper around __mdiodev_c45_read(). Negative values of that 32-bit integer mean that the MDIO Clause-45 read has somehow failed, ie. it's the error the MDIO bus .read_c45() operation has returned.

Quoted 4 lines

In case __mdiodev_c45_read() succeeds it returns the 16-bit value of the register read. In this case, those 16-bit should be interpreted as a 16-bit signed integer here. A negative value denotes an error returned from the firmware running on the switch (see comment above the code).

Rather than these casts, maybe add a helper which takes the unsigned u16 from the register and returns a signed Zepher error code?

int mxl862xx_to_zephyr_errno(u16 reg)

Just having a name like this makes it clearer what is going on.

Andrew

author maintainer
#9 lore raw

Re: [PATCH net-next v8 4/4] net: dsa: add basic initial driver for MxL862xx switches

Quoted 29 lines · Andrew Lunn
Quoted 24 lines
Quoted 10 lines

drivers/net/dsa/mxl862xx/mxl862xx-host.c line 124

Quoted 6 lines
drivers/net/dsa/mxl862xx/mxl862xx-host.c new file +6 -0
+	/* handle errors returned by the firmware as -EIO
+	 * The firmware is based on Zephyr OS and uses the errors as
+	 * defined in errno.h of Zephyr OS. See
+	 * https://github.com/zephyrproject-rtos/zephyr/blob/v3.7.0/lib/libc/minimal/include/errno.h
+	 */
+	if ((s16)ret < 0) {

The cast is likely not needed above? if ret values < S16_MIN are possible this will return such values to the caller without the IO err printk.

Right, it should rather be

if (ret > S16_MAX && ret <= U16_MAX)

to really only catch the range of numbers which are negative 16-bit signed values represented as positive 32-bit signed values.

mxl862xx_reg_read() primarily returns a signed 32-bit integer, as it is basically just a wrapper around __mdiodev_c45_read(). Negative values of that 32-bit integer mean that the MDIO Clause-45 read has somehow failed, ie. it's the error the MDIO bus .read_c45() operation has returned.

Quoted 4 lines

In case __mdiodev_c45_read() succeeds it returns the 16-bit value of the register read. In this case, those 16-bit should be interpreted as a 16-bit signed integer here. A negative value denotes an error returned from the firmware running on the switch (see comment above the code).

Quoted 4 lines

Rather than these casts, maybe add a helper which takes the unsigned u16 from the register and returns a signed Zepher error code?

int mxl862xx_to_zephyr_errno(u16 reg)

so that would then just be

	return (s16)reg;

right?

Or did you think to include the handling of the error __mdiodev_c45_read() would return, ie.
int mxl862xx_to_zephyr_errno(int reg)

{
	if (reg < 0)
		return reg;

	/* handle errors returned by the firmware as -EIO
	 * The firmware is based on Zephyr OS and uses the errors as
	 * defined in errno.h of Zephyr OS. See
	 * https://github.com/zephyrproject-rtos/zephyr/blob/v3.7.0/lib/libc/minimal/include/errno.h
	 */
	if (reg > S16_MAX && reg <= U16_MAX)
		return -EIO;
}

Or actually translating the actual errno to a Linux error code?

maintainer
#10 lore raw

Re: [PATCH net-next v8 4/4] net: dsa: add basic initial driver for MxL862xx switches

Quoted 4 lines
Quoted 1 line

int mxl862xx_to_zephyr_errno(u16 reg)

so that would then just be

	return (s16)reg;

right?

Yes.

Quoted 7 lines

Or did you think to include the handling of the error __mdiodev_c45_read() would return, ie.
int mxl862xx_to_zephyr_errno(int reg)

{
	if (reg < 0)
		return reg;

No, that mixes up real linux error codes and Zephyr OS error codes.

If the MDIO operation fails, you have a real error code you can return. If the firmware fails, you will want to netdev_err() the Zephyr error code to aid debug, and then return -EIO.

Quoted 1 line

Or actually translating the actual errno to a Linux error code?

Is it worth the effort? How many times have you seen the firmware fail? During debugging, it might be useful, but in production?

Andrew

author maintainer
#11 lore raw

Re: [PATCH net-next v8 4/4] net: dsa: add basic initial driver for MxL862xx switches

Quoted 6 lines · Andrew Lunn
Quoted 4 lines
Quoted 1 line

int mxl862xx_to_zephyr_errno(u16 reg)

so that would then just be

	return (s16)reg;

right?

Yes.

+1

Maybe better to check if bit 16~31 is actually zero as well, so int mxl862xx_to_zephyr_errno(int reg)

{
	if (reg >= 0 && reg <= U16_MAX)
		return (s16)reg;

	return 0;
}

or

int mxl862xx_to_zephyr_errno(int reg)

{
	if (!(reg & GENMASK(31, 16))
		return (s16)reg;

	return 0;
}

or something like that. Let me know what you prefer.

Quoted 10 lines
Quoted 8 lines

Or did you think to include the handling of the error __mdiodev_c45_read() would return, ie.
int mxl862xx_to_zephyr_errno(int reg)

{
	if (reg < 0)
		return reg;

No, that mixes up real linux error codes and Zephyr OS error codes.

I thought of that 'int reg' to be the return value of __mdiodev_c45_read(), so if that 32-bit signed int < 0 that means what you get is the error returned from __mdiodev_c45_read().

Quoted 4 lines

If the MDIO operation fails, you have a real error code you can return. If the firmware fails, you will want to netdev_err() the Zephyr error code to aid debug, and then return -EIO.

+1

Quoted 5 lines
Quoted 2 lines

Or actually translating the actual errno to a Linux error code?

Is it worth the effort? How many times have you seen the firmware fail? During debugging, it might be useful, but in production?

Some of the error values are useful, it *is* good to know whether eg. a bridge cannot be allocated because (for what ever reason) of resource exhaustion (-ENOMEM) or because of otherwise invalid settings (-EINVAL). However, it is true that in production none of that should ever happen. The driver will be able to predict and manage the resources of the switch without ever hitting -ENOMEM, and make sure parameters are valid before passing anything to the firmware. And even during development it is good enough to see the error number in the netdev_err() output.

#16 lore raw

Re: [PATCH net-next v8 4/4] net: dsa: add basic initial driver for MxL862xx switches

In reply to Daniel Golle
Quoted 10 lines · Daniel Golle
drivers/net/dsa/mxl862xx/mxl862xx.c new file +10 -0
+static void mxl862xx_phylink_mac_config(struct phylink_config *config,
+					unsigned int mode,
+					const struct phylink_link_state *state)
+{
+}
+
+static void mxl862xx_phylink_mac_link_down(struct phylink_config *config,
+					   unsigned int mode,
+					   phy_interface_t interface)
+{

drivers/net/dsa/mxl862xx/mxl862xx.c line 393

Quoted 10 lines
drivers/net/dsa/mxl862xx/mxl862xx.c new file +10 -0
+}
+
+static void mxl862xx_phylink_mac_link_up(struct phylink_config *config,
+					 struct phy_device *phydev,
+					 unsigned int mode,
+					 phy_interface_t interface,
+					 int speed, int duplex,
+					 bool tx_pause, bool rx_pause)
+{
+}

The above three are required, but...

drivers/net/dsa/mxl862xx/mxl862xx.c line 400

Quoted 7 lines
drivers/net/dsa/mxl862xx/mxl862xx.c new file +7 -0
+
+static struct phylink_pcs *
+mxl862xx_phylink_mac_select_pcs(struct phylink_config *config,
+				phy_interface_t interface)
+{
+	return NULL;
+}

This one isn't, you can drop it and phylink will assume NULL.

Thanks.

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

Re: [PATCH net-next v8 4/4] net: dsa: add basic initial driver for MxL862xx switches

In reply to Daniel Golle
Quoted 3 lines

Some of the error values are useful, it *is* good to know whether eg. a bridge cannot be allocated because (for what ever reason) of resource exhaustion (-ENOMEM) or because of otherwise invalid settings (-EINVAL).

We need to be careful with these. POSIX defines ENOMEM and EINVAL, but not their value. So you should add ZEPHYR_ENOMEM and ZEPHYR_EINVAL, just to make the name spaces clear.

Andrew

maintainer
#14 lore raw

Re: [PATCH net-next v8 4/4] net: dsa: add basic initial driver for MxL862xx switches

In reply to Daniel Golle
Quoted 10 lines · Daniel Golle
Quoted 6 lines · Andrew Lunn
Quoted 4 lines
Quoted 1 line

int mxl862xx_to_zephyr_errno(u16 reg)

so that would then just be

	return (s16)reg;

right?

Yes.

+1

Quoted 7 lines

Maybe better to check if bit 16~31 is actually zero as well, so int mxl862xx_to_zephyr_errno(int reg)

{
	if (reg >= 0 && reg <= U16_MAX)
		return (s16)reg;

	return 0;

If bits 16~31 are not zero, i would say the MDIO driver is broken, and we should fix it. Returning 0 is going to hide such issues. If you are worried about it, at least add a WARN_ON() or something.

Andrew

author maintainer
#13 lore raw

Re: [PATCH net-next v8 4/4] net: dsa: add basic initial driver for MxL862xx switches

In reply to Andrew Lunn
Quoted 7 lines · Andrew Lunn
Quoted 3 lines

Some of the error values are useful, it *is* good to know whether eg. a bridge cannot be allocated because (for what ever reason) of resource exhaustion (-ENOMEM) or because of otherwise invalid settings (-EINVAL).

We need to be careful with these. POSIX defines ENOMEM and EINVAL, but not their value. So you should add ZEPHYR_ENOMEM and ZEPHYR_EINVAL, just to make the name spaces clear.

I'd rather just not interpret the error numbers returned by the firmware and just catch all negative numbers and return -EIO, like you suggested when we discussed the RFC series.

See also https://patchwork.kernel.org/comment/26697045/

author maintainer
#15 lore raw

Re: [PATCH net-next v8 4/4] net: dsa: add basic initial driver for MxL862xx switches

In reply to Andrew Lunn
Quoted 17 lines · Andrew Lunn
Quoted 16 lines · Daniel Golle
Quoted 6 lines · Andrew Lunn
Quoted 4 lines
Quoted 1 line

int mxl862xx_to_zephyr_errno(u16 reg)

so that would then just be

	return (s16)reg;

right?

Yes.

+1

Maybe better to check if bit 16~31 is actually zero as well, so int mxl862xx_to_zephyr_errno(int reg)

{
	if (reg >= 0 && reg <= U16_MAX)
		return (s16)reg;
Quoted 5 lines
Quoted 1 line
	return 0;

If bits 16~31 are not zero, i would say the MDIO driver is broken, and we should fix it. Returning 0 is going to hide such issues. If you are worried about it, at least add a WARN_ON() or something.

The MDIO bus driver can very well return things like -ETIMEDOUT or -ENODEV as a result of its .read_c45() operation (both values got all bits 16~31 set, on every architecture I've checked)

This hints towards broken hardware, but not a broken driver. And I'd rather catch that case (int reg < 0) separately and outside of the mxl862xx_to_zephyr_errno() helper.

The broken-driver case would be values between U16_MAX and S32_MAX which really don't make any sense.

Making sure mxl862xx_to_zephyr_errno() isn't called if any of the bits 16~31 are set would still be good to not end up blaming the firmware for something which in reality is the MDIO bus driver or faulty hardware. In that sense my idea of return 0 was just to say "it isn't a value returned by the Zephyr firmware". If you prefer a WARN_ON() and return -EINVAL instead of the return 0 that would be fine as well, of course.