From patchwork Thu Mar 9 10:54:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 6351 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp227768wrd; Thu, 9 Mar 2023 03:12:35 -0800 (PST) X-Google-Smtp-Source: AK7set9Yq8lfoINjp2Co7AnGWic+/3Woa7KwcXZV336crJSu7D0hg1k4fClKslmLLNyv855rAdM/ X-Received: by 2002:a17:902:ee95:b0:199:33ff:918a with SMTP id a21-20020a170902ee9500b0019933ff918amr21140314pld.21.1678360355256; Thu, 09 Mar 2023 03:12:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678360355; cv=none; d=google.com; s=arc-20160816; b=ZQAh97yVywROl01Dg0rHw6VHYmXGRQLxkP4RS2ZY4bHRcSKzVMXRF7DXbsTE77JcxZ 4BWCtqYk1epT1tvuKjQjqPaWTSsOEJJE1gNW07GQwE2RB/8eBG8x/K6Ln4vdzFsKn6Cq 7FKTe8ZQAeS597SAq3nA+xZmZwUDo6pPeOiVmXpJTqulVGGaAJZIwib0Nhai3URKPQ5w /u/gfWYuvYEy2kSuvM+ox3U8a5bRuXQ+/P3WeRIDXoi0JALC45kT1cPdSK7Alr8XSfpe ra5g70zNkIG0L4igbMLbPOg3yfG2S7sc2X1xqfvvVhaQRtB5tYfD1sqN/cSUqKU/rmGd nqww== 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=Iaq4RbqUiNWbwSNSlfekSFwqpy4bmsWEh8fUJ3ctyKA=; b=dKYGU+ivnuY7hkoq9Zs1gpITgNSwdSg9PSdTns/hA2zjBhREUd4D7cmQv8IUe/uDvl 4RvvIOdS+UntikYU3AtoiBh54lIAXsf7xe06hZ4SYvH+JmGR+ywfCxlMDapQkLVrqySp Biv61uQFhw+mnZxRKHGJjpBfLeCQ+JGsHGpTdMutvpooKTAvsFKWEqt6HLkSeMqo+Q82 nHPDEGIYKcvN3CyF1Z8CBtYM+qMZPHSIbEbM6xbmGszxtxmkU1RcnDqKRyfJzcYeIRHS 5Y3DlMX2Y/6PYYBqrV7lh4nLm6ZTX3vLDOzx1EhLb/WFgcPk41R6MT7Ee+bjcZr4LqMd MtTw== 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 p15-20020a170902ebcf00b0019c91fd0065si14826651plg.297.2023.03.09.03.12.20; Thu, 09 Mar 2023 03:12:35 -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 S230474AbjCIK72 (ORCPT + 99 others); Thu, 9 Mar 2023 05:59:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229825AbjCIK67 (ORCPT ); Thu, 9 Mar 2023 05:58:59 -0500 Received: from fudo.makrotopia.org (fudo.makrotopia.org [IPv6:2a07:2ec0:3002::71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 577D2EAB8C; Thu, 9 Mar 2023 02:56:48 -0800 (PST) Received: from local by fudo.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.96) (envelope-from ) id 1paDwP-0003Yr-11; Thu, 09 Mar 2023 11:56:09 +0100 Date: Thu, 9 Mar 2023 10:54:23 +0000 From: Daniel Golle To: devicetree@vger.kernel.org, Rob Herring , Krzysztof Kozlowski , netdev@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Russell King , Heiner Kallweit , Lorenzo Bianconi , Mark Lee , John Crispin , Felix Fietkau , AngeloGioacchino Del Regno , Matthias Brugger , DENG Qingfang , Landen Chao , Sean Wang , Paolo Abeni , Jakub Kicinski , Eric Dumazet , "David S. Miller" , Vladimir Oltean , Florian Fainelli , Andrew Lunn , Vladimir Oltean Cc: =?iso-8859-1?q?Bj=F8rn?= Mork , Frank Wunderlich , Alexander Couzens Subject: [PATCH net-next v13 00/16] net: ethernet: mtk_eth_soc: various enhancements Message-ID: MIME-Version: 1.0 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759888387725926669?= X-GMAIL-MSGID: =?utf-8?q?1759888387725926669?= 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, however, some of them need manually disabling of autonegotiation for the link to come up. Changes since v12: * remove patches "fixing" ????Base-X modes. Turns out the cause are buggy SFP modules for which we will need to introduce quirks rather than trying to address this in the Ethernet driver. 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 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 (11): 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: 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 (5): 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 .../arm/mediatek/mediatek,sgmiisys.txt | 27 -- .../devicetree/bindings/net/mediatek,net.yaml | 53 ++- .../bindings/net/pcs/mediatek,sgmiisys.yaml | 55 +++ MAINTAINERS | 8 + 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 | 314 ++++++++++++++---- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 207 ++++++------ 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 | 305 +++++++++++++++++ include/linux/pcs/pcs-mtk-lynxi.h | 13 + 22 files changed, 1050 insertions(+), 679 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: 46ca833c060cff588a5fc2c25a1def8a1b6284e2