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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,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=ham 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 DF3D7C47082 for ; Tue, 8 Jun 2021 19:02:07 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A633C60FEA for ; Tue, 8 Jun 2021 19:02:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A633C60FEA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=RzFruFHlQTDP79RB7VZKV5dCOEIsBw6Yptl6Jq2YQ7U=; b=iU1D0x4i4e/DGZ lowNwhEmPLTpU2MRx09BM4fbrJ8kfpSK2MGUuXVI8GXCC7Uog0Tcmt67GXUGVpy3n5gUASpDhko34 266zm7z65UPhPFcfaZZ79TMTW5+7oa3q/JAk7+cw2Iaey+dYWC55E5w/08Wo53MnazKjnycJjFsOn XtpXHnGuhioWO2PXHSRWeOmxEKEu1K3w5baAHZ7TsKar3EfJDD1MMOEHbBb4YxoK22+SBPn71nVuN l2z3R5XLcVeSbmMBFKoSB6XM7Odrjzon4IHOTHqrO2jRjT4m3pr+zBRpITYwOgE3lElhsbtDcFwZg rEEYGM8hEVhAWhafZN6w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqgxg-00A9Qp-E2; Tue, 08 Jun 2021 19:00:28 +0000 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqgxa-00A9OP-P5 for linux-arm-kernel@lists.infradead.org; Tue, 08 Jun 2021 19:00:24 +0000 Received: by mail-wr1-x430.google.com with SMTP id z8so22682122wrp.12 for ; Tue, 08 Jun 2021 12:00:22 -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=Uip1vDK/GvnRP2tuA2PdZT2AGkszBhFjdDLQc1lrazM=; b=mf8PYe9ZlWYQkGj9Esq0zaqBLrYGXrlL7OK0dZhv9N/FndZxs7wgU3igPT77cNrUr3 1hHAuupqcQPOZ65bCjec8GNwcvCBAoH70+lZMEh18nILeAOcurnAWEv/lOiGuoFQsd+f FV9EZ+OXdtwO2d9yWpYuoRQ8a2/qpuhzECfHklaKQFq1/xOv9NrLoLLgIfzZCvOyKdGP hxoEO2izfy4IUo3j0uak2ZgwxhWlyRYBronc1MGF/AL8C4AiO2F5blQbYP9ys5taO3By KJjPTF4Sk7Uc8vajajyh6Zt++0rLF/Ol7nY2dZqrKHEGbIkE8NITB/TWbcGwyDmIcEBd y1cg== 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=Uip1vDK/GvnRP2tuA2PdZT2AGkszBhFjdDLQc1lrazM=; b=e/xvwnpOdqnpb1HMg3ljnIYOUHoDLD1NlF75rX3gZkx2XWHwXHKk56W6GKeb3hYr6p cT4V9Jx90bB1Oyx92gL8WWlV02yTAtQOytBlTpT0U9rmhPApk9p/GbRXxLdsu90FjBZE 167ycBsLbGMnz+FamqdZQkifXguKY5XXskwcO4aejxHfgQ8pG/oyCaELZTxRpYvEMSn+ cDb+AC3iXCmDooNYhMVcVdlt63Wntt9ggyffJj6v97pFoqYbD428pPVbtNOOdILCq2q0 GmeQx0CuzU0DTOtyPXC8jjiM7RwFCNc3HC8Tmufq7IVEPHtBXg/55h/9N8aDDuJVyOdx 57ZA== X-Gm-Message-State: AOAM531RpJfvUU0ldsLETNiYC9qsYBHEza+5lulsBZaAA/CzdLMJRQg2 ZFWOK6QmthsUmcX61Zeg2aw= X-Google-Smtp-Source: ABdhPJzgTgRj6uydfUPubkT+rZSonmvkQaAl/Ei9uKDeCamwzpyS7SlLHNhdsmHohhD0B9aWfnJ+qw== X-Received: by 2002:adf:ff88:: with SMTP id j8mr24110899wrr.10.1623178821049; Tue, 08 Jun 2021 12:00:21 -0700 (PDT) Received: from cluster5 ([80.76.206.81]) by smtp.gmail.com with ESMTPSA id w13sm22560462wrc.31.2021.06.08.12.00.20 (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128); Tue, 08 Jun 2021 12:00:20 -0700 (PDT) From: Matthew Hagan To: Cc: Bjorn Andersson , Philipp Zabel , Matthew Hagan , Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , "David S. Miller" , Jakub Kicinski , Maxime Coquelin , Russell King , Voon Weifeng , Ong Boon Leong , Wong Vee Khee , Tan Tee Min , "Wong, Vee Khee" , Michael Sit Wei Hong , netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v3] net: stmmac: explicitly deassert GMAC_AHB_RESET Date: Tue, 8 Jun 2021 19:59:06 +0100 Message-Id: <20210608185913.3909878-1-mnhagan88@gmail.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210606103019.2807397-1-mnhagan88@gmail.com> References: <20210606103019.2807397-1-mnhagan88@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210608_120022_835153_746B0F79 X-CRM114-Status: GOOD ( 16.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org We are currently assuming that GMAC_AHB_RESET will already be deasserted by the bootloader. However if this has not been done, probing of the GMAC will fail. To remedy this we must ensure GMAC_AHB_RESET has been deasserted prior to probing. v2 changes: - remove NULL condition check for stmmac_ahb_rst in stmmac_main.c - unwrap dev_err() message in stmmac_main.c - add PTR_ERR() around plat->stmmac_ahb_rst in stmmac_platform.c v3 changes: - add error pointer to dev_err() output - add reset_control_assert(stmmac_ahb_rst) in stmmac_dvr_remove - revert PTR_ERR() around plat->stmmac_ahb_rst since this is performed on the returned value of ret by the calling function Signed-off-by: Matthew Hagan --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 ++++++ drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 7 +++++++ include/linux/stmmac.h | 1 + 3 files changed, 14 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 6d41dd6f9f7a..78dafde70671 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -6840,6 +6840,11 @@ int stmmac_dvr_probe(struct device *device, reset_control_reset(priv->plat->stmmac_rst); } + ret = reset_control_deassert(priv->plat->stmmac_ahb_rst); + if (ret == -ENOTSUPP) + dev_err(priv->device, "unable to bring out of ahb reset: %pe\n", + ERR_PTR(ret)); + /* Init MAC and get the capabilities */ ret = stmmac_hw_init(priv); if (ret) @@ -7072,6 +7077,7 @@ int stmmac_dvr_remove(struct device *dev) phylink_destroy(priv->phylink); if (priv->plat->stmmac_rst) reset_control_assert(priv->plat->stmmac_rst); + reset_control_assert(priv->plat->stmmac_ahb_rst); pm_runtime_put(dev); pm_runtime_disable(dev); if (priv->hw->pcs != STMMAC_PCS_TBI && diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index 97a1fedcc9ac..d8ae58bdbbe3 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -600,6 +600,13 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac) goto error_hw_init; } + plat->stmmac_ahb_rst = devm_reset_control_get_optional_shared( + &pdev->dev, "ahb"); + if (IS_ERR(plat->stmmac_ahb_rst)) { + ret = plat->stmmac_ahb_rst; + goto error_hw_init; + } + return plat; error_hw_init: diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h index e55a4807e3ea..9b6a64f3e3dc 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -239,6 +239,7 @@ struct plat_stmmacenet_data { unsigned int mult_fact_100ns; s32 ptp_max_adj; struct reset_control *stmmac_rst; + struct reset_control *stmmac_ahb_rst; struct stmmac_axi *axi; int has_gmac4; bool has_sun8i; -- 2.26.3 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel