Message ID | cover.1678201958.git.daniel@makrotopia.org |
---|---|
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:570d:b0:a1:2e52:cf23 with SMTP id h13csp1989457dyk; Tue, 7 Mar 2023 08:08:53 -0800 (PST) X-Google-Smtp-Source: AK7set/vrtUZvtm4Ul3MtQfPawkczF6usdxTq73u5vY5LicBQ+cqKlzXZpRhG/TD3YqD8//we9Dy X-Received: by 2002:aa7:c1c3:0:b0:4ab:1625:908d with SMTP id d3-20020aa7c1c3000000b004ab1625908dmr15046784edp.16.1678205333480; Tue, 07 Mar 2023 08:08:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678205333; cv=none; d=google.com; s=arc-20160816; b=EN8q9sImbqMs2FPY/KwxGXbo3VwrO3J71NBoyyyPtlhAurHhx2z/m4Bv+uHNrUXcpF AXppNgHO0hUSpui9ee6PP3dAZdLRoR/5Kpq05hSKUpwtTEEdkTlIgpekDJaPDzB2RVex Mz7ooGSkVZNph4XHfr4l/SSoxxUXhypImHSKf8pt+7PphvVVw0uQz8SnCJC1v7IIEBzQ N2zzQnlKyiY9VZscW8ZR3aohc0dylB597ycUbcWkqBO4d6mBcv2bwlr/IhytTLjq6taJ rVUZR3bRnarO+e0pEaflMgUC/HLUAbIMZ4oVbHkDvq6DkodZqUYSq6Rwyj7e0KyJH8Cm hxTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date; bh=tlL60PCJb7uEqU6OBEccB5pIRHgbqqtkPsRNc9zpnhY=; b=nvyuNlLPeXr04ukK+u2M3tbdL/5zRJVhIfydIvcKYShX434UsYizwY+zvvvBEU+D0J 0NmLBCFOgX+2MqLGdLFRJtqnuhbqBE+OYSIHA2HgI6jF/Tap59553USKehBp9NxJKmRe aTUDg9MNwK5zGP9mc1mf2jeeECHUuwiaA+T+E6IpMpJPDgabRQQsEy+r1MCEiGtZcpML JYvJxzMBt+ZtSj0LTeRJCL7jcq0Ip9PT9e+Fe5Fp8A388cVr60JkJTGGm3jKc2CpFRBm 4l1r1s9GX1ZF3gH5tF8hwAjwZE9Tnw3aP6Hc+N6C/1jKdZPMuL2swPXg9hZVJEvGiwUN dTCw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d10-20020a50fb0a000000b004c09282e943si14172308edq.32.2023.03.07.08.08.03; Tue, 07 Mar 2023 08:08:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230477AbjCGPyI (ORCPT <rfc822;toshivichauhan@gmail.com> + 99 others); Tue, 7 Mar 2023 10:54:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229913AbjCGPyG (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 7 Mar 2023 10:54:06 -0500 Received: from fudo.makrotopia.org (fudo.makrotopia.org [IPv6:2a07:2ec0:3002::71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 416F151CB1; Tue, 7 Mar 2023 07:54:04 -0800 (PST) Received: from local by fudo.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.96) (envelope-from <daniel@makrotopia.org>) id 1pZZdU-0001m1-0M; Tue, 07 Mar 2023 16:53:56 +0100 Date: Tue, 7 Mar 2023 15:52:19 +0000 From: Daniel Golle <daniel@makrotopia.org> To: devicetree@vger.kernel.org, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, netdev@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Russell King <linux@armlinux.org.uk>, Heiner Kallweit <hkallweit1@gmail.com>, Lorenzo Bianconi <lorenzo@kernel.org>, Mark Lee <Mark-MC.Lee@mediatek.com>, John Crispin <john@phrozen.org>, Felix Fietkau <nbd@nbd.name>, AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>, Matthias Brugger <matthias.bgg@gmail.com>, DENG Qingfang <dqfext@gmail.com>, Landen Chao <Landen.Chao@mediatek.com>, Sean Wang <sean.wang@mediatek.com>, Paolo Abeni <pabeni@redhat.com>, Jakub Kicinski <kuba@kernel.org>, Eric Dumazet <edumazet@google.com>, "David S. Miller" <davem@davemloft.net>, Vladimir Oltean <olteanv@gmail.com>, Florian Fainelli <f.fainelli@gmail.com>, Andrew Lunn <andrew@lunn.ch>, Vladimir Oltean <vladimir.oltean@nxp.com> Cc: =?iso-8859-1?q?Bj=F8rn?= Mork <bjorn@mork.no>, Frank Wunderlich <frank-w@public-files.de>, Alexander Couzens <lynxis@fe80.eu> Subject: [PATCH net-next v12 00/18] net: ethernet: mtk_eth_soc: various enhancements Message-ID: <cover.1678201958.git.daniel@makrotopia.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759725835488467939?= X-GMAIL-MSGID: =?utf-8?q?1759725835488467939?= |
Series |
net: ethernet: mtk_eth_soc: various enhancements
|
|
Message
Daniel Golle
March 7, 2023, 3:52 p.m. UTC
This series brings a variety of fixes and enhancements for mtk_eth_soc, adds support for the MT7981 SoC and facilitates sharing the SGMII PCS code between mtk_eth_soc and mt7530. Also prepare support for MT7988 which has been done while net-next was closed. Note that this series depends on commit 697c3892d825 ("regmap: apply reg_base and reg_downshift for single register ops") to not break mt7530 pcs register access. For SGMII and 1000Base-X mode to work well it also depends on commit 193250ace270 ("net: ethernet: mtk_eth_soc: fix RX data corruption issue") which has already been merged via the net tree. The whole series has been tested on MT7622+MT7531 (BPi-R64), MT7623+MT7530 (BPi-R2), MT7981+GPY211 (GL.iNet GL-MT3000) and MT7986+MT7531 (BPi-R3). On the BananaPi R3 a variete of SFP modules have been tested, all of them (some SGMII with PHY, others 2500Base-X or 1000Base-X without PHY) are working well now. Changes since v11: * remove patch "net: ethernet: mtk_eth_soc: fix RX data corruption issue" as it has already been merged via net tree * add commits fixing 1000Base-X and 2500Base-X modes after phylink_pcs conversion * completely remove mtk_sgmii.c as only about 20 lines were left in that file * Add commits from Lorenzo for MT7988 as requested by him Changes since v10: * improve mediatek,mt7981-eth dt-bindings * use regmap_set_bits instead of regmap_update_bits where possible * completely remove mtk_sgmii.c * no need to keep struct mtk_sgmii either as it had only a single element Changes since v9: * fix path in mediatek,sgmiisys dt-binding Changes since v8: * move mediatek,sgmiisys dt-bindings to correct net/pcs folder * rebase on top of net-next/main so series applies cleanly again Changes since v7: * move mediatek,sgmiisys.yaml to more appropriate folder * don't include <linux/phylink.h> twice in PCS driver, sort includes Changes since v6: * label MAC MCR bit 12 in 08/12, MediaTek replied explaining its function Changes since v5: * drop dev pointer also from struct mtk_sgmii, pass it as function parameter instead * address comments left for dt-bindings * minor improvements to commit messages Changes since v4: * remove unused dev pointer in struct pcs_mtk_lynxi * squash link timer check into correct follow-up patch Changes since v3: * remove unused #define's * use BMCR_* instead of #define'ing our own constants * return before changing registers in case of invalid link timer Changes since v2: * improve dt-bindings, convert sgmisys bindings to dt-schema yaml * fix typo Changes since v1: * apply reverse xmas tree everywhere * improve commit descriptions * add dt binding documentation * various small changes addressing all comments received for v1 Daniel Golle (13): net: ethernet: mtk_eth_soc: add support for MT7981 SoC dt-bindings: net: mediatek,net: add mt7981-eth binding dt-bindings: arm: mediatek: sgmiisys: Convert to DT schema dt-bindings: arm: mediatek: sgmiisys: add MT7981 SoC net: ethernet: mtk_eth_soc: set MDIO bus clock frequency net: ethernet: mtk_eth_soc: reset PCS state net: ethernet: mtk_eth_soc: only write values if needed net: ethernet: mtk_eth_soc: fix 1000Base-X and 2500Base-X modes net: ethernet: mediatek: Fix SerDes link status if not in SGMII mode net: ethernet: mtk_eth_soc: ppe: add support for flow accounting net: pcs: add driver for MediaTek SGMII PCS net: ethernet: mtk_eth_soc: switch to external PCS driver net: dsa: mt7530: use external PCS driver Lorenzo Bianconi (6): net: ethernet: mtk_eth_soc: add MTK_NETSYS_V1 capability bit net: ethernet: mtk_eth_soc: move MAX_DEVS in mtk_soc_data net: ethernet: mtk_eth_soc: rely on num_devs and remove MTK_MAC_COUNT net: ethernet: mtk_eth_soc: add MTK_NETSYS_V3 capability bit net: ethernet: mtk_eth_soc: convert caps in mtk_soc_data struct to u64 net: ethernet: mtk_eth_soc: add support for MT7988 SoC .../arm/mediatek/mediatek,sgmiisys.txt | 27 -- .../devicetree/bindings/net/mediatek,net.yaml | 53 ++- .../bindings/net/pcs/mediatek,sgmiisys.yaml | 55 +++ MAINTAINERS | 7 + drivers/net/dsa/Kconfig | 1 + drivers/net/dsa/mt7530.c | 277 +++-------- drivers/net/dsa/mt7530.h | 47 +- drivers/net/ethernet/mediatek/Kconfig | 2 + drivers/net/ethernet/mediatek/Makefile | 2 +- drivers/net/ethernet/mediatek/mtk_eth_path.c | 36 +- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 448 +++++++++++++++--- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 301 ++++++++---- drivers/net/ethernet/mediatek/mtk_ppe.c | 114 ++++- drivers/net/ethernet/mediatek/mtk_ppe.h | 25 +- .../net/ethernet/mediatek/mtk_ppe_debugfs.c | 9 +- .../net/ethernet/mediatek/mtk_ppe_offload.c | 8 + drivers/net/ethernet/mediatek/mtk_ppe_regs.h | 14 + drivers/net/ethernet/mediatek/mtk_sgmii.c | 203 -------- drivers/net/pcs/Kconfig | 7 + drivers/net/pcs/Makefile | 1 + drivers/net/pcs/pcs-mtk-lynxi.c | 308 ++++++++++++ include/linux/pcs/pcs-mtk-lynxi.h | 13 + 22 files changed, 1266 insertions(+), 692 deletions(-) delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.txt create mode 100644 Documentation/devicetree/bindings/net/pcs/mediatek,sgmiisys.yaml delete mode 100644 drivers/net/ethernet/mediatek/mtk_sgmii.c create mode 100644 drivers/net/pcs/pcs-mtk-lynxi.c create mode 100644 include/linux/pcs/pcs-mtk-lynxi.h base-commit: 36e5e391a25af28dc1f4586f95d577b38ff4ed72