From nobody Mon May 13 11:28:26 2024 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623179816; cv=none; d=zohomail.com; s=zohoarc; b=bdiy+pT0qEzLGjDNdvOcQVU0tQkN2XWonMPHXvKbE1sdGKRyABPe9vCn34s6cUOMuJV+TuASnHNJJXZIGLocmijaU2vyZx9jt2GedC9WeCcXGoijFEO/JRVkA/as0m9yNnBXByk3i4I71XJqm33Bihs/UnpENQvVDVfXqlpbWy4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623179816; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Subject:To; bh=Uip1vDK/GvnRP2tuA2PdZT2AGkszBhFjdDLQc1lrazM=; b=dE3oYhHX9gEvqu2zSlL1e++FN42MuxwB3JaBFo07T1mm00o7Xro3H0ATiuVolguqNVMoeEmgc1L1kiDGZlabL+tUVo1IHk1B6+4rNssxeoQGNR6QEbnKh8BHZX1WDrbnOegHUTBZNg3IWlYuvK9BT0yJSJGx6WNvWKmCQ+0z7q0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1623179816802313.0456250642909; Tue, 8 Jun 2021 12:16:56 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235581AbhFHTSp (ORCPT ); Tue, 8 Jun 2021 15:18:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236094AbhFHTHX (ORCPT ); Tue, 8 Jun 2021 15:07:23 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B1B25C06115D; Tue, 8 Jun 2021 12:00:22 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id a11so20850653wrt.13; Tue, 08 Jun 2021 12:00:22 -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) 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=G7HMCIB7fZQdoU7pO3yjJLfaGxPP5t0hHHqmYUE2rZS/pA2WluSYru82+XtH6DMu2S oRCkhO4XX1ICuQrElgZA+zlm6TGlBAHkkp0ZEPi7KjPpY24I5VeGQVI/k37qpQjsT+64 XGwN+7xYVAoZMIrE1dLXIhJJ6cawu+wASbUHgWn4w8C6aUvGnwK4GuxdyhND3/LIr+Dg fQ/AVmE/+KAg3oQQwU4cvUD3JeEEdqjlKWerx6npIeGZhELvbxjlJUau95oqLxDVYpC6 GtgNMY44bOvhsZR1qyiy2pvGjZkcR+64qn0XN7eEfwxuscij8J/yUaSYZ1ueZtOLgAcJ 8LMA== X-Gm-Message-State: AOAM531MqoqOQCoH/S+ROAFQHeGtBsIcwnzHJKNc3q399Da1lgry4KbH aDCYgcZmfPXc/c6R09PwjD42mVyEZvw= 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) From: Matthew Hagan 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 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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/ne= t/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); } =20 + ret =3D reset_control_deassert(priv->plat->stmmac_ahb_rst); + if (ret =3D=3D -ENOTSUPP) + dev_err(priv->device, "unable to bring out of ahb reset: %pe\n", + ERR_PTR(ret)); + /* Init MAC and get the capabilities */ ret =3D 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 !=3D STMMAC_PCS_TBI && diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/driver= s/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, u= 8 *mac) goto error_hw_init; } =20 + plat->stmmac_ahb_rst =3D devm_reset_control_get_optional_shared( + &pdev->dev, "ahb"); + if (IS_ERR(plat->stmmac_ahb_rst)) { + ret =3D plat->stmmac_ahb_rst; + goto error_hw_init; + } + return plat; =20 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; --=20 2.26.3