From patchwork Thu Jul 29 20:10:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Moon X-Patchwork-Id: 489124 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2B12C4320A for ; Thu, 29 Jul 2021 20:11:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8B52760F0F for ; Thu, 29 Jul 2021 20:11:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232750AbhG2ULd (ORCPT ); Thu, 29 Jul 2021 16:11:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229655AbhG2ULc (ORCPT ); Thu, 29 Jul 2021 16:11:32 -0400 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 651CCC061765; Thu, 29 Jul 2021 13:11:28 -0700 (PDT) Received: by mail-pj1-x1031.google.com with SMTP id g23-20020a17090a5797b02901765d605e14so11126496pji.5; Thu, 29 Jul 2021 13:11:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QuibBDljza9+RanigNcsGbAD/Bl63vVbtTN8yokwV00=; b=KJTLA5BADvsEc4snFUUYn0AqkGNtsRftFI8d/hubfBe0MsnO5KAfuQzKkMcWrgG5jz VNXcs1ccs+nVVGb6/YA6jlqOxnORL1+qZAYk4abhc0SbjFcuzP1cEHJaVqlHqxBmR7+W MB1dun1i1H1Wg01eKdMCvBj+AX4Cv2aqVoAPE982Y9Yo6SqZne8y//+xaQmOibKRfXFQ lmm6affl0PS5lRD6q7Xc8U0D0In1Q1ZJE3MnAFfWb/78h0ZbnfMD0WXMwZlmkEXsDREe 1ILX5IpiE9TvrsL6gTeFhlGL6QRP0TbXkWtVgyGCMz9CSZqMPHBheaky7EFazV11vPsa KYHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QuibBDljza9+RanigNcsGbAD/Bl63vVbtTN8yokwV00=; b=PMHAnzuSSlU7lEuHp79deuDW16NTZPtoL5SZ+mN36XasJIaGBEmlqBRY0eBBQyFEoD 2XxC5FvKxQrnVmMo6nCICW9NoGNmOKcdFpJWD3ly3UD6bK6zOwLHY5bGA7IzenM/vy31 Nf5ydZU8B+79Ce4vNYfbR18rqVv7o2fWXIlZ8PNNR9lzo6TZcp6FuqdnAuzsaNMTrPwO 7l6oOkKjO32bcUPkb26DCkj/ARYFIyH6y6EtqQw3pO+V33c4jBpMLivDQdHng8BUtSyO RBXgU39T0jmL5tKdFPFQb2MY8Svr8tbpNhuyverPM7WIiIhbtR/EdSXYzDGDeb64DoSE xuow== X-Gm-Message-State: AOAM533RSZ0j5fALxBfzmyWPir6uD7RD8sG8VIatZIh0QHKlEOIMNNuv f2lpWtIU284agCgGXYzmJOBRcKTmZijbrg== X-Google-Smtp-Source: ABdhPJxFrMpP2T7mTwT1/NZWyi0QSLLwXHv3nNxFg5K1uwnPr5fLpHAgkSkXf0tzZ/xV4F5/yMLS9g== X-Received: by 2002:aa7:80d9:0:b029:2ed:49fa:6dc5 with SMTP id a25-20020aa780d90000b02902ed49fa6dc5mr6718675pfn.3.1627589487476; Thu, 29 Jul 2021 13:11:27 -0700 (PDT) Received: from archl-on1.. ([103.51.72.31]) by smtp.gmail.com with ESMTPSA id i25sm4581407pfo.20.2021.07.29.13.11.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Jul 2021 13:11:27 -0700 (PDT) From: Anand Moon To: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, devicetree@vger.kernel.org Cc: Anand Moon , Jerome Brunet , Neil Armstrong , Martin Blumenstingl , Rob Herring , Kevin Hilman , Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , "David S. Miller" , Jakub Kicinski , Maxime Coquelin , Philipp Zabel , Emiliano Ingrassia Subject: [PATCHv1 1/3] arm64: dts: amlogic: add missing ethernet reset ID Date: Fri, 30 Jul 2021 01:40:50 +0530 Message-Id: <20210729201100.3994-2-linux.amoon@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210729201100.3994-1-linux.amoon@gmail.com> References: <20210729201100.3994-1-linux.amoon@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add reset external reset of the ethernet mac controller, used new reset id for reset controller as it conflict with the core reset id. Fixes: f3362f0c1817 ("arm64: dts: amlogic: add missing ethernet reset ID") Cc: Jerome Brunet Cc: Neil Armstrong Cc: Martin Blumenstingl Signed-off-by: Anand Moon --- arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 2 ++ arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 2 ++ arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 3 +++ 3 files changed, 7 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi index 3f5254eeb47b..da3bf9f7c1c6 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -280,6 +280,8 @@ ethmac: ethernet@ff3f0000 { "timing-adjustment"; rx-fifo-depth = <4096>; tx-fifo-depth = <2048>; + resets = <&reset RESET_ETHERNET>; + reset-names = "ethreset"; power-domains = <&pwrc PWRC_AXG_ETHERNET_MEM_ID>; status = "disabled"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi index 00c6f53290d4..c174ed50705f 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -230,6 +230,8 @@ ethmac: ethernet@ff3f0000 { "timing-adjustment"; rx-fifo-depth = <4096>; tx-fifo-depth = <2048>; + resets = <&reset RESET_ETHERNET>; + reset-names = "ethreset"; status = "disabled"; mdio0: mdio { diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index 6b457b2c30a4..717fa3134882 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -13,6 +13,7 @@ #include #include #include +#include #include / { @@ -582,6 +583,8 @@ ethmac: ethernet@c9410000 { interrupt-names = "macirq"; rx-fifo-depth = <4096>; tx-fifo-depth = <2048>; + resets = <&reset RESET_ETHERNET>; + reset-names = "ethreset"; power-domains = <&pwrc PWRC_GXBB_ETHERNET_MEM_ID>; status = "disabled"; }; From patchwork Thu Jul 29 20:10:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Moon X-Patchwork-Id: 489123 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 01D36C4320A for ; Thu, 29 Jul 2021 20:12:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DC198600D4 for ; Thu, 29 Jul 2021 20:11:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232948AbhG2UMB (ORCPT ); Thu, 29 Jul 2021 16:12:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229743AbhG2UMA (ORCPT ); Thu, 29 Jul 2021 16:12:00 -0400 Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3872CC061765; Thu, 29 Jul 2021 13:11:56 -0700 (PDT) Received: by mail-pj1-x1036.google.com with SMTP id q17-20020a17090a2e11b02901757deaf2c8so11323981pjd.0; Thu, 29 Jul 2021 13:11:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uFCBpDGM4hFIxc9yi8Eu0cialujSpGXKpLF4MnHX0N4=; b=o4j5NmYtOd2b6pXYrmg7YUJhk/ntJ1U45lCUKITehyjndOnUXczd6eaYzoajkza/Dq 6JmJHdTr3dahediTrHJt7WkawEEXnmo7o0mHt1OMLJ7Icx1CsA9ssknXBPvw/KtA9KKs UZHUviyVuD4nVGIu72SAfEwiYGfF6qDKUUD4WXfIArHFFCbdE1p/bDYZlnZFF5mLYS+5 P/Z6+xx2Rdx+bT/x7S4oGHAs6+FWAz5F79dFDwOY8J+CoqJL//mHSTFz8Xg/YZfxb6Qi 5Ref+r7ObgYFgExWA9S24uP5m/MhSwEALIPKaDywkjZQtU5jtUmgIoKKMRtGdmQhLA8A kovA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uFCBpDGM4hFIxc9yi8Eu0cialujSpGXKpLF4MnHX0N4=; b=qtjmiGt2S/+DohxnezWRTXGAaLsw8hdN5bYwPHx0TJlKz3vcoBZT3x3TOw6J88DxhZ NqnnXROKOREJNPxGKGkkJW2/RFtJMHRkPl/savJ6O2bl9T7tmE0AP13bJtxMCr5QGyT2 X6e85vdTP0LOKeIjlxwkvpzL3IqF95vlpcKd1T0TZ8n8p2U8/2QP4qf+aR/PP6nR6VJw 02/rstuBQp50gnIhzCXMR6woQnGrEszYL76WdzdM5WTt6sd6pAT5bdSIvf2omxS2ZIpQ 36pyHi4yfxF1L6z0zDtJ+yvyKgI7OtCZkksBchAz9puN+W1K6T0xCuL7gOWPVAlEyl5q lofg== X-Gm-Message-State: AOAM53306utLtL4o08MMekmOfYnoreHA4z3B9sLNSBSOZHHan0Tg3nY/ A8CJBKZzvaDUD1nV+dQkJPPHBPTSalj3+w== X-Google-Smtp-Source: ABdhPJwEDY6ObvS9IMV5cadka+41K/yJUlnwQzWz9TVouPF536akBdpkO0DPS1yrDa4svM2C/vlRWQ== X-Received: by 2002:a17:90b:34e:: with SMTP id fh14mr6956614pjb.100.1627589515588; Thu, 29 Jul 2021 13:11:55 -0700 (PDT) Received: from archl-on1.. ([103.51.72.31]) by smtp.gmail.com with ESMTPSA id i25sm4581407pfo.20.2021.07.29.13.11.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Jul 2021 13:11:55 -0700 (PDT) From: Anand Moon To: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, devicetree@vger.kernel.org Cc: Anand Moon , Jerome Brunet , Neil Armstrong , Martin Blumenstingl , Rob Herring , Kevin Hilman , Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , "David S. Miller" , Jakub Kicinski , Maxime Coquelin , Philipp Zabel , Emiliano Ingrassia Subject: [PATCHv1 3/3] net: stmmac: dwmac-meson8b: Add reset controller for ethernet phy Date: Fri, 30 Jul 2021 01:40:52 +0530 Message-Id: <20210729201100.3994-4-linux.amoon@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210729201100.3994-1-linux.amoon@gmail.com> References: <20210729201100.3994-1-linux.amoon@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add reset controller for Ethernet phy reset on every boot for Amlogic SoC. Cc: Jerome Brunet Cc: Neil Armstrong Cc: Martin Blumenstingl Signed-off-by: Anand Moon --- .../ethernet/stmicro/stmmac/dwmac-meson8b.c | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c index c7a6588d9398..8b3b5e8c2a8a 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include "stmmac_platform.h" @@ -95,6 +96,7 @@ struct meson8b_dwmac { u32 tx_delay_ns; u32 rx_delay_ps; struct clk *timing_adj_clk; + struct reset_control *eth_reset; }; struct meson8b_dwmac_clk_configs { @@ -384,6 +386,17 @@ static int meson8b_init_prg_eth(struct meson8b_dwmac *dwmac) meson8b_dwmac_mask_bits(dwmac, PRG_ETH0, PRG_ETH0_TX_AND_PHY_REF_CLK, PRG_ETH0_TX_AND_PHY_REF_CLK); + /* Make sure the Ethernet PHY is properly reseted, as U-Boot may leave + * it at deasserted state, and thus it may fail to reset EMAC. + * + * This assumes the driver has exclusive access to the EPHY reset. + */ + ret = reset_control_reset(dwmac->eth_reset); + if (ret) { + dev_err(dwmac->dev, "Cannot reset internal PHY\n"); + return ret; + } + return 0; } @@ -465,6 +478,13 @@ static int meson8b_dwmac_probe(struct platform_device *pdev) goto err_remove_config_dt; } + dwmac->eth_reset = devm_reset_control_get_exclusive(dwmac->dev, "ethreset"); + if (IS_ERR_OR_NULL(dwmac->eth_reset)) { + dev_err(dwmac->dev, "Failed to get Ethernet reset\n"); + ret = PTR_ERR(dwmac->eth_reset); + goto err_remove_config_dt; + } + ret = meson8b_init_rgmii_delays(dwmac); if (ret) goto err_remove_config_dt;