From nobody Sun Sep 22 13:19:55 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E84F8C43217 for ; Fri, 12 Nov 2021 09:39:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D221D60FBF for ; Fri, 12 Nov 2021 09:39:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234815AbhKLJmZ (ORCPT ); Fri, 12 Nov 2021 04:42:25 -0500 Received: from mailgw02.mediatek.com ([210.61.82.184]:44946 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S234614AbhKLJmY (ORCPT ); Fri, 12 Nov 2021 04:42:24 -0500 X-UUID: 5048d8f6627a4fd894cc9626b7929eaa-20211112 X-UUID: 5048d8f6627a4fd894cc9626b7929eaa-20211112 Received: from mtkcas10.mediatek.inc [(172.21.101.39)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1242255224; Fri, 12 Nov 2021 17:39:29 +0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.3; Fri, 12 Nov 2021 17:39:28 +0800 Received: from localhost.localdomain (10.17.3.154) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 12 Nov 2021 17:39:27 +0800 From: Biao Huang To: , Jakub Kicinski , Rob Herring CC: Matthias Brugger , Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , Maxime Coquelin , Biao Huang , , , , , , , , , , Subject: [PATCH v3 1/7] net-next: stmmac: dwmac-mediatek: add platform level clocks management Date: Fri, 12 Nov 2021 17:39:12 +0800 Message-ID: <20211112093918.11061-2-biao.huang@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211112093918.11061-1-biao.huang@mediatek.com> References: <20211112093918.11061-1-biao.huang@mediatek.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This patch implements clks_config callback for dwmac-mediatek platform, which could support platform level clocks management. Signed-off-by: Biao Huang --- .../ethernet/stmicro/stmmac/dwmac-mediatek.c | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c b/drivers= /net/ethernet/stmicro/stmmac/dwmac-mediatek.c index 58c0feaa8131..157ff655c85e 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c @@ -359,9 +359,6 @@ static int mediatek_dwmac_init(struct platform_device *= pdev, void *priv) return ret; } =20 - pm_runtime_enable(&pdev->dev); - pm_runtime_get_sync(&pdev->dev); - return 0; } =20 @@ -370,11 +367,25 @@ static void mediatek_dwmac_exit(struct platform_devic= e *pdev, void *priv) struct mediatek_dwmac_plat_data *plat =3D priv; =20 clk_bulk_disable_unprepare(plat->num_clks_to_config, plat->clks); - - pm_runtime_put_sync(&pdev->dev); - pm_runtime_disable(&pdev->dev); } =20 +static int mediatek_dwmac_clks_config(void *priv, bool enabled) +{ + struct mediatek_dwmac_plat_data *plat =3D priv; + int ret =3D 0; + + if (enabled) { + ret =3D clk_bulk_prepare_enable(plat->num_clks_to_config, plat->clks); + if (ret) { + dev_err(plat->dev, "failed to enable clks, err =3D %d\n", ret); + return ret; + } + } else { + clk_bulk_disable_unprepare(plat->num_clks_to_config, plat->clks); + } + + return ret; +} static int mediatek_dwmac_probe(struct platform_device *pdev) { struct mediatek_dwmac_plat_data *priv_plat; @@ -420,6 +431,7 @@ static int mediatek_dwmac_probe(struct platform_device = *pdev) plat_dat->bsp_priv =3D priv_plat; plat_dat->init =3D mediatek_dwmac_init; plat_dat->exit =3D mediatek_dwmac_exit; + plat_dat->clks_config =3D mediatek_dwmac_clks_config; mediatek_dwmac_init(pdev, priv_plat); =20 ret =3D stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); --=20 2.25.1 From nobody Sun Sep 22 13:19:55 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2B885C433FE for ; Fri, 12 Nov 2021 09:39:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1116660EFD for ; Fri, 12 Nov 2021 09:39:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234846AbhKLJma (ORCPT ); Fri, 12 Nov 2021 04:42:30 -0500 Received: from mailgw02.mediatek.com ([210.61.82.184]:45038 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S234780AbhKLJmZ (ORCPT ); Fri, 12 Nov 2021 04:42:25 -0500 X-UUID: 0f6cde485def4fa28a3dc270f211c399-20211112 X-UUID: 0f6cde485def4fa28a3dc270f211c399-20211112 Received: from mtkmbs10n1.mediatek.inc [(172.21.101.34)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 549680085; Fri, 12 Nov 2021 17:39:31 +0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.15; Fri, 12 Nov 2021 17:39:29 +0800 Received: from localhost.localdomain (10.17.3.154) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 12 Nov 2021 17:39:28 +0800 From: Biao Huang To: , Jakub Kicinski , Rob Herring CC: Matthias Brugger , Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , Maxime Coquelin , Biao Huang , , , , , , , , , , Subject: [PATCH v3 2/7] net-next: stmmac: dwmac-mediatek: Reuse more common features Date: Fri, 12 Nov 2021 17:39:13 +0800 Message-ID: <20211112093918.11061-3-biao.huang@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211112093918.11061-1-biao.huang@mediatek.com> References: <20211112093918.11061-1-biao.huang@mediatek.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This patch makes dwmac-mediatek reuse more features supported by stmmac_platform.c. Signed-off-by: Biao Huang Acked-by: AngeloGioacchino Del Regno --- .../ethernet/stmicro/stmmac/dwmac-mediatek.c | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c b/drivers= /net/ethernet/stmicro/stmmac/dwmac-mediatek.c index 157ff655c85e..6ea972e96665 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c @@ -335,22 +335,20 @@ static int mediatek_dwmac_init(struct platform_device= *pdev, void *priv) const struct mediatek_dwmac_variant *variant =3D plat->variant; int ret; =20 - ret =3D dma_set_mask_and_coherent(plat->dev, DMA_BIT_MASK(variant->dma_bi= t_mask)); - if (ret) { - dev_err(plat->dev, "No suitable DMA available, err =3D %d\n", ret); - return ret; - } - - ret =3D variant->dwmac_set_phy_interface(plat); - if (ret) { - dev_err(plat->dev, "failed to set phy interface, err =3D %d\n", ret); - return ret; + if (variant->dwmac_set_phy_interface) { + ret =3D variant->dwmac_set_phy_interface(plat); + if (ret) { + dev_err(plat->dev, "failed to set phy interface, err =3D %d\n", ret); + return ret; + } } =20 - ret =3D variant->dwmac_set_delay(plat); - if (ret) { - dev_err(plat->dev, "failed to set delay value, err =3D %d\n", ret); - return ret; + if (variant->dwmac_set_delay) { + ret =3D variant->dwmac_set_delay(plat); + if (ret) { + dev_err(plat->dev, "failed to set delay value, err =3D %d\n", ret); + return ret; + } } =20 ret =3D clk_bulk_prepare_enable(plat->num_clks_to_config, plat->clks); @@ -423,15 +421,15 @@ static int mediatek_dwmac_probe(struct platform_devic= e *pdev) return PTR_ERR(plat_dat); =20 plat_dat->interface =3D priv_plat->phy_mode; - plat_dat->has_gmac4 =3D 1; - plat_dat->has_gmac =3D 0; - plat_dat->pmt =3D 0; + plat_dat->use_phy_wol =3D 1; plat_dat->riwt_off =3D 1; plat_dat->maxmtu =3D ETH_DATA_LEN; + plat_dat->addr64 =3D priv_plat->variant->dma_bit_mask; plat_dat->bsp_priv =3D priv_plat; plat_dat->init =3D mediatek_dwmac_init; plat_dat->exit =3D mediatek_dwmac_exit; plat_dat->clks_config =3D mediatek_dwmac_clks_config; + mediatek_dwmac_init(pdev, priv_plat); =20 ret =3D stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); --=20 2.25.1 From nobody Sun Sep 22 13:19:55 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D5C72C43217 for ; Fri, 12 Nov 2021 09:39:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BDBA660F70 for ; Fri, 12 Nov 2021 09:39:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234859AbhKLJmd (ORCPT ); Fri, 12 Nov 2021 04:42:33 -0500 Received: from mailgw01.mediatek.com ([60.244.123.138]:57894 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S234820AbhKLJm1 (ORCPT ); Fri, 12 Nov 2021 04:42:27 -0500 X-UUID: 6f2a7d7dd4324cbfbe10e3fa65142c04-20211112 X-UUID: 6f2a7d7dd4324cbfbe10e3fa65142c04-20211112 Received: from mtkcas11.mediatek.inc [(172.21.101.40)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1159271508; Fri, 12 Nov 2021 17:39:32 +0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.3; Fri, 12 Nov 2021 17:39:31 +0800 Received: from localhost.localdomain (10.17.3.154) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 12 Nov 2021 17:39:29 +0800 From: Biao Huang To: , Jakub Kicinski , Rob Herring CC: Matthias Brugger , Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , Maxime Coquelin , Biao Huang , , , , , , , , , , Subject: [PATCH v3 3/7] arm64: dts: mt2712: update ethernet device node Date: Fri, 12 Nov 2021 17:39:14 +0800 Message-ID: <20211112093918.11061-4-biao.huang@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211112093918.11061-1-biao.huang@mediatek.com> References: <20211112093918.11061-1-biao.huang@mediatek.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Since there are some changes in ethernet driver, update ethernet device node in dts to accommodate to it. Signed-off-by: Biao Huang --- arch/arm64/boot/dts/mediatek/mt2712-evb.dts | 1 + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt2712-evb.dts b/arch/arm64/boot/= dts/mediatek/mt2712-evb.dts index 7d369fdd3117..11aa135aa0f3 100644 --- a/arch/arm64/boot/dts/mediatek/mt2712-evb.dts +++ b/arch/arm64/boot/dts/mediatek/mt2712-evb.dts @@ -110,6 +110,7 @@ ð { phy-handle =3D <ðernet_phy0>; mediatek,tx-delay-ps =3D <1530>; snps,reset-gpio =3D <&pio 87 GPIO_ACTIVE_LOW>; + snps,reset-delays-us =3D <0 10000 10000>; pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <ð_default>; pinctrl-1 =3D <ð_sleep>; diff --git a/arch/arm64/boot/dts/mediatek/mt2712e.dtsi b/arch/arm64/boot/dt= s/mediatek/mt2712e.dtsi index a9cca9c146fd..9e850e04fffb 100644 --- a/arch/arm64/boot/dts/mediatek/mt2712e.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt2712e.dtsi @@ -726,7 +726,7 @@ queue2 { }; =20 eth: ethernet@1101c000 { - compatible =3D "mediatek,mt2712-gmac"; + compatible =3D "mediatek,mt2712-gmac", "snps,dwmac-4.20a"; reg =3D <0 0x1101c000 0 0x1300>; interrupts =3D ; interrupt-names =3D "macirq"; @@ -734,15 +734,19 @@ eth: ethernet@1101c000 { clock-names =3D "axi", "apb", "mac_main", - "ptp_ref"; + "ptp_ref", + "rmii_internal"; clocks =3D <&pericfg CLK_PERI_GMAC>, <&pericfg CLK_PERI_GMAC_PCLK>, <&topckgen CLK_TOP_ETHER_125M_SEL>, - <&topckgen CLK_TOP_ETHER_50M_SEL>; + <&topckgen CLK_TOP_ETHER_50M_SEL>, + <&topckgen CLK_TOP_ETHER_50M_RMII_SEL>; assigned-clocks =3D <&topckgen CLK_TOP_ETHER_125M_SEL>, - <&topckgen CLK_TOP_ETHER_50M_SEL>; + <&topckgen CLK_TOP_ETHER_50M_SEL>, + <&topckgen CLK_TOP_ETHER_50M_RMII_SEL>; assigned-clock-parents =3D <&topckgen CLK_TOP_ETHERPLL_125M>, - <&topckgen CLK_TOP_APLL1_D3>; + <&topckgen CLK_TOP_APLL1_D3>, + <&topckgen CLK_TOP_ETHERPLL_50M>; power-domains =3D <&scpsys MT2712_POWER_DOMAIN_AUDIO>; mediatek,pericfg =3D <&pericfg>; snps,axi-config =3D <&stmmac_axi_setup>; --=20 2.25.1 From nobody Sun Sep 22 13:19:55 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93C4FC433EF for ; Fri, 12 Nov 2021 09:39:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 763B760F70 for ; Fri, 12 Nov 2021 09:39:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234872AbhKLJmf (ORCPT ); Fri, 12 Nov 2021 04:42:35 -0500 Received: from mailgw01.mediatek.com ([60.244.123.138]:57928 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S234829AbhKLJm2 (ORCPT ); Fri, 12 Nov 2021 04:42:28 -0500 X-UUID: 987522485d224acbb3399426d54f26da-20211112 X-UUID: 987522485d224acbb3399426d54f26da-20211112 Received: from mtkexhb01.mediatek.inc [(172.21.101.102)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1939060846; Fri, 12 Nov 2021 17:39:33 +0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.15; Fri, 12 Nov 2021 17:39:32 +0800 Received: from localhost.localdomain (10.17.3.154) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 12 Nov 2021 17:39:31 +0800 From: Biao Huang To: , Jakub Kicinski , Rob Herring CC: Matthias Brugger , Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , Maxime Coquelin , Biao Huang , , , , , , , , , , Subject: [PATCH v3 4/7] net-next: dt-bindings: dwmac: Convert mediatek-dwmac to DT schema Date: Fri, 12 Nov 2021 17:39:15 +0800 Message-ID: <20211112093918.11061-5-biao.huang@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211112093918.11061-1-biao.huang@mediatek.com> References: <20211112093918.11061-1-biao.huang@mediatek.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Convert mediatek-dwmac to DT schema, and delete old mediatek-dwmac.txt. Signed-off-by: Biao Huang --- .../bindings/net/mediatek-dwmac.txt | 91 ---------- .../bindings/net/mediatek-dwmac.yaml | 157 ++++++++++++++++++ 2 files changed, 157 insertions(+), 91 deletions(-) delete mode 100644 Documentation/devicetree/bindings/net/mediatek-dwmac.txt create mode 100644 Documentation/devicetree/bindings/net/mediatek-dwmac.ya= ml diff --git a/Documentation/devicetree/bindings/net/mediatek-dwmac.txt b/Doc= umentation/devicetree/bindings/net/mediatek-dwmac.txt deleted file mode 100644 index afbcaebf062e..000000000000 --- a/Documentation/devicetree/bindings/net/mediatek-dwmac.txt +++ /dev/null @@ -1,91 +0,0 @@ -MediaTek DWMAC glue layer controller - -This file documents platform glue layer for stmmac. -Please see stmmac.txt for the other unchanged properties. - -The device node has following properties. - -Required properties: -- compatible: Should be "mediatek,mt2712-gmac" for MT2712 SoC -- reg: Address and length of the register set for the device -- interrupts: Should contain the MAC interrupts -- interrupt-names: Should contain a list of interrupt names corresponding = to - the interrupts in the interrupts property, if available. - Should be "macirq" for the main MAC IRQ -- clocks: Must contain a phandle for each entry in clock-names. -- clock-names: The name of the clock listed in the clocks property. These = are - "axi", "apb", "mac_main", "ptp_ref", "rmii_internal" for MT2712 SoC. -- mac-address: See ethernet.txt in the same directory -- phy-mode: See ethernet.txt in the same directory -- mediatek,pericfg: A phandle to the syscon node that control ethernet - interface and timing delay. - -Optional properties: -- mediatek,tx-delay-ps: TX clock delay macro value. Default is 0. - It should be defined for RGMII/MII interface. - It should be defined for RMII interface when the reference clock is from = MT2712 SoC. -- mediatek,rx-delay-ps: RX clock delay macro value. Default is 0. - It should be defined for RGMII/MII interface. - It should be defined for RMII interface. -Both delay properties need to be a multiple of 170 for RGMII interface, -or will round down. Range 0~31*170. -Both delay properties need to be a multiple of 550 for MII/RMII interface, -or will round down. Range 0~31*550. - -- mediatek,rmii-rxc: boolean property, if present indicates that the RMII - reference clock, which is from external PHYs, is connected to RXC pin - on MT2712 SoC. - Otherwise, is connected to TXC pin. -- mediatek,rmii-clk-from-mac: boolean property, if present indicates that - MT2712 SoC provides the RMII reference clock, which outputs to TXC pin on= ly. -- mediatek,txc-inverse: boolean property, if present indicates that - 1. tx clock will be inversed in MII/RGMII case, - 2. tx clock inside MAC will be inversed relative to reference clock - which is from external PHYs in RMII case, and it rarely happen. - 3. the reference clock, which outputs to TXC pin will be inversed in RMII= case - when the reference clock is from MT2712 SoC. -- mediatek,rxc-inverse: boolean property, if present indicates that - 1. rx clock will be inversed in MII/RGMII case. - 2. reference clock will be inversed when arrived at MAC in RMII case, when - the reference clock is from external PHYs. - 3. the inside clock, which be sent to MAC, will be inversed in RMII case = when - the reference clock is from MT2712 SoC. -- assigned-clocks: mac_main and ptp_ref clocks -- assigned-clock-parents: parent clocks of the assigned clocks - -Example: - eth: ethernet@1101c000 { - compatible =3D "mediatek,mt2712-gmac"; - reg =3D <0 0x1101c000 0 0x1300>; - interrupts =3D ; - interrupt-names =3D "macirq"; - phy-mode =3D"rgmii-rxid"; - mac-address =3D [00 55 7b b5 7d f7]; - clock-names =3D "axi", - "apb", - "mac_main", - "ptp_ref", - "rmii_internal"; - clocks =3D <&pericfg CLK_PERI_GMAC>, - <&pericfg CLK_PERI_GMAC_PCLK>, - <&topckgen CLK_TOP_ETHER_125M_SEL>, - <&topckgen CLK_TOP_ETHER_50M_SEL>, - <&topckgen CLK_TOP_ETHER_50M_RMII_SEL>; - assigned-clocks =3D <&topckgen CLK_TOP_ETHER_125M_SEL>, - <&topckgen CLK_TOP_ETHER_50M_SEL>, - <&topckgen CLK_TOP_ETHER_50M_RMII_SEL>; - assigned-clock-parents =3D <&topckgen CLK_TOP_ETHERPLL_125M>, - <&topckgen CLK_TOP_APLL1_D3>, - <&topckgen CLK_TOP_ETHERPLL_50M>; - power-domains =3D <&scpsys MT2712_POWER_DOMAIN_AUDIO>; - mediatek,pericfg =3D <&pericfg>; - mediatek,tx-delay-ps =3D <1530>; - mediatek,rx-delay-ps =3D <1530>; - mediatek,rmii-rxc; - mediatek,txc-inverse; - mediatek,rxc-inverse; - snps,txpbl =3D <1>; - snps,rxpbl =3D <1>; - snps,reset-gpio =3D <&pio 87 GPIO_ACTIVE_LOW>; - snps,reset-active-low; - }; diff --git a/Documentation/devicetree/bindings/net/mediatek-dwmac.yaml b/Do= cumentation/devicetree/bindings/net/mediatek-dwmac.yaml new file mode 100644 index 000000000000..2eb4781536f7 --- /dev/null +++ b/Documentation/devicetree/bindings/net/mediatek-dwmac.yaml @@ -0,0 +1,157 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/mediatek-dwmac.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: MediaTek DWMAC glue layer controller + +maintainers: + - Biao Huang + +description: + This file documents platform glue layer for stmmac. + +# We need a select here so we don't match all nodes with 'snps,dwmac' +select: + properties: + compatible: + contains: + enum: + - mediatek,mt2712-gmac + required: + - compatible + +allOf: + - $ref: "snps,dwmac.yaml#" + - $ref: "ethernet-controller.yaml#" + +properties: + compatible: + oneOf: + - items: + - enum: + - mediatek,mt2712-gmac + - const: snps,dwmac-4.20a + + clocks: + items: + - description: AXI clock + - description: APB clock + - description: MAC Main clock + - description: PTP clock + - description: RMII reference clock provided by MAC + + clock-names: + items: + - const: axi + - const: apb + - const: mac_main + - const: ptp_ref + - const: rmii_internal + + mediatek,pericfg: + $ref: /schemas/types.yaml#/definitions/phandle + description: + The phandle to the syscon node that control ethernet + interface and timing delay. + + mediatek,tx-delay-ps: + description: + The internal TX clock delay (provided by this driver) in nanoseconds. + For MT2712 RGMII interface, Allowed value need to be a multiple of 1= 70, + or will round down. Range 0~31*170. + For MT2712 RMII/MII interface, Allowed value need to be a multiple o= f 550, + or will round down. Range 0~31*550. + + mediatek,rx-delay-ps: + description: + The internal RX clock delay (provided by this driver) in nanoseconds. + For MT2712 RGMII interface, Allowed value need to be a multiple of 1= 70, + or will round down. Range 0~31*170. + For MT2712 RMII/MII interface, Allowed value need to be a multiple o= f 550, + or will round down. Range 0~31*550. + + mediatek,rmii-rxc: + type: boolean + description: + If present, indicates that the RMII reference clock, which is from e= xternal + PHYs, is connected to RXC pin. Otherwise, is connected to TXC pin. + + mediatek,rmii-clk-from-mac: + type: boolean + description: + If present, indicates that MAC provides the RMII reference clock, wh= ich + outputs to TXC pin only. + + mediatek,txc-inverse: + type: boolean + description: + If present, indicates that + 1. tx clock will be inversed in MII/RGMII case, + 2. tx clock inside MAC will be inversed relative to reference clock + which is from external PHYs in RMII case, and it rarely happen. + 3. the reference clock, which outputs to TXC pin will be inversed in= RMII case + when the reference clock is from MAC. + + mediatek,rxc-inverse: + type: boolean + description: + If present, indicates that + 1. rx clock will be inversed in MII/RGMII case. + 2. reference clock will be inversed when arrived at MAC in RMII case= , when + the reference clock is from external PHYs. + 3. the inside clock, which be sent to MAC, will be inversed in RMII = case when + the reference clock is from MAC. + +required: + - compatible + - reg + - interrupts + - interrupt-names + - clocks + - clock-names + - phy-mode + - mediatek,pericfg + +unevaluatedProperties: false + +examples: + - | + #include + #include + #include + #include + #include + + eth: ethernet@1101c000 { + compatible =3D "mediatek,mt2712-gmac", "snps,dwmac-4.20a"; + reg =3D <0x1101c000 0x1300>; + interrupts =3D ; + interrupt-names =3D "macirq"; + phy-mode =3D"rgmii-rxid"; + mac-address =3D [00 55 7b b5 7d f7]; + clock-names =3D "axi", + "apb", + "mac_main", + "ptp_ref", + "rmii_internal"; + clocks =3D <&pericfg CLK_PERI_GMAC>, + <&pericfg CLK_PERI_GMAC_PCLK>, + <&topckgen CLK_TOP_ETHER_125M_SEL>, + <&topckgen CLK_TOP_ETHER_50M_SEL>, + <&topckgen CLK_TOP_ETHER_50M_RMII_SEL>; + assigned-clocks =3D <&topckgen CLK_TOP_ETHER_125M_SEL>, + <&topckgen CLK_TOP_ETHER_50M_SEL>, + <&topckgen CLK_TOP_ETHER_50M_RMII_SEL>; + assigned-clock-parents =3D <&topckgen CLK_TOP_ETHERPLL_125M>, + <&topckgen CLK_TOP_APLL1_D3>, + <&topckgen CLK_TOP_ETHERPLL_50M>; + power-domains =3D <&scpsys MT2712_POWER_DOMAIN_AUDIO>; + mediatek,pericfg =3D <&pericfg>; + mediatek,tx-delay-ps =3D <1530>; + snps,txpbl =3D <1>; + snps,rxpbl =3D <1>; + snps,reset-gpio =3D <&pio 87 GPIO_ACTIVE_LOW>; + snps,reset-delays-us =3D <0 10000 10000>; + }; --=20 2.25.1 From nobody Sun Sep 22 13:19:55 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 252C1C433EF for ; Fri, 12 Nov 2021 09:39:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0BB0B60EFD for ; Fri, 12 Nov 2021 09:39:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234829AbhKLJmn (ORCPT ); Fri, 12 Nov 2021 04:42:43 -0500 Received: from mailgw02.mediatek.com ([210.61.82.184]:45368 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S234845AbhKLJmb (ORCPT ); Fri, 12 Nov 2021 04:42:31 -0500 X-UUID: a8c51bd2871e4e4ba58281b5d08df91c-20211112 X-UUID: a8c51bd2871e4e4ba58281b5d08df91c-20211112 Received: from mtkmbs10n1.mediatek.inc [(172.21.101.34)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 325777355; Fri, 12 Nov 2021 17:39:34 +0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.3; Fri, 12 Nov 2021 17:39:33 +0800 Received: from localhost.localdomain (10.17.3.154) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 12 Nov 2021 17:39:32 +0800 From: Biao Huang To: , Jakub Kicinski , Rob Herring CC: Matthias Brugger , Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , Maxime Coquelin , Biao Huang , , , , , , , , , , Subject: [PATCH v3 5/7] net-next: stmmac: dwmac-mediatek: add support for mt8195 Date: Fri, 12 Nov 2021 17:39:16 +0800 Message-ID: <20211112093918.11061-6-biao.huang@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211112093918.11061-1-biao.huang@mediatek.com> References: <20211112093918.11061-1-biao.huang@mediatek.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add Ethernet support for MediaTek SoCs from the mt8195 family. Signed-off-by: Biao Huang --- .../ethernet/stmicro/stmmac/dwmac-mediatek.c | 253 +++++++++++++++++- 1 file changed, 252 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c b/drivers= /net/ethernet/stmicro/stmmac/dwmac-mediatek.c index 6ea972e96665..cde2c6237697 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c @@ -40,6 +40,33 @@ #define ETH_FINE_DLY_GTXC BIT(1) #define ETH_FINE_DLY_RXC BIT(0) =20 +/* Peri Configuration register for mt8195 */ +#define MT8195_PERI_ETH_CTRL0 0xFD0 +#define MT8195_RMII_CLK_SRC_INTERNAL BIT(28) +#define MT8195_RMII_CLK_SRC_RXC BIT(27) +#define MT8195_ETH_INTF_SEL GENMASK(26, 24) +#define MT8195_RGMII_TXC_PHASE_CTRL BIT(22) +#define MT8195_EXT_PHY_MODE BIT(21) +#define MT8195_DLY_GTXC_INV BIT(12) +#define MT8195_DLY_GTXC_ENABLE BIT(5) +#define MT8195_DLY_GTXC_STAGES GENMASK(4, 0) + +#define MT8195_PERI_ETH_CTRL1 0xFD4 +#define MT8195_DLY_RXC_INV BIT(25) +#define MT8195_DLY_RXC_ENABLE BIT(18) +#define MT8195_DLY_RXC_STAGES GENMASK(17, 13) +#define MT8195_DLY_TXC_INV BIT(12) +#define MT8195_DLY_TXC_ENABLE BIT(5) +#define MT8195_DLY_TXC_STAGES GENMASK(4, 0) + +#define MT8195_PERI_ETH_CTRL2 0xFD8 +#define MT8195_DLY_RMII_RXC_INV BIT(25) +#define MT8195_DLY_RMII_RXC_ENABLE BIT(18) +#define MT8195_DLY_RMII_RXC_STAGES GENMASK(17, 13) +#define MT8195_DLY_RMII_TXC_INV BIT(12) +#define MT8195_DLY_RMII_TXC_ENABLE BIT(5) +#define MT8195_DLY_RMII_TXC_STAGES GENMASK(4, 0) + struct mac_delay_struct { u32 tx_delay; u32 rx_delay; @@ -58,11 +85,13 @@ struct mediatek_dwmac_plat_data { int num_clks_to_config; bool rmii_clk_from_mac; bool rmii_rxc; + bool mac_wol; }; =20 struct mediatek_dwmac_variant { int (*dwmac_set_phy_interface)(struct mediatek_dwmac_plat_data *plat); int (*dwmac_set_delay)(struct mediatek_dwmac_plat_data *plat); + void (*dwmac_fix_mac_speed)(void *priv, unsigned int speed); =20 /* clock ids to be requested */ const char * const *clk_list; @@ -78,6 +107,10 @@ static const char * const mt2712_dwmac_clk_l[] =3D { "axi", "apb", "mac_main", "ptp_ref", "rmii_internal" }; =20 +static const char * const mt8195_dwmac_clk_l[] =3D { + "axi", "apb", "mac_cg", "mac_main", "ptp_ref", "rmii_internal" +}; + static int mt2712_set_interface(struct mediatek_dwmac_plat_data *plat) { int rmii_clk_from_mac =3D plat->rmii_clk_from_mac ? RMII_CLK_SRC_INTERNAL= : 0; @@ -268,6 +301,204 @@ static const struct mediatek_dwmac_variant mt2712_gma= c_variant =3D { .tx_delay_max =3D 17600, }; =20 +static int mt8195_set_interface(struct mediatek_dwmac_plat_data *plat) +{ + int rmii_clk_from_mac =3D plat->rmii_clk_from_mac ? MT8195_RMII_CLK_SRC_I= NTERNAL : 0; + int rmii_rxc =3D plat->rmii_rxc ? MT8195_RMII_CLK_SRC_RXC : 0; + u32 intf_val =3D 0; + + /* The clock labeled as "rmii_internal" in mt8195_dwmac_clk_l is needed + * only in RMII(when MAC provides the reference clock), and useless for + * RGMII/MII/RMII(when PHY provides the reference clock). + * num_clks_to_config indicates the real number of clocks should be + * configured, equals to (plat->variant->num_clks - 1) in default for all= the case, + * then +1 for rmii_clk_from_mac case. + */ + plat->num_clks_to_config =3D plat->variant->num_clks - 1; + + /* select phy interface in top control domain */ + switch (plat->phy_mode) { + case PHY_INTERFACE_MODE_MII: + intf_val |=3D FIELD_PREP(MT8195_ETH_INTF_SEL, PHY_INTF_MII); + break; + case PHY_INTERFACE_MODE_RMII: + if (plat->rmii_clk_from_mac) + plat->num_clks_to_config++; + intf_val |=3D (rmii_rxc | rmii_clk_from_mac); + intf_val |=3D FIELD_PREP(MT8195_ETH_INTF_SEL, PHY_INTF_RMII); + break; + case PHY_INTERFACE_MODE_RGMII: + case PHY_INTERFACE_MODE_RGMII_TXID: + case PHY_INTERFACE_MODE_RGMII_RXID: + case PHY_INTERFACE_MODE_RGMII_ID: + intf_val |=3D FIELD_PREP(MT8195_ETH_INTF_SEL, PHY_INTF_RGMII); + break; + default: + dev_err(plat->dev, "phy interface not supported\n"); + return -EINVAL; + } + + /* MT8195 only support external PHY */ + intf_val |=3D MT8195_EXT_PHY_MODE; + + regmap_write(plat->peri_regmap, MT8195_PERI_ETH_CTRL0, intf_val); + + return 0; +} + +static void mt8195_delay_ps2stage(struct mediatek_dwmac_plat_data *plat) +{ + struct mac_delay_struct *mac_delay =3D &plat->mac_delay; + + /* 290ps per stage */ + mac_delay->tx_delay /=3D 290; + mac_delay->rx_delay /=3D 290; +} + +static void mt8195_delay_stage2ps(struct mediatek_dwmac_plat_data *plat) +{ + struct mac_delay_struct *mac_delay =3D &plat->mac_delay; + + /* 290ps per stage */ + mac_delay->tx_delay *=3D 290; + mac_delay->rx_delay *=3D 290; +} + +static int mt8195_set_delay(struct mediatek_dwmac_plat_data *plat) +{ + struct mac_delay_struct *mac_delay =3D &plat->mac_delay; + u32 gtxc_delay_val, delay_val =3D 0, rmii_delay_val =3D 0; + + mt8195_delay_ps2stage(plat); + + switch (plat->phy_mode) { + case PHY_INTERFACE_MODE_MII: + delay_val |=3D FIELD_PREP(MT8195_DLY_TXC_ENABLE, !!mac_delay->tx_delay); + delay_val |=3D FIELD_PREP(MT8195_DLY_TXC_STAGES, mac_delay->tx_delay); + delay_val |=3D FIELD_PREP(MT8195_DLY_TXC_INV, mac_delay->tx_inv); + + delay_val |=3D FIELD_PREP(MT8195_DLY_RXC_ENABLE, !!mac_delay->rx_delay); + delay_val |=3D FIELD_PREP(MT8195_DLY_RXC_STAGES, mac_delay->rx_delay); + delay_val |=3D FIELD_PREP(MT8195_DLY_RXC_INV, mac_delay->rx_inv); + break; + case PHY_INTERFACE_MODE_RMII: + if (plat->rmii_clk_from_mac) { + /* case 1: mac provides the rmii reference clock, + * and the clock output to TXC pin. + * The egress timing can be adjusted by RMII_TXC delay macro circuit. + * The ingress timing can be adjusted by RMII_RXC delay macro circuit. + */ + rmii_delay_val |=3D FIELD_PREP(MT8195_DLY_RMII_TXC_ENABLE, + !!mac_delay->tx_delay); + rmii_delay_val |=3D FIELD_PREP(MT8195_DLY_RMII_TXC_STAGES, + mac_delay->tx_delay); + rmii_delay_val |=3D FIELD_PREP(MT8195_DLY_RMII_TXC_INV, + mac_delay->tx_inv); + + rmii_delay_val |=3D FIELD_PREP(MT8195_DLY_RMII_RXC_ENABLE, + !!mac_delay->rx_delay); + rmii_delay_val |=3D FIELD_PREP(MT8195_DLY_RMII_RXC_STAGES, + mac_delay->rx_delay); + rmii_delay_val |=3D FIELD_PREP(MT8195_DLY_RMII_RXC_INV, + mac_delay->rx_inv); + } else { + /* case 2: the rmii reference clock is from external phy, + * and the property "rmii_rxc" indicates which pin(TXC/RXC) + * the reference clk is connected to. The reference clock is a + * received signal, so rx_delay/rx_inv are used to indicate + * the reference clock timing adjustment + */ + if (plat->rmii_rxc) { + /* the rmii reference clock from outside is connected + * to RXC pin, the reference clock will be adjusted + * by RXC delay macro circuit. + */ + delay_val |=3D FIELD_PREP(MT8195_DLY_RXC_ENABLE, + !!mac_delay->rx_delay); + delay_val |=3D FIELD_PREP(MT8195_DLY_RXC_STAGES, + mac_delay->rx_delay); + delay_val |=3D FIELD_PREP(MT8195_DLY_RXC_INV, + mac_delay->rx_inv); + } else { + /* the rmii reference clock from outside is connected + * to TXC pin, the reference clock will be adjusted + * by TXC delay macro circuit. + */ + delay_val |=3D FIELD_PREP(MT8195_DLY_TXC_ENABLE, + !!mac_delay->rx_delay); + delay_val |=3D FIELD_PREP(MT8195_DLY_TXC_STAGES, + mac_delay->rx_delay); + delay_val |=3D FIELD_PREP(MT8195_DLY_TXC_INV, + mac_delay->rx_inv); + } + } + break; + case PHY_INTERFACE_MODE_RGMII: + case PHY_INTERFACE_MODE_RGMII_TXID: + case PHY_INTERFACE_MODE_RGMII_RXID: + case PHY_INTERFACE_MODE_RGMII_ID: + gtxc_delay_val |=3D FIELD_PREP(MT8195_DLY_GTXC_ENABLE, !!mac_delay->tx_d= elay); + gtxc_delay_val |=3D FIELD_PREP(MT8195_DLY_GTXC_STAGES, mac_delay->tx_del= ay); + gtxc_delay_val |=3D FIELD_PREP(MT8195_DLY_GTXC_INV, mac_delay->tx_inv); + + delay_val |=3D FIELD_PREP(MT8195_DLY_RXC_ENABLE, !!mac_delay->rx_delay); + delay_val |=3D FIELD_PREP(MT8195_DLY_RXC_STAGES, mac_delay->rx_delay); + delay_val |=3D FIELD_PREP(MT8195_DLY_RXC_INV, mac_delay->rx_inv); + + break; + default: + dev_err(plat->dev, "phy interface not supported\n"); + return -EINVAL; + } + + regmap_update_bits(plat->peri_regmap, + MT8195_PERI_ETH_CTRL0, + MT8195_RGMII_TXC_PHASE_CTRL | + MT8195_DLY_GTXC_INV | + MT8195_DLY_GTXC_ENABLE | + MT8195_DLY_GTXC_STAGES, + gtxc_delay_val); + regmap_write(plat->peri_regmap, MT8195_PERI_ETH_CTRL1, delay_val); + regmap_write(plat->peri_regmap, MT8195_PERI_ETH_CTRL2, rmii_delay_val); + + mt8195_delay_stage2ps(plat); + + return 0; +} + +static void mt8195_fix_mac_speed(void *priv, unsigned int speed) +{ + struct mediatek_dwmac_plat_data *priv_plat =3D priv; + + if ((phy_interface_mode_is_rgmii(priv_plat->phy_mode))) { + /* prefer 2ns fixed delay which is controlled by TXC_PHASE_CTRL, + * when link speed is 1Gbps with RGMII interface, + * Fall back to delay macro circuit for 10/100Mbps link speed. + */ + if (speed =3D=3D SPEED_1000) + regmap_update_bits(priv_plat->peri_regmap, + MT8195_PERI_ETH_CTRL0, + MT8195_RGMII_TXC_PHASE_CTRL | + MT8195_DLY_GTXC_ENABLE | + MT8195_DLY_GTXC_INV | + MT8195_DLY_GTXC_STAGES, + MT8195_RGMII_TXC_PHASE_CTRL); + else + mt8195_set_delay(priv_plat); + } +} + +static const struct mediatek_dwmac_variant mt8195_gmac_variant =3D { + .dwmac_set_phy_interface =3D mt8195_set_interface, + .dwmac_set_delay =3D mt8195_set_delay, + .dwmac_fix_mac_speed =3D mt8195_fix_mac_speed, + .clk_list =3D mt8195_dwmac_clk_l, + .num_clks =3D ARRAY_SIZE(mt8195_dwmac_clk_l), + .dma_bit_mask =3D 35, + .rx_delay_max =3D 9280, + .tx_delay_max =3D 9280, +}; + static int mediatek_dwmac_config_dt(struct mediatek_dwmac_plat_data *plat) { struct mac_delay_struct *mac_delay =3D &plat->mac_delay; @@ -308,6 +539,7 @@ static int mediatek_dwmac_config_dt(struct mediatek_dwm= ac_plat_data *plat) mac_delay->rx_inv =3D of_property_read_bool(plat->np, "mediatek,rxc-inver= se"); plat->rmii_rxc =3D of_property_read_bool(plat->np, "mediatek,rmii-rxc"); plat->rmii_clk_from_mac =3D of_property_read_bool(plat->np, "mediatek,rmi= i-clk-from-mac"); + plat->mac_wol =3D of_property_read_bool(plat->np, "mediatek,mac-wol"); =20 return 0; } @@ -384,6 +616,7 @@ static int mediatek_dwmac_clks_config(void *priv, bool = enabled) =20 return ret; } + static int mediatek_dwmac_probe(struct platform_device *pdev) { struct mediatek_dwmac_plat_data *priv_plat; @@ -421,7 +654,7 @@ static int mediatek_dwmac_probe(struct platform_device = *pdev) return PTR_ERR(plat_dat); =20 plat_dat->interface =3D priv_plat->phy_mode; - plat_dat->use_phy_wol =3D 1; + plat_dat->use_phy_wol =3D priv_plat->mac_wol ? 0 : 1; plat_dat->riwt_off =3D 1; plat_dat->maxmtu =3D ETH_DATA_LEN; plat_dat->addr64 =3D priv_plat->variant->dma_bit_mask; @@ -429,7 +662,23 @@ static int mediatek_dwmac_probe(struct platform_device= *pdev) plat_dat->init =3D mediatek_dwmac_init; plat_dat->exit =3D mediatek_dwmac_exit; plat_dat->clks_config =3D mediatek_dwmac_clks_config; + if (priv_plat->variant->dwmac_fix_mac_speed) + plat_dat->fix_mac_speed =3D priv_plat->variant->dwmac_fix_mac_speed; + plat_dat->safety_feat_cfg =3D devm_kzalloc(&pdev->dev, + sizeof(*plat_dat->safety_feat_cfg), + GFP_KERNEL); + if (!plat_dat->safety_feat_cfg) + return -ENOMEM; =20 + plat_dat->safety_feat_cfg->tsoee =3D 1; + plat_dat->safety_feat_cfg->mrxpee =3D 0; + plat_dat->safety_feat_cfg->mestee =3D 1; + plat_dat->safety_feat_cfg->mrxee =3D 1; + plat_dat->safety_feat_cfg->mtxee =3D 1; + plat_dat->safety_feat_cfg->epsi =3D 0; + plat_dat->safety_feat_cfg->edpp =3D 1; + plat_dat->safety_feat_cfg->prtyen =3D 1; + plat_dat->safety_feat_cfg->tmouten =3D 1; mediatek_dwmac_init(pdev, priv_plat); =20 ret =3D stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); @@ -444,6 +693,8 @@ static int mediatek_dwmac_probe(struct platform_device = *pdev) static const struct of_device_id mediatek_dwmac_match[] =3D { { .compatible =3D "mediatek,mt2712-gmac", .data =3D &mt2712_gmac_variant }, + { .compatible =3D "mediatek,mt8195-gmac", + .data =3D &mt8195_gmac_variant }, { } }; =20 --=20 2.25.1 From nobody Sun Sep 22 13:19:55 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ACC4DC4332F for ; Fri, 12 Nov 2021 09:39:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9992560F70 for ; Fri, 12 Nov 2021 09:39:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234921AbhKLJmk (ORCPT ); Fri, 12 Nov 2021 04:42:40 -0500 Received: from mailgw02.mediatek.com ([210.61.82.184]:45332 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S234842AbhKLJma (ORCPT ); Fri, 12 Nov 2021 04:42:30 -0500 X-UUID: 8eea282ac0764cae9fa7537280692ae5-20211112 X-UUID: 8eea282ac0764cae9fa7537280692ae5-20211112 Received: from mtkmbs10n1.mediatek.inc [(172.21.101.34)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 2039753713; Fri, 12 Nov 2021 17:39:34 +0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.3; Fri, 12 Nov 2021 17:39:34 +0800 Received: from localhost.localdomain (10.17.3.154) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 12 Nov 2021 17:39:33 +0800 From: Biao Huang To: , Jakub Kicinski , Rob Herring CC: Matthias Brugger , Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , Maxime Coquelin , Biao Huang , , , , , , , , , , Subject: [PATCH v3 6/7] arm64: dts: mt8195: add ethernet device node Date: Fri, 12 Nov 2021 17:39:17 +0800 Message-ID: <20211112093918.11061-7-biao.huang@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211112093918.11061-1-biao.huang@mediatek.com> References: <20211112093918.11061-1-biao.huang@mediatek.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This patch adds device node for mt8195 ethernet. Signed-off-by: Biao Huang --- arch/arm64/boot/dts/mediatek/mt8195-evb.dts | 92 +++++++++++++++++++++ arch/arm64/boot/dts/mediatek/mt8195.dtsi | 70 ++++++++++++++++ 2 files changed, 162 insertions(+) diff --git a/arch/arm64/boot/dts/mediatek/mt8195-evb.dts b/arch/arm64/boot/= dts/mediatek/mt8195-evb.dts index 5cce9a5d3163..d90308f80229 100644 --- a/arch/arm64/boot/dts/mediatek/mt8195-evb.dts +++ b/arch/arm64/boot/dts/mediatek/mt8195-evb.dts @@ -5,6 +5,8 @@ */ /dts-v1/; #include "mt8195.dtsi" +#include +#include =20 / { model =3D "MediaTek MT8195 evaluation board"; @@ -32,6 +34,96 @@ reserved_memory: reserved-memory { }; }; =20 +ð { + phy-mode =3D"rgmii-rxid"; + phy-handle =3D <ð_phy0>; + snps,reset-gpio =3D <&pio 93 GPIO_ACTIVE_HIGH>; + snps,reset-delays-us =3D <0 10000 10000>; + mediatek,tx-delay-ps =3D <2030>; + pinctrl-names =3D "default", "sleep"; + pinctrl-0 =3D <ð_default>; + pinctrl-1 =3D <ð_sleep>; + status =3D "okay"; + + mdio { + compatible =3D "snps,dwmac-mdio"; + #address-cells =3D <1>; + #size-cells =3D <0>; + eth_phy0: eth_phy0@1 { + compatible =3D "ethernet-phy-id001c.c916"; + reg =3D <0x1>; + }; + }; +}; + +&pio { + eth_default: eth_default { + txd_pins { + pinmux =3D , + , + , + ; + drive-strength =3D ; + }; + cc_pins { + pinmux =3D , + , + , + ; + drive-strength =3D ; + }; + rxd_pins { + pinmux =3D , + , + , + ; + }; + mdio_pins { + pinmux =3D , + ; + input-enable; + }; + power_pins { + pinmux =3D , + ; + output-high; + }; + }; + + eth_sleep: eth_sleep { + txd_pins { + pinmux =3D , + , + , + ; + }; + cc_pins { + pinmux =3D , + , + , + ; + }; + rxd_pins { + pinmux =3D , + , + , + ; + }; + mdio_pins { + pinmux =3D , + ; + input-disable; + bias-disable; + }; + power_pins { + pinmux =3D , + ; + input-disable; + bias-disable; + }; + }; +}; + &uart0 { status =3D "okay"; }; diff --git a/arch/arm64/boot/dts/mediatek/mt8195.dtsi b/arch/arm64/boot/dts= /mediatek/mt8195.dtsi index a59c0e9d1fc2..f30a60dca5ef 100644 --- a/arch/arm64/boot/dts/mediatek/mt8195.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8195.dtsi @@ -823,6 +823,76 @@ spis1: spi@1101e000 { status =3D "disabled"; }; =20 + eth: ethernet@11021000 { + compatible =3D "mediatek,mt8195-gmac", "snps,dwmac-5.10a"; + reg =3D <0 0x11021000 0 0x4000>; + interrupts =3D ; + interrupt-names =3D "macirq"; + mac-address =3D [00 55 7b b5 7d f7]; + clock-names =3D "axi", + "apb", + "mac_cg", + "mac_main", + "ptp_ref", + "rmii_internal"; + clocks =3D <&pericfg_ao CLK_PERI_AO_ETHERNET>, + <&pericfg_ao CLK_PERI_AO_ETHERNET_BUS>, + <&pericfg_ao CLK_PERI_AO_ETHERNET_MAC>, + <&topckgen CLK_TOP_SNPS_ETH_250M>, + <&topckgen CLK_TOP_SNPS_ETH_62P4M_PTP>, + <&topckgen CLK_TOP_SNPS_ETH_50M_RMII>; + assigned-clocks =3D <&topckgen CLK_TOP_SNPS_ETH_250M>, + <&topckgen CLK_TOP_SNPS_ETH_62P4M_PTP>, + <&topckgen CLK_TOP_SNPS_ETH_50M_RMII>; + assigned-clock-parents =3D <&topckgen CLK_TOP_ETHPLL_D2>, + <&topckgen CLK_TOP_ETHPLL_D8>, + <&topckgen CLK_TOP_ETHPLL_D10>; + power-domains =3D <&spm MT8195_POWER_DOMAIN_ETHER>; + mediatek,pericfg =3D <&infracfg_ao>; + snps,axi-config =3D <&stmmac_axi_setup>; + snps,mtl-rx-config =3D <&mtl_rx_setup>; + snps,mtl-tx-config =3D <&mtl_tx_setup>; + snps,txpbl =3D <16>; + snps,rxpbl =3D <16>; + clk_csr =3D <0>; + status =3D "disabled"; + + stmmac_axi_setup: stmmac-axi-config { + snps,wr_osr_lmt =3D <0x7>; + snps,rd_osr_lmt =3D <0x7>; + snps,blen =3D <0 0 0 0 16 8 4>; + }; + + mtl_rx_setup: rx-queues-config { + snps,rx-queues-to-use =3D <1>; + snps,rx-sched-sp; + queue0 { + snps,dcb-algorithm; + snps,map-to-dma-channel =3D <0x0>; + snps,priority =3D <0x0>; + }; + }; + mtl_tx_setup: tx-queues-config { + snps,tx-queues-to-use =3D <3>; + snps,tx-sched-wrr; + queue0 { + snps,weight =3D <0x10>; + snps,dcb-algorithm; + snps,priority =3D <0x0>; + }; + queue1 { + snps,weight =3D <0x11>; + snps,dcb-algorithm; + snps,priority =3D <0x1>; + }; + queue2 { + snps,weight =3D <0x12>; + snps,dcb-algorithm; + snps,priority =3D <0x2>; + }; + }; + }; + mmc0: mmc@11230000 { compatible =3D "mediatek,mt8195-mmc", "mediatek,mt8192-mmc"; reg =3D <0 0x11230000 0 0x10000>, --=20 2.25.1 From nobody Sun Sep 22 13:19:55 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BBE62C43219 for ; Fri, 12 Nov 2021 09:39:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AAAF260F70 for ; Fri, 12 Nov 2021 09:39:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234890AbhKLJmi (ORCPT ); Fri, 12 Nov 2021 04:42:38 -0500 Received: from mailgw02.mediatek.com ([210.61.82.184]:45286 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S234833AbhKLJm3 (ORCPT ); Fri, 12 Nov 2021 04:42:29 -0500 X-UUID: 545a94a53af74a1290237e60eb662820-20211112 X-UUID: 545a94a53af74a1290237e60eb662820-20211112 Received: from mtkexhb02.mediatek.inc [(172.21.101.103)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 584415706; Fri, 12 Nov 2021 17:39:36 +0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.15; Fri, 12 Nov 2021 17:39:35 +0800 Received: from localhost.localdomain (10.17.3.154) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 12 Nov 2021 17:39:34 +0800 From: Biao Huang To: , Jakub Kicinski , Rob Herring CC: Matthias Brugger , Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , Maxime Coquelin , Biao Huang , , , , , , , , , , Subject: [PATCH v3 7/7] net-next: dt-bindings: dwmac: add support for mt8195 Date: Fri, 12 Nov 2021 17:39:18 +0800 Message-ID: <20211112093918.11061-8-biao.huang@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211112093918.11061-1-biao.huang@mediatek.com> References: <20211112093918.11061-1-biao.huang@mediatek.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add binding document for the ethernet on mt8195. Signed-off-by: Biao Huang --- .../bindings/net/mediatek-dwmac.yaml | 86 +++++++++++++++---- 1 file changed, 70 insertions(+), 16 deletions(-) diff --git a/Documentation/devicetree/bindings/net/mediatek-dwmac.yaml b/Do= cumentation/devicetree/bindings/net/mediatek-dwmac.yaml index 2eb4781536f7..b27566ed01c6 100644 --- a/Documentation/devicetree/bindings/net/mediatek-dwmac.yaml +++ b/Documentation/devicetree/bindings/net/mediatek-dwmac.yaml @@ -19,12 +19,68 @@ select: contains: enum: - mediatek,mt2712-gmac + - mediatek,mt8195-gmac required: - compatible =20 allOf: - $ref: "snps,dwmac.yaml#" - $ref: "ethernet-controller.yaml#" + - if: + properties: + compatible: + contains: + enum: + - mediatek,mt2712-gmac + + then: + properties: + clocks: + minItems: 5 + items: + - description: AXI clock + - description: APB clock + - description: MAC Main clock + - description: PTP clock + - description: RMII reference clock provided by MAC + + clock-names: + minItems: 5 + items: + - const: axi + - const: apb + - const: mac_main + - const: ptp_ref + - const: rmii_internal + + - if: + properties: + compatible: + contains: + enum: + - mediatek,mt8195-gmac + + then: + properties: + clocks: + minItems: 6 + items: + - description: AXI clock + - description: APB clock + - description: MAC clock gate + - description: MAC Main clock + - description: PTP clock + - description: RMII reference clock provided by MAC + + clock-names: + minItems: 6 + items: + - const: axi + - const: apb + - const: mac_cg + - const: mac_main + - const: ptp_ref + - const: rmii_internal =20 properties: compatible: @@ -33,22 +89,10 @@ properties: - enum: - mediatek,mt2712-gmac - const: snps,dwmac-4.20a - - clocks: - items: - - description: AXI clock - - description: APB clock - - description: MAC Main clock - - description: PTP clock - - description: RMII reference clock provided by MAC - - clock-names: - items: - - const: axi - - const: apb - - const: mac_main - - const: ptp_ref - - const: rmii_internal + - items: + - enum: + - mediatek,mt8195-gmac + - const: snps,dwmac-5.10a =20 mediatek,pericfg: $ref: /schemas/types.yaml#/definitions/phandle @@ -63,6 +107,8 @@ properties: or will round down. Range 0~31*170. For MT2712 RMII/MII interface, Allowed value need to be a multiple o= f 550, or will round down. Range 0~31*550. + For MT8195 RGMII/RMII/MII interface, Allowed value need to be a mult= iple of 290, + or will round down. Range 0~31*290. =20 mediatek,rx-delay-ps: description: @@ -71,6 +117,8 @@ properties: or will round down. Range 0~31*170. For MT2712 RMII/MII interface, Allowed value need to be a multiple o= f 550, or will round down. Range 0~31*550. + For MT8195 RGMII/RMII/MII interface, Allowed value need to be a mult= iple + of 290, or will round down. Range 0~31*290. =20 mediatek,rmii-rxc: type: boolean @@ -104,6 +152,12 @@ properties: 3. the inside clock, which be sent to MAC, will be inversed in RMII = case when the reference clock is from MAC. =20 + mediatek,mac-wol: + type: boolean + description: + If present, indicates that MAC supports WOL(Wake-On-LAN), and MAC WO= L will be enabled. + Otherwise, PHY WOL is perferred. + required: - compatible - reg --=20 2.25.1