From nobody Sun Dec 14 12:12:47 2025 Received: from pidgin.makrotopia.org (pidgin.makrotopia.org [185.142.180.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DD2A6126C03; Sun, 14 Dec 2025 00:41:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.142.180.65 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765672863; cv=none; b=FTuy7Gr7XaUAa0wSiXkI/AtfuI0b6//xBajsrRQrp7fuL3AY61jGuo1cQMFamYmLhe4/vM/D8Vx6+DYFiF3FD6xwV0CeifU4/l7Ld9Ygfes014CToM40E1Bkh2scT0u4JhqPhRcQF7IAa0cTeQIU/24S/6bip0Fl+Kyrh81Ks8Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765672863; c=relaxed/simple; bh=rSmtrqCRP0begjAwLX1Pr9yGcSLoL1QYY5KqvytY4Sk=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=sfTWCcRh25z340Ci8Gg0lrs0l1gK9DaHaXn9Mhz/VIb/ZxZbwFuO6oYbKiCc0Swinn4C+yIt5sydt/6qB5fYGPfKxcMrWopNWBtu5yiYD4hRFzwZIt9h9/iLzK2nEMqr6qgO3hmoJ8MPo3teg/6D048RVQVk5kv5loEhz0agM1Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=makrotopia.org; spf=pass smtp.mailfrom=makrotopia.org; arc=none smtp.client-ip=185.142.180.65 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=makrotopia.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=makrotopia.org Received: from local by pidgin.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.99) (envelope-from ) id 1vUaAT-000000006lI-0nfg; Sun, 14 Dec 2025 00:40:57 +0000 Date: Sun, 14 Dec 2025 00:40:53 +0000 From: Daniel Golle To: Daniel Golle , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiner Kallweit , Russell King , Simon Horman , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Frank Wunderlich , Chad Monroe , Cezary Wilmanski , Avinash Jayaraman , Bing tao Xu , Liang Xu , Juraj Povazanec , "Fanni (Fang-Yi) Chan" , "Benny (Ying-Tsan) Weng" , "Livia M. Rosu" , John Crispin Subject: [RFC PATCH v2 net-next 1/4] dt-bindings: net: dsa: add bindings for MaxLinear MxL862xx Message-ID: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add documentation and an example for MaxLinear MxL86282 and MxL86252 switches. Signed-off-by: Daniel Golle --- RFC v2: better description in dt-bindings doc .../bindings/net/dsa/maxlinear,mxl862xx.yaml | 162 ++++++++++++++++++ MAINTAINERS | 6 + 2 files changed, 168 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/dsa/maxlinear,mxl= 862xx.yaml diff --git a/Documentation/devicetree/bindings/net/dsa/maxlinear,mxl862xx.y= aml b/Documentation/devicetree/bindings/net/dsa/maxlinear,mxl862xx.yaml new file mode 100644 index 0000000000000..159b64d5474b4 --- /dev/null +++ b/Documentation/devicetree/bindings/net/dsa/maxlinear,mxl862xx.yaml @@ -0,0 +1,162 @@ +# 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 + +description: + The MaxLinear MxL862xx switch family are multi-port Ethernet switches wi= th + 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 =3D <1>; + #size-cells =3D <0>; + + switch@0 { + compatible =3D "maxlinear,mxl86282"; + reg =3D <0>; + + ethernet-ports { + #address-cells =3D <1>; + #size-cells =3D <0>; + + port@0 { + reg =3D <0>; + label =3D "lan1"; + phy-handle =3D <&phy0>; + phy-mode =3D "internal"; + }; + + port@1 { + reg =3D <1>; + label =3D "lan2"; + phy-handle =3D <&phy1>; + phy-mode =3D "internal"; + }; + + port@2 { + reg =3D <2>; + label =3D "lan3"; + phy-handle =3D <&phy2>; + phy-mode =3D "internal"; + }; + + port@3 { + reg =3D <3>; + label =3D "lan4"; + phy-handle =3D <&phy3>; + phy-mode =3D "internal"; + }; + + port@4 { + reg =3D <4>; + label =3D "lan5"; + phy-handle =3D <&phy4>; + phy-mode =3D "internal"; + }; + + port@5 { + reg =3D <5>; + label =3D "lan6"; + phy-handle =3D <&phy5>; + phy-mode =3D "internal"; + }; + + port@6 { + reg =3D <6>; + label =3D "lan7"; + phy-handle =3D <&phy6>; + phy-mode =3D "internal"; + }; + + port@7 { + reg =3D <7>; + label =3D "lan8"; + phy-handle =3D <&phy7>; + phy-mode =3D "internal"; + }; + + port@8 { + reg =3D <8>; + label =3D "cpu"; + ethernet =3D <&gmac0>; + phy-mode =3D "usxgmii"; + + fixed-link { + speed =3D <10000>; + full-duplex; + }; + }; + }; + + mdio { + #address-cells =3D <1>; + #size-cells =3D <0>; + + phy0: ethernet-phy@0 { + reg =3D <0>; + }; + + phy1: ethernet-phy@1 { + reg =3D <1>; + }; + + phy2: ethernet-phy@2 { + reg =3D <2>; + }; + + phy3: ethernet-phy@3 { + reg =3D <3>; + }; + + phy4: ethernet-phy@4 { + reg =3D <4>; + }; + + phy5: ethernet-phy@5 { + reg =3D <5>; + }; + + phy6: ethernet-phy@6 { + reg =3D <6>; + }; + + phy7: ethernet-phy@7 { + reg =3D <7>; + }; + }; + }; + }; diff --git a/MAINTAINERS b/MAINTAINERS index 9707f53d62935..c433a15d9797a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15604,6 +15604,12 @@ S: Supported F: drivers/net/phy/mxl-86110.c F: drivers/net/phy/mxl-gpy.c =20 +MAXLINEAR MXL862XX SWITCH DRIVER +M: Daniel Golle +L: netdev@vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/net/dsa/maxlinear,mxl862xx.yaml + MCAN DEVICE DRIVER M: Markus Schneider-Pargmann L: linux-can@vger.kernel.org --=20 2.52.0 From nobody Sun Dec 14 12:12:47 2025 Received: from pidgin.makrotopia.org (pidgin.makrotopia.org [185.142.180.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9C31915624B; Sun, 14 Dec 2025 00:41:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.142.180.65 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765672879; cv=none; b=idZ5CD64AIyE2KlCa1mefLda5AJapzb4QqeAX9n96a3i7wHpKYoAvmU7zJSnoDqE72eWXA3If2ggPcPh9WjZXgFulq+k4Lf1qzUbtuknRTzBGITfmPj9cRFzLO/hoUmanRJdB07YMSU6j08X4VVMvzmuCjEc6CJe6WNyUEwwgwI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765672879; c=relaxed/simple; bh=R04H1ydlMMjan00+/dS9t0w2gtxqIx1H7KF/nLKJRYo=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=ZOgrGyl+teokkKL7+c4+bd/lmm00LMzOLj5U/1ftWC20BTvWrSvFAPGnxSFhRtX2iHzAkIgLMIUV3t4/9qoI+IL9WxfS3PHkaJiqxtSFicnwRfn+RcLxY7mREDVGHCB+iC+yWE/wH9Xpop9GceAQSWSI7j/LsTLLp0yRasHQnZk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=makrotopia.org; spf=pass smtp.mailfrom=makrotopia.org; arc=none smtp.client-ip=185.142.180.65 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=makrotopia.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=makrotopia.org Received: from local by pidgin.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.99) (envelope-from ) id 1vUaAj-000000006lm-1BxC; Sun, 14 Dec 2025 00:41:13 +0000 Date: Sun, 14 Dec 2025 00:41:09 +0000 From: Daniel Golle To: Daniel Golle , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiner Kallweit , Russell King , Simon Horman , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Frank Wunderlich , Chad Monroe , Cezary Wilmanski , Avinash Jayaraman , Bing tao Xu , Liang Xu , Juraj Povazanec , "Fanni (Fang-Yi) Chan" , "Benny (Ying-Tsan) Weng" , "Livia M. Rosu" , John Crispin Subject: [RFC PATCH v2 net-next 2/4] net: dsa: add tag formats for MxL862xx switches Message-ID: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add proprietary special tag format for the MaxLinear MXL862xx family of switches. While using the same Ethertype as MaxLinear's GSW1xx swtiches, the actual tag format differs significantly, hence we need a dedicated tag driver for that. Signed-off-by: Daniel Golle --- 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 | 113 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 124 insertions(+) create mode 100644 net/dsa/tag_mxl862xx.c diff --git a/MAINTAINERS b/MAINTAINERS index c433a15d9797a..a20498cc8320b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15609,6 +15609,7 @@ M: Daniel Golle L: netdev@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/net/dsa/maxlinear,mxl862xx.yaml +F: net/dsa/tag_mxl862xx.c =20 MCAN DEVICE DRIVER M: Markus Schneider-Pargmann diff --git a/include/net/dsa.h b/include/net/dsa.h index e40cdc12f7f39..e4c2b47a2a46e 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -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 =20 enum dsa_tag_protocol { DSA_TAG_PROTO_NONE =3D DSA_TAG_PROTO_NONE_VALUE, @@ -91,6 +92,7 @@ enum dsa_tag_protocol { DSA_TAG_PROTO_VSC73XX_8021Q =3D DSA_TAG_PROTO_VSC73XX_8021Q_VALUE, DSA_TAG_PROTO_YT921X =3D DSA_TAG_PROTO_YT921X_VALUE, DSA_TAG_PROTO_MXL_GSW1XX =3D DSA_TAG_PROTO_MXL_GSW1XX_VALUE, + DSA_TAG_PROTO_MXL862 =3D DSA_TAG_PROTO_MXL862_VALUE, }; =20 struct dsa_switch; diff --git a/net/dsa/Kconfig b/net/dsa/Kconfig index f86b30742122f..c897d62326f5b 100644 --- a/net/dsa/Kconfig +++ b/net/dsa/Kconfig @@ -145,6 +145,13 @@ config NET_DSA_TAG_QCA Say Y or M if you want to enable support for tagging frames for the Qualcomm Atheros QCA8K switches. =20 +config NET_DSA_TAG_MXL862 + 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_RTL4_A tristate "Tag driver for Realtek 4 byte protocol A tags" help diff --git a/net/dsa/Makefile b/net/dsa/Makefile index 42d173f5a7013..dbe2a742e3322 100644 --- a/net/dsa/Makefile +++ b/net/dsa/Makefile @@ -28,6 +28,7 @@ obj-$(CONFIG_NET_DSA_TAG_HELLCREEK) +=3D tag_hellcreek.o obj-$(CONFIG_NET_DSA_TAG_KSZ) +=3D tag_ksz.o obj-$(CONFIG_NET_DSA_TAG_LAN9303) +=3D tag_lan9303.o obj-$(CONFIG_NET_DSA_TAG_MTK) +=3D tag_mtk.o +obj-$(CONFIG_NET_DSA_TAG_MXL862) +=3D tag_mxl862xx.o obj-$(CONFIG_NET_DSA_TAG_MXL_GSW1XX) +=3D tag_mxl-gsw1xx.o obj-$(CONFIG_NET_DSA_TAG_NONE) +=3D tag_none.o obj-$(CONFIG_NET_DSA_TAG_OCELOT) +=3D tag_ocelot.o diff --git a/net/dsa/tag_mxl862xx.c b/net/dsa/tag_mxl862xx.c new file mode 100644 index 0000000000000..9c5e5f90dcb63 --- /dev/null +++ b/net/dsa/tag_mxl862xx.c @@ -0,0 +1,113 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * DSA Special Tag for MaxLinear 862xx switch chips + * + * Copyright (C) 2025 Daniel Golle + * Copyright (C) 2024 MaxLinear Inc. + */ + +#include +#include +#include +#include +#include "tag.h" + +#define MXL862_NAME "mxl862xx" + +/* To define the outgoing port and to discover the incoming port a special + * tag is used by the GSW1xx. + * + * Dest MAC Src MAC special TAG EtherType + * ...| 1 2 3 4 5 6 | 1 2 3 4 5 6 | 1 2 3 4 5 6 7 8 | 1 2 |... + * |<--------------->| + */ + +#define MXL862_HEADER_LEN 8 + +/* Byte 7 */ +#define MXL862_IGP_EGP GENMASK(3, 0) + +static struct sk_buff *mxl862_tag_xmit(struct sk_buff *skb, + struct net_device *dev) +{ + struct dsa_port *dp =3D dsa_user_to_port(dev); + struct dsa_port *cpu_dp =3D dp->cpu_dp; + unsigned int cpu_port =3D cpu_dp->index + 1; + unsigned int usr_port =3D dp->index + 1; + __be16 *mxl862_tag; + + if (!skb) + return skb; + + /* provide additional space 'MXL862_HEADER_LEN' bytes */ + skb_push(skb, MXL862_HEADER_LEN); + + /* shift MAC address to the beginnig of the enlarged buffer, + * releasing the space required for DSA tag (between MAC address and + * Ethertype) + */ + dsa_alloc_etype_header(skb, MXL862_HEADER_LEN); + + /* special tag ingress */ + mxl862_tag =3D dsa_etype_header_pos_tx(skb); + mxl862_tag[0] =3D htons(ETH_P_MXLGSW); + mxl862_tag[1] =3D 0; + mxl862_tag[2] =3D htons(usr_port + 16 - cpu_port); + mxl862_tag[3] =3D htons(FIELD_PREP(MXL862_IGP_EGP, cpu_port)); + + return skb; +} + +static struct sk_buff *mxl862_tag_rcv(struct sk_buff *skb, + struct net_device *dev) +{ + int port; + __be16 *mxl862_tag; + + if (unlikely(!pskb_may_pull(skb, MXL862_HEADER_LEN))) { + dev_warn_ratelimited(&dev->dev, "Cannot pull SKB, packet dropped\n"); + return NULL; + } + + mxl862_tag =3D dsa_etype_header_pos_rx(skb); + + if (unlikely(mxl862_tag[0] !=3D htons(ETH_P_MXLGSW))) { + dev_warn_ratelimited(&dev->dev, "Invalid special tag marker, packet drop= ped\n"); + dev_warn_ratelimited(&dev->dev, "Rx Packet Tag: %8ph\n", + mxl862_tag); + return NULL; + } + + /* Get source port information */ + port =3D FIELD_GET(MXL862_IGP_EGP, ntohs(mxl862_tag[3])); + port =3D port - 1; + skb->dev =3D dsa_conduit_find_user(dev, 0, port); + if (!skb->dev) { + dev_warn_ratelimited(&dev->dev, "Invalid source port, packet dropped\n"); + dev_warn_ratelimited(&dev->dev, "Rx Packet Tag: %8ph\n", + mxl862_tag); + return NULL; + } + + /* remove the MxL862xx special tag between the MAC addresses and the + * current ethertype field. + */ + skb_pull_rcsum(skb, MXL862_HEADER_LEN); + dsa_strip_etype_header(skb, MXL862_HEADER_LEN); + + return skb; +} + +static const struct dsa_device_ops mxl862_netdev_ops =3D { + .name =3D "mxl862", + .proto =3D DSA_TAG_PROTO_MXL862, + .xmit =3D mxl862_tag_xmit, + .rcv =3D mxl862_tag_rcv, + .needed_headroom =3D MXL862_HEADER_LEN, +}; + +MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_MXL862, MXL862_NAME); +MODULE_DESCRIPTION("DSA tag driver for MaxLinear MxL862xx switches"); +MODULE_LICENSE("GPL"); + +module_dsa_tag_driver(mxl862_netdev_ops); --=20 2.52.0 From nobody Sun Dec 14 12:12:47 2025 Received: from pidgin.makrotopia.org (pidgin.makrotopia.org [185.142.180.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B7B291DE4E1; Sun, 14 Dec 2025 00:41:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.142.180.65 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765672892; cv=none; b=jT+LM4tT5ZQkjmcdR6GBrf3g8hyjy3+QjhBi+FyWCyrJcuZhJnc74np+yIdwGzoTwKrDfIdr6/iaW8sjQf9ARiqFx5yMmSh3ONWPdDNIbYrlt7RYlQ/s0VVm1NfHvtyiv2vuyghVLYFVU6lcLQS4mRHUHmmsHDX63qu94yyTQOY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765672892; c=relaxed/simple; bh=aY8NAtWUqVKhLR07XxQLOeYBKEfdhVbWiz0T8CJqD1Y=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=SIfzoO1nSBwsqTXBwIpdsRHdT5cPKTHgeJTeQILHwCat1nImKPNKPQ6oxP/0Cl9H5FUDe+iXli38smA1bNX4AoQIJOsHXwKCFzQMBtA2Hqnf7qUUg4w593aL4pSz6+oTT3bfv338iRLifP9+CmM6XVYxnIucTo3db/IG+/eDDbA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=makrotopia.org; spf=pass smtp.mailfrom=makrotopia.org; arc=none smtp.client-ip=185.142.180.65 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=makrotopia.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=makrotopia.org Received: from local by pidgin.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.99) (envelope-from ) id 1vUaAw-000000006mX-2hEE; Sun, 14 Dec 2025 00:41:26 +0000 Date: Sun, 14 Dec 2025 00:41:23 +0000 From: Daniel Golle To: Daniel Golle , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiner Kallweit , Russell King , Simon Horman , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Frank Wunderlich , Chad Monroe , Cezary Wilmanski , Avinash Jayaraman , Bing tao Xu , Liang Xu , Juraj Povazanec , "Fanni (Fang-Yi) Chan" , "Benny (Ying-Tsan) Weng" , "Livia M. Rosu" , John Crispin Subject: [RFC PATCH v2 net-next 3/4] net: mdio: add unlocked mdiodev C45 bus accessors Message-ID: <552e004f6919e0dac90c9edc83120b84085309df.1765671579.git.daniel@makrotopia.org> References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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") Signed-off-by: Daniel Golle --- RFC v2: add this patch, initial submission include/linux/mdio.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/linux/mdio.h b/include/linux/mdio.h index 42d6d47e445b7..f39b4dba5cd4f 100644 --- a/include/linux/mdio.h +++ b/include/linux/mdio.h @@ -648,6 +648,19 @@ static inline int mdiodev_modify_changed(struct mdio_d= evice *mdiodev, mask, set); } =20 +static inline int __mdiodev_c45_read(struct mdio_device *mdiodev, int deva= d, + u16 regnum) +{ + return __mdiobus_c45_read(mdiodev->bus, mdiodev->addr, devad, regnum); +} + +static inline int __mdiodev_c45_write(struct mdio_device *mdiodev, u32 dev= ad, + 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 deva= d, u32 regnum, u16 mask, u16 set) { --=20 2.52.0 From nobody Sun Dec 14 12:12:47 2025 Received: from pidgin.makrotopia.org (pidgin.makrotopia.org [185.142.180.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 47C561CD15; Sun, 14 Dec 2025 00:41:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.142.180.65 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765672905; cv=none; b=ev2lu2lhO59inBsU2DH9k3+zO3p4PkfxAAsrOAyR1VQ6ETArTCgvFrl6a3AAYLdzAk5FAqzz5TgiZVxGlCCrldKet1XeY5p+AUTgCfPD6w6wRlFaTIxqqbpsB0AxRpbqPXY6sdy0ITRJhfNACqnOOX6mTMAXcZMWXOexZ//zsIw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765672905; c=relaxed/simple; bh=HKcpkz3abUVqZBlscdKlCNwKQZ7htinIJ0djR7n3doA=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=j6CKcQTCZh8EBjcXe7hgmZ0XU3wqfrS373/uQWKwDcwz3Gl0Xo/r5ogN8DIvlaRwuhc4B8GIiK1i03j5SqlsoToWhPbYKQX3s1zRjmzsDNquihLEgjF3ceN72+ffvOrHSR/Ln/LuOlVdwbyfxyJvQQbMWfpumXdHpap0ij/xzgU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=makrotopia.org; spf=pass smtp.mailfrom=makrotopia.org; arc=none smtp.client-ip=185.142.180.65 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=makrotopia.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=makrotopia.org Received: from local by pidgin.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.99) (envelope-from ) id 1vUaB8-000000006mv-0wSR; Sun, 14 Dec 2025 00:41:38 +0000 Date: Sun, 14 Dec 2025 00:41:34 +0000 From: Daniel Golle To: Daniel Golle , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiner Kallweit , Russell King , Simon Horman , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Frank Wunderlich , Chad Monroe , Cezary Wilmanski , Avinash Jayaraman , Bing tao Xu , Liang Xu , Juraj Povazanec , "Fanni (Fang-Yi) Chan" , "Benny (Ying-Tsan) Weng" , "Livia M. Rosu" , John Crispin Subject: [RFC PATCH v2 net-next 4/4] net: dsa: add basic initial driver for MxL862xx switches Message-ID: <2f442efaa8d1d1cb85dc7a5a262179626145314a.1765671579.git.daniel@makrotopia.org> References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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. Signed-off-by: Daniel Golle --- 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 | 118 ++++++++ drivers/net/dsa/mxl862xx/mxl862xx-cmd.h | 28 ++ drivers/net/dsa/mxl862xx/mxl862xx-host.c | 229 ++++++++++++++ drivers/net/dsa/mxl862xx/mxl862xx-host.h | 4 + drivers/net/dsa/mxl862xx/mxl862xx.c | 361 +++++++++++++++++++++++ drivers/net/dsa/mxl862xx/mxl862xx.h | 24 ++ 11 files changed, 783 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 diff --git a/MAINTAINERS b/MAINTAINERS index a20498cc8320b..17ca0351cc5b6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15609,6 +15609,7 @@ M: Daniel Golle L: netdev@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/net/dsa/maxlinear,mxl862xx.yaml +F: drivers/net/dsa/mxl862xx/ F: net/dsa/tag_mxl862xx.c =20 MCAN DEVICE DRIVER diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig index 7eb301fd987d1..18f6e8b7f4cb2 100644 --- a/drivers/net/dsa/Kconfig +++ b/drivers/net/dsa/Kconfig @@ -74,6 +74,8 @@ source "drivers/net/dsa/microchip/Kconfig" =20 source "drivers/net/dsa/mv88e6xxx/Kconfig" =20 +source "drivers/net/dsa/mxl862xx/Kconfig" + source "drivers/net/dsa/ocelot/Kconfig" =20 source "drivers/net/dsa/qca/Kconfig" diff --git a/drivers/net/dsa/Makefile b/drivers/net/dsa/Makefile index 16de4ba3fa388..f5a463b87ec25 100644 --- a/drivers/net/dsa/Makefile +++ b/drivers/net/dsa/Makefile @@ -20,6 +20,7 @@ obj-y +=3D hirschmann/ obj-y +=3D lantiq/ obj-y +=3D microchip/ obj-y +=3D mv88e6xxx/ +obj-y +=3D mxl862xx/ obj-y +=3D ocelot/ obj-y +=3D qca/ obj-y +=3D realtek/ diff --git a/drivers/net/dsa/mxl862xx/Kconfig b/drivers/net/dsa/mxl862xx/Kc= onfig new file mode 100644 index 0000000000000..5c538dfc2763e --- /dev/null +++ b/drivers/net/dsa/mxl862xx/Kconfig @@ -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_MXL862 + help + This enables support for the MaxLinear MxL862xx switch family. + These switches got two 10GE SerDes interfaces, one typically + used as CPU port. + MxL86282 Eight 2.5 Gigabit PHYs + MxL86252 Five 2.5 Gigabit PHYs \ No newline at end of file diff --git a/drivers/net/dsa/mxl862xx/Makefile b/drivers/net/dsa/mxl862xx/M= akefile new file mode 100644 index 0000000000000..d23dd3cd511d4 --- /dev/null +++ b/drivers/net/dsa/mxl862xx/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_NET_DSA_MXL862) +=3D mxl862xx_dsa.o +mxl862xx_dsa-y :=3D mxl862xx.o mxl862xx-host.o diff --git a/drivers/net/dsa/mxl862xx/mxl862xx-api.h b/drivers/net/dsa/mxl8= 62xx/mxl862xx-api.h new file mode 100644 index 0000000000000..8471f1f041693 --- /dev/null +++ b/drivers/net/dsa/mxl862xx/mxl862xx-api.h @@ -0,0 +1,118 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/** + * struct mdio_relay_data - relayed access to the switch internal MDIO bus + * @data: data to be read or written + * @phy: PHY index + * @mmd: MMD device + * @reg: register rndex + */ +struct mdio_relay_data { + __le16 data; + u8 phy; + u8 mmd; + __le16 reg; +} __packed; + +/* Register access parameter to directly modify internal registers */ +struct mxl862xx_register_mod { + __le16 addr; + __le16 data; + __le16 mask; +} __packed; + +#define MXL862XX_SS_SP_TAG_MASK_RX BIT(0) +#define MXL862XX_SS_SP_TAG_MASK_TX BIT(1) +#define MXL862XX_SS_SP_TAG_MASK_RX_PEN BIT(2) +#define MXL862XX_SS_SP_TAG_MASK_TX_PEN BIT(3) + +#define MXL862XX_SS_SP_TAG_RX_NO_TAG_NO_INSERT 0 +#define MXL862XX_SS_SP_TAG_RX_NO_TAG_INSERT 1 +#define MXL862XX_SS_SP_TAG_RX_TAG_NO_INSERT 2 + +#define MXL862XX_SS_SP_TAG_TX_NO_TAG_NO_REMOVE 0 +#define MXL862XX_SS_SP_TAG_TX_TAG_REPLACE 1 +#define MXL862XX_SS_SP_TAG_TX_TAG_NO_REMOVE 2 +#define MXL862XX_SS_SP_TAG_TX_TAG_REMOVE 3 + +/** + * struct mxl862xx_ss_sp_tag + * @pid: port ID (1~16) + * @mask: bit value 1 to indicate valid field + * 0 - rx + * 1 - tx + * 2 - rx_pen + * 3 - tx_pen + * @rx: RX special tag mode + * 0 - packet does NOT have special tag and special tag is NOT inserted + * 1 - packet does NOT have special tag and special tag is inserted + * 2 - packet has special tag and special tag is NOT inserted + * @tx: TX special tag mode + * 0 - packet does NOT have special tag and special tag is NOT removed + * 1 - packet has special tag and special tag is replaced + * 2 - packet has special tag and special tag is NOT removed + * 3 - packet has special tag and special tag is removed + * @rx_pen: RX special tag info over preamble + * 0 - special tag info inserted from byte 2 to 7 are all 0 + * 1 - special tag byte 5 is 16, other bytes from 2 to 7 are 0 + * 2 - special tag byte 5 is from preamble field, others are 0 + * 3 - special tag byte 2 to 7 are from preabmle field + * @tx_pen: TX special tag info over preamble + * 0 - disabled + * 1 - enabled + */ +struct mxl862xx_ss_sp_tag { + u8 pid; + u8 mask; + u8 rx; + u8 tx; + u8 rx_pen; + u8 tx_pen; +} __packed; + +/** + * enum mxl862xx_logical_port_mode - Logical port mode + * @MXL862XX_LOGICAL_PORT_8BIT_WLAN: WLAN with 8-bit station ID + * @MXL862XX_LOGICAL_PORT_9BIT_WLAN: WLAN with 9-bit station ID + * @MXL862XX_LOGICAL_PORT_GPON: GPON OMCI context + * @MXL862XX_LOGICAL_PORT_EPON: EPON context + * @MXL862XX_LOGICAL_PORT_GINT: G.INT context + * @MXL862XX_LOGICAL_PORT_OTHER: Others + */ +enum mxl862xx_logical_port_mode { + MXL862XX_LOGICAL_PORT_8BIT_WLAN =3D 0, + MXL862XX_LOGICAL_PORT_9BIT_WLAN, + MXL862XX_LOGICAL_PORT_GPON, + MXL862XX_LOGICAL_PORT_EPON, + MXL862XX_LOGICAL_PORT_GINT, + MXL862XX_LOGICAL_PORT_OTHER =3D 0xFF, +}; + +/** + * struct mxl862xx_ctp_port_assignment - CTP Port Assignment/association w= ith logical port + * @logical_port_id: Logical Port Id. The valid range is hardware dependent + * @first_ctp_port_id: First CTP Port ID mapped to above logical port ID + * @number_of_ctp_port: Total number of CTP Ports mapped above logical por= t ID + * @mode: See &enum mxl862xx_logical_port_mode + * @bridge_port_id: Bridge ID (FID) + */ +struct mxl862xx_ctp_port_assignment { + u8 logical_port_id; + __le16 first_ctp_port_id; + __le16 number_of_ctp_port; + __le32 mode; /* enum mxl862xx_logical_port_mode */ + __le16 bridge_port_id; +} __packed; + +/** + * struct mxl862xx_sys_fw_image_version - Firmware version information + * @iv_major: firmware major version + * @iv_minor: firmware minor version + * @iv_revision: firmware revision + * @iv_build_num: firmware build number + */ +struct mxl862xx_sys_fw_image_version { + u8 iv_major; + u8 iv_minor; + __le16 iv_revision; + __le32 iv_build_num; +} __packed; diff --git a/drivers/net/dsa/mxl862xx/mxl862xx-cmd.h b/drivers/net/dsa/mxl8= 62xx/mxl862xx-cmd.h new file mode 100644 index 0000000000000..db6a4c3f54f22 --- /dev/null +++ b/drivers/net/dsa/mxl862xx/mxl862xx-cmd.h @@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#define MXL862XX_MMD_DEV 30 +#define MXL862XX_MMD_REG_CTRL 0 +#define MXL862XX_MMD_REG_LEN_RET 1 +#define MXL862XX_MMD_REG_DATA_FIRST 2 +#define MXL862XX_MMD_REG_DATA_LAST 95 +#define MXL862XX_MMD_REG_DATA_MAX_SIZE \ + (MXL862XX_MMD_REG_DATA_LAST - MXL862XX_MMD_REG_DATA_FIRST + 1) + +#define MXL862XX_COMMON_MAGIC 0x100 +#define MXL862XX_CTP_MAGIC 0x500 +#define MXL862XX_SS_MAGIC 0x1600 +#define GPY_GPY2XX_MAGIC 0x1800 +#define SYS_MISC_MAGIC 0x1900 + +#define MXL862XX_COMMON_REGISTERMOD (MXL862XX_COMMON_MAGIC + 0x11) + +#define MXL862XX_CTP_PORTASSIGNMENTSET (MXL862XX_CTP_MAGIC + 0x3) + +#define MXL862XX_SS_SPTAG_SET (MXL862XX_SS_MAGIC + 0x02) + +#define INT_GPHY_READ (GPY_GPY2XX_MAGIC + 0x01) +#define INT_GPHY_WRITE (GPY_GPY2XX_MAGIC + 0x02) + +#define SYS_MISC_FW_VERSION (SYS_MISC_MAGIC + 0x02) + +#define MMD_API_MAXIMUM_ID 0x7FFF diff --git a/drivers/net/dsa/mxl862xx/mxl862xx-host.c b/drivers/net/dsa/mxl= 862xx/mxl862xx-host.c new file mode 100644 index 0000000000000..598f93d17906d --- /dev/null +++ b/drivers/net/dsa/mxl862xx/mxl862xx-host.c @@ -0,0 +1,229 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Based upon the Maxlinear SDK driver + * + * Copyright (C) 2025 Daniel Golle + * Copyright (C) 2025 John Crispin + * Copyright (C) 2024 MaxLinear Inc. + */ + +#include +#include +#include +#include "mxl862xx.h" +#include "mxl862xx-host.h" + +#define CTRL_BUSY_MASK BIT(15) + +#define MXL862XX_MMD_REG_CTRL 0 +#define MXL862XX_MMD_REG_LEN_RET 1 +#define MXL862XX_MMD_REG_DATA_FIRST 2 +#define MXL862XX_MMD_REG_DATA_LAST 95 +#define MXL862XX_MMD_REG_DATA_MAX_SIZE \ + (MXL862XX_MMD_REG_DATA_LAST - MXL862XX_MMD_REG_DATA_FIRST + 1) + +#define MMD_API_SET_DATA_0 2 +#define MMD_API_GET_DATA_0 5 +#define MMD_API_RST_DATA 8 + +#define MXL862XX_SWITCH_RESET 0x9907 + +static int mxl862xx_reg_read(struct mxl862xx_priv *priv, u32 addr) +{ + return __mdiodev_c45_read(priv->mdiodev, MDIO_MMD_VEND1, addr); +} + +static int mxl862xx_reg_write(struct mxl862xx_priv *priv, u32 addr, u16 da= ta) +{ + return __mdiodev_c45_write(priv->mdiodev, MDIO_MMD_VEND1, addr, data); +} + +static int mxl862xx_ctrl_read(struct mxl862xx_priv *priv) +{ + return mxl862xx_reg_read(priv, MXL862XX_MMD_REG_CTRL); +} + +static int mxl862xx_busy_wait(struct mxl862xx_priv *priv) +{ + int val; + + return readx_poll_timeout(mxl862xx_ctrl_read, priv, val, + !(val & CTRL_BUSY_MASK), 15, 10000); +} + +static int mxl862xx_set_data(struct mxl862xx_priv *priv, u16 words) +{ + int ret; + u16 cmd; + + ret =3D mxl862xx_reg_write(priv, MXL862XX_MMD_REG_LEN_RET, + MXL862XX_MMD_REG_DATA_MAX_SIZE * sizeof(u16)); + if (ret < 0) + return ret; + + cmd =3D words / MXL862XX_MMD_REG_DATA_MAX_SIZE - 1; + if (!(cmd < 2)) + return -EINVAL; + + cmd +=3D MMD_API_SET_DATA_0; + ret =3D mxl862xx_reg_write(priv, MXL862XX_MMD_REG_CTRL, + cmd | CTRL_BUSY_MASK); + if (ret < 0) + return ret; + + return mxl862xx_busy_wait(priv); +} + +static int mxl862xx_get_data(struct mxl862xx_priv *priv, u16 words) +{ + int ret; + u16 cmd; + + ret =3D mxl862xx_reg_write(priv, MXL862XX_MMD_REG_LEN_RET, + MXL862XX_MMD_REG_DATA_MAX_SIZE * sizeof(u16)); + if (ret < 0) + return ret; + + cmd =3D words / MXL862XX_MMD_REG_DATA_MAX_SIZE; + if (!(cmd > 0 && cmd < 3)) + return -EINVAL; + + cmd +=3D MMD_API_GET_DATA_0; + ret =3D mxl862xx_reg_write(priv, MXL862XX_MMD_REG_CTRL, + cmd | CTRL_BUSY_MASK); + if (ret < 0) + return ret; + + return mxl862xx_busy_wait(priv); +} + +static int mxl862xx_send_cmd(struct mxl862xx_priv *priv, u16 cmd, u16 size) +{ + int ret; + + ret =3D mxl862xx_reg_write(priv, MXL862XX_MMD_REG_LEN_RET, size); + if (ret) + return ret; + + ret =3D mxl862xx_reg_write(priv, MXL862XX_MMD_REG_CTRL, + cmd | CTRL_BUSY_MASK); + if (ret) + return ret; + + ret =3D mxl862xx_busy_wait(priv); + if (ret) + return ret; + + ret =3D 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/mini= mal/include/errno.h + */ + if ((s16)ret < 0) { + dev_err(&priv->mdiodev->dev, "CMD %04x returned error %d\n", + cmd, (s16)ret); + return -EIO; + } + + return ret; +} + +int mxl862xx_api_wrap(struct mxl862xx_priv *priv, u16 cmd, void *_data, + u16 size, bool read) +{ + __le16 *data =3D _data; + u16 max, i; + int ret, cmd_ret; + + dev_dbg(&priv->mdiodev->dev, "CMD %04x DATA %*ph\n", cmd, size, data); + + mutex_lock_nested(&priv->mdiodev->bus->mdio_lock, MDIO_MUTEX_NESTED); + + max =3D (size + 1) / 2; + + ret =3D mxl862xx_busy_wait(priv); + if (ret < 0) + goto out; + + for (i =3D 0; i < max; i++) { + u16 off =3D i % MXL862XX_MMD_REG_DATA_MAX_SIZE; + + if (i && off =3D=3D 0) { + /* Send command to set data when every + * MXL862XX_MMD_REG_DATA_MAX_SIZE of WORDs are written. + */ + ret =3D mxl862xx_set_data(priv, i); + if (ret < 0) + goto out; + } + + ret =3D mxl862xx_reg_write(priv, MXL862XX_MMD_REG_DATA_FIRST + off, + le16_to_cpu(data[i])); + if (ret < 0) + goto out; + } + + cmd_ret =3D mxl862xx_send_cmd(priv, cmd, size); + if (cmd_ret < 0) { + ret =3D cmd_ret; + goto out; + } + + if (!read) + goto out; + + for (i =3D 0; i < max; i++) { + u16 off =3D i % MXL862XX_MMD_REG_DATA_MAX_SIZE; + + if (i && off =3D=3D 0) { + /* Send command to fetch next batch of data + * when every MXL862XX_MMD_REG_DATA_MAX_SIZE of WORDs + * are read. + */ + ret =3D mxl862xx_get_data(priv, i); + if (ret < 0) + goto out; + } + + ret =3D mxl862xx_reg_read(priv, MXL862XX_MMD_REG_DATA_FIRST + off); + if (ret < 0) + goto out; + + if ((i * 2 + 1) =3D=3D size) { + /* Special handling for last BYTE + * if it's not WORD aligned. + */ + *(uint8_t *)&data[i] =3D ret & 0xFF; + } else { + data[i] =3D cpu_to_le16((u16)ret); + } + } + + dev_dbg(&priv->mdiodev->dev, "RET %d DATA %*ph\n", ret, size, data); + +out: + mutex_unlock(&priv->mdiodev->bus->mdio_lock); + return cmd_ret; +} + +int mxl862xx_reset(struct mxl862xx_priv *priv) +{ + int ret; + + mutex_lock_nested(&priv->mdiodev->bus->mdio_lock, MDIO_MUTEX_NESTED); + + /* Software reset */ + ret =3D mxl862xx_reg_write(priv, MXL862XX_MMD_REG_LEN_RET, 0); + if (ret) + goto out; + + ret =3D mxl862xx_reg_write(priv, MXL862XX_MMD_REG_CTRL, MXL862XX_SWITCH_R= ESET); +out: + mutex_unlock(&priv->mdiodev->bus->mdio_lock); + + if (ret =3D=3D 0) + usleep_range(4000000, 6000000); + + return ret; +} diff --git a/drivers/net/dsa/mxl862xx/mxl862xx-host.h b/drivers/net/dsa/mxl= 862xx/mxl862xx-host.h new file mode 100644 index 0000000000000..eb5acb81feea6 --- /dev/null +++ b/drivers/net/dsa/mxl862xx/mxl862xx-host.h @@ -0,0 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +int mxl862xx_api_wrap(struct mxl862xx_priv *priv, u16 cmd, void *data, u16= size, bool read); +int mxl862xx_reset(struct mxl862xx_priv *priv); diff --git a/drivers/net/dsa/mxl862xx/mxl862xx.c b/drivers/net/dsa/mxl862xx= /mxl862xx.c new file mode 100644 index 0000000000000..8e0dcfeb3b5c2 --- /dev/null +++ b/drivers/net/dsa/mxl862xx/mxl862xx.c @@ -0,0 +1,361 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Driver for MaxLinear MxL862xx switch family + * + * Copyright (C) 2024 MaxLinear Inc. + * Copyright (C) 2025 John Crispin + * Copyright (C) 2025 Daniel Golle + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "mxl862xx.h" +#include "mxl862xx-api.h" +#include "mxl862xx-cmd.h" +#include "mxl862xx-host.h" + +#define MXL862XX_API_WRITE(dev, cmd, data) \ + mxl862xx_api_wrap(dev, cmd, &(data), sizeof((data)), false) +#define MXL862XX_API_READ(dev, cmd, data) \ + mxl862xx_api_wrap(dev, cmd, &(data), sizeof((data)), true) + +#define DSA_MXL_PORT(port) ((port) + 1) + +#define MXL862XX_SDMA_PCTRLP(p) (0xBC0 + ((p) * 0x6)) +#define MXL862XX_SDMA_PCTRL_EN BIT(0) + +#define MXL862XX_FDMA_PCTRLP(p) (0xA80 + ((p) * 0x6)) +#define MXL862XX_FDMA_PCTRL_EN BIT(0) + +/* PHY access via firmware relay */ +static int mxl862xx_phy_read_mmd(struct mxl862xx_priv *priv, int port, + int devadd, int reg) +{ + struct mdio_relay_data param =3D { + .phy =3D port, + .mmd =3D devadd, + .reg =3D cpu_to_le16(reg), + }; + int ret; + + ret =3D MXL862XX_API_READ(priv, INT_GPHY_READ, param); + if (ret) + return ret; + + return le16_to_cpu(param.data); +} + +static int mxl862xx_phy_write_mmd(struct mxl862xx_priv *priv, int port, + int devadd, int reg, u16 data) +{ + struct mdio_relay_data param =3D { + .phy =3D port, + .mmd =3D devadd, + .reg =3D cpu_to_le16(reg), + .data =3D cpu_to_le16(data), + }; + + return MXL862XX_API_WRITE(priv, INT_GPHY_WRITE, param); +} + +static int mxl862xx_phy_read(struct dsa_switch *ds, int port, int reg) +{ + return mxl862xx_phy_read_mmd(ds->priv, port, 0, reg); +} + +static int mxl862xx_phy_write(struct dsa_switch *ds, int port, int reg, u1= 6 data) +{ + return mxl862xx_phy_write_mmd(ds->priv, port, 0, reg, data); +} + +static int mxl862xx_configure_tag_proto(struct dsa_port *dp, bool enable) +{ + struct mxl862xx_ctp_port_assignment assign =3D { + .number_of_ctp_port =3D cpu_to_le16(enable ? (32 - DSA_MXL_PORT(dp->inde= x)) : 1), + .logical_port_id =3D DSA_MXL_PORT(dp->index), + .first_ctp_port_id =3D cpu_to_le16(DSA_MXL_PORT(dp->index)), + .mode =3D cpu_to_le32(MXL862XX_LOGICAL_PORT_GPON), + }; + struct mxl862xx_ss_sp_tag tag =3D { + .pid =3D DSA_MXL_PORT(dp->index), + .mask =3D MXL862XX_SS_SP_TAG_MASK_RX | MXL862XX_SS_SP_TAG_MASK_TX, + .rx =3D enable ? MXL862XX_SS_SP_TAG_RX_TAG_NO_INSERT : + MXL862XX_SS_SP_TAG_RX_NO_TAG_INSERT, + .tx =3D enable ? MXL862XX_SS_SP_TAG_TX_TAG_NO_REMOVE : + MXL862XX_SS_SP_TAG_TX_TAG_REMOVE, + }; + int ret; + + ret =3D MXL862XX_API_WRITE(dp->ds->priv, MXL862XX_SS_SPTAG_SET, tag); + if (ret) + return ret; + + return MXL862XX_API_WRITE(dp->ds->priv, MXL862XX_CTP_PORTASSIGNMENTSET, a= ssign); +} + +static int mxl862xx_port_state(struct dsa_switch *ds, int port, bool enabl= e) +{ + struct mxl862xx_register_mod sdma =3D { + .addr =3D cpu_to_le16(MXL862XX_SDMA_PCTRLP(DSA_MXL_PORT(port))), + .data =3D cpu_to_le16(enable ? MXL862XX_SDMA_PCTRL_EN : 0), + .mask =3D cpu_to_le16(MXL862XX_SDMA_PCTRL_EN), + }; + struct mxl862xx_register_mod fdma =3D { + .addr =3D cpu_to_le16(MXL862XX_FDMA_PCTRLP(DSA_MXL_PORT(port))), + .data =3D cpu_to_le16(enable ? MXL862XX_FDMA_PCTRL_EN : 0), + .mask =3D cpu_to_le16(MXL862XX_FDMA_PCTRL_EN), + }; + int ret; + + if (!dsa_is_user_port(ds, port)) + return 0; + + ret =3D MXL862XX_API_WRITE(ds->priv, MXL862XX_COMMON_REGISTERMOD, sdma); + if (ret) + return ret; + + return MXL862XX_API_WRITE(ds->priv, MXL862XX_COMMON_REGISTERMOD, fdma); +} + +static int mxl862xx_port_enable(struct dsa_switch *ds, int port, + struct phy_device *phydev) +{ + return mxl862xx_port_state(ds, port, true); +} + +static void mxl862xx_port_disable(struct dsa_switch *ds, int port) +{ + mxl862xx_port_state(ds, port, false); +} + +static int mxl862xx_phy_read_mii_bus(struct mii_bus *bus, int port, int re= gnum) +{ + return mxl862xx_phy_read_mmd(bus->priv, port, 0, regnum); +} + +static int mxl862xx_phy_write_mii_bus(struct mii_bus *bus, int port, + int regnum, u16 val) +{ + return mxl862xx_phy_write_mmd(bus->priv, port, 0, regnum, val); +} + +static int mxl862xx_phy_read_c45_mii_bus(struct mii_bus *bus, int port, + int devadd, int regnum) +{ + return mxl862xx_phy_read_mmd(bus->priv, port, devadd, regnum); +} + +static int mxl862xx_phy_write_c45_mii_bus(struct mii_bus *bus, int port, + int devadd, int regnum, u16 val) +{ + return mxl862xx_phy_write_mmd(bus->priv, port, devadd, regnum, val); +} + +static int mxl862xx_setup_mdio(struct dsa_switch *ds) +{ + struct mxl862xx_priv *priv =3D ds->priv; + struct device *dev =3D ds->dev; + struct device_node *mdio_np; + struct mii_bus *bus; + static int idx; + int ret; + + bus =3D devm_mdiobus_alloc(dev); + if (!bus) + return -ENOMEM; + + bus->priv =3D priv; + ds->user_mii_bus =3D bus; + bus->name =3D KBUILD_MODNAME "-mii"; + snprintf(bus->id, MII_BUS_ID_SIZE, KBUILD_MODNAME "-%d", idx++); + bus->read_c45 =3D mxl862xx_phy_read_c45_mii_bus; + bus->write_c45 =3D mxl862xx_phy_write_c45_mii_bus; + bus->read =3D mxl862xx_phy_read_mii_bus; + bus->write =3D mxl862xx_phy_write_mii_bus; + bus->parent =3D dev; + bus->phy_mask =3D ~ds->phys_mii_mask; + + mdio_np =3D of_get_child_by_name(dev->of_node, "mdio"); + if (!mdio_np) + return -ENODEV; + + ret =3D devm_of_mdiobus_register(dev, bus, mdio_np); + of_node_put(mdio_np); + + return ret; +} + +static void mxl862xx_phylink_get_caps(struct dsa_switch *ds, int port, + struct phylink_config *config) +{ + config->mac_capabilities =3D MAC_ASYM_PAUSE | MAC_SYM_PAUSE | MAC_10 | + MAC_100 | MAC_1000 | MAC_2500FD; + + __set_bit(PHY_INTERFACE_MODE_INTERNAL, + config->supported_interfaces); +} + +static enum dsa_tag_protocol mxl862xx_get_tag_protocol(struct dsa_switch *= ds, + int port, + enum dsa_tag_protocol m) +{ + return DSA_TAG_PROTO_MXL862; +} + +static int mxl862xx_setup(struct dsa_switch *ds) +{ + struct mxl862xx_priv *priv =3D ds->priv; + struct dsa_port *cpu_dp; + int ret; + + ret =3D mxl862xx_reset(priv); + if (ret) + return ret; + + ret =3D mxl862xx_setup_mdio(ds); + if (ret) + return ret; + + dsa_switch_for_each_cpu_port(cpu_dp, ds) { + ret =3D mxl862xx_configure_tag_proto(cpu_dp, true); + if (ret) + return ret; + } + + return 0; +} + +static const struct dsa_switch_ops mxl862xx_switch_ops =3D { + .get_tag_protocol =3D mxl862xx_get_tag_protocol, + .phylink_get_caps =3D mxl862xx_phylink_get_caps, + .phy_read =3D mxl862xx_phy_read, + .phy_write =3D mxl862xx_phy_write, + .port_disable =3D mxl862xx_port_disable, + .port_enable =3D mxl862xx_port_enable, + .setup =3D mxl862xx_setup, +}; + +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) +{ +} + +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) +{ +} + +static struct phylink_pcs * +mxl862xx_phylink_mac_select_pcs(struct phylink_config *config, + phy_interface_t interface) +{ + return NULL; +} + +static const struct phylink_mac_ops mxl862xx_phylink_mac_ops =3D { + .mac_config =3D mxl862xx_phylink_mac_config, + .mac_link_down =3D mxl862xx_phylink_mac_link_down, + .mac_link_up =3D mxl862xx_phylink_mac_link_up, + .mac_select_pcs =3D mxl862xx_phylink_mac_select_pcs, +}; + +static int mxl862xx_probe(struct mdio_device *mdiodev) +{ + struct device *dev =3D &mdiodev->dev; + struct mxl862xx_priv *priv; + struct dsa_switch *ds; + struct mxl862xx_sys_fw_image_version fw; + int ret; + + priv =3D devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + priv->mdiodev =3D mdiodev; + priv->hw_info =3D of_device_get_match_data(dev); + if (!priv->hw_info) + return -EINVAL; + + ds =3D devm_kzalloc(dev, sizeof(*ds), GFP_KERNEL); + if (!ds) + return -ENOMEM; + + priv->ds =3D ds; + ds->dev =3D dev; + ds->priv =3D priv; + ds->ops =3D &mxl862xx_switch_ops; + ds->phylink_mac_ops =3D &mxl862xx_phylink_mac_ops; + ds->num_ports =3D priv->hw_info->max_ports; + + dev_set_drvdata(dev, ds); + + ret =3D dsa_register_switch(ds); + if (ret) + return ret; + + ret =3D MXL862XX_API_READ(priv, SYS_MISC_FW_VERSION, fw); + if (!ret) + dev_info(dev, "Firmware version %d.%d.%d.%d\n", + fw.iv_major, fw.iv_minor, + fw.iv_revision, fw.iv_build_num); + + return 0; +} + +static void mxl862xx_remove(struct mdio_device *mdiodev) +{ + struct dsa_switch *ds =3D dev_get_drvdata(&mdiodev->dev); + + dsa_unregister_switch(ds); +} + +static const struct mxl862xx_hw_info mxl86282_data =3D { + .max_ports =3D MXL862XX_MAX_PORT_NUM, + .phy_ports =3D MXL86282_PHY_PORT_NUM, + .ext_ports =3D MXL86282_EXT_PORT_NUM, +}; + +static const struct mxl862xx_hw_info mxl86252_data =3D { + .max_ports =3D MXL862XX_MAX_PORT_NUM, + .phy_ports =3D MXL86252_PHY_PORT_NUM, + .ext_ports =3D MXL86252_EXT_PORT_NUM, +}; + +static const struct of_device_id mxl862xx_of_match[] =3D { + { .compatible =3D "maxlinear,mxl86282", .data =3D &mxl86282_data }, + { .compatible =3D "maxlinear,mxl86252", .data =3D &mxl86252_data }, + { } +}; +MODULE_DEVICE_TABLE(of, mxl862xx_of_match); + +static struct mdio_driver mxl862xx_driver =3D { + .probe =3D mxl862xx_probe, + .remove =3D mxl862xx_remove, + .mdiodrv.driver =3D { + .name =3D "mxl862xx", + .of_match_table =3D mxl862xx_of_match, + }, +}; + +mdio_module_driver(mxl862xx_driver); + +MODULE_DESCRIPTION("Minimal driver for MaxLinear MxL862xx switch family"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:mxl862xx"); diff --git a/drivers/net/dsa/mxl862xx/mxl862xx.h b/drivers/net/dsa/mxl862xx= /mxl862xx.h new file mode 100644 index 0000000000000..66d194db8d6dd --- /dev/null +++ b/drivers/net/dsa/mxl862xx/mxl862xx.h @@ -0,0 +1,24 @@ +/* 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 MXL86252_EXT_PORT_NUM 2 +#define MXL86282_EXT_PORT_NUM 2 + +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; +}; --=20 2.52.0