From nobody Sun May 12 04:20:33 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=1622975922; cv=none; d=zohomail.com; s=zohoarc; b=nSIci8CgoRQ/dj7NvR39crps66QeisGocKVxi9mZ7HbhWV9HQyjgLczUwFAKAQWpvNIvvXmrqoKJvWPXBYZRNNq5gUUJHtQHShambG8F/4btEjnPlIhSuyTHebNrAhB3Gx9i7SyfHAgLsNYi14urtcZcMT3I0f9zSUuqhtI6hew= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622975922; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Subject:To; bh=ikXJBehZXFSB5UrJ89OaYAcJZ+kIUikwdL83ZPiK/5Y=; b=izV+BQnCRfdolKGrTMPLU3S00uHmIBjRxyqqrRBVMi06ChjwOs32y82OMGu5JrSp2jUQOHKLPFFWdvr6wRYECDkgedjANyeQEjhKa6KHw0p4mZsS1KEAmdmv3mMDraNcwlCbcowTOXlENpa+j9pX8YyzL5ic6KSkDYb2TyIJcmQ= 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 1622975922947316.1049330186877; Sun, 6 Jun 2021 03:38:42 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230198AbhFFKcy (ORCPT ); Sun, 6 Jun 2021 06:32:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229465AbhFFKcw (ORCPT ); Sun, 6 Jun 2021 06:32:52 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F782C061766; Sun, 6 Jun 2021 03:30:50 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id n17-20020a7bc5d10000b0290169edfadac9so10648105wmk.1; Sun, 06 Jun 2021 03:30:50 -0700 (PDT) Received: from cluster5 ([80.76.206.81]) by smtp.gmail.com with ESMTPSA id s62sm13926536wms.13.2021.06.06.03.30.44 (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128); Sun, 06 Jun 2021 03:30:44 -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=ikXJBehZXFSB5UrJ89OaYAcJZ+kIUikwdL83ZPiK/5Y=; b=FexVLV1F67sJ8VtLdcDCHjf+oX3RM8/jbrZGl69yu70d1Po34D5B/Jrfh1Wc0B2bFk M/bjGeAgCvUCDukHX0G0Ip8Z+gWnW+VBd2brgbMSDZ+wyNLrbujmvHYprvmVbquWavfS K0HvIgpQay8mLct9xagtW/7c63fHjfbBmjsJYR9s3p+lPqPlC/bN7ZgEhqWjF+Bj+8F/ TDom7Z+CS+qYtBchGiyn7gv/1Y3IHovBEmbSESqVqxiVehsOPrPamoIR9/ulqjfGIwL1 Irl8Rh97DtGYaT7wwXLkONEx4EVAo7Jz+WacxiH5ptE2GOUMt/BmZFtMu/ayRnViDXa2 7cZA== 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=ikXJBehZXFSB5UrJ89OaYAcJZ+kIUikwdL83ZPiK/5Y=; b=J+0Vx5/IGH5ZZx30CuxVlDT4o8RAvxPIdE/kZ5UQddkzJ2vFAnnJ1cQ6DauUCTnJ4K PbgKEeIpD8UDYa41gzxe5W8i2rBd2ylVEnWHXcnFwPzFFZwL027/wS8bZDR18Sqemf1C 4f0+D/5jme8CrpqjmvwL3eLZw6FRLgBd4A8jTG04ztrRARCHf8cWLU9uUfVpgUOfSWQ1 GzewXBgLkvruBxBIhoNeZgmWtK5ltHjFZR3cihzI6+FXuOMbFoaDhUrxW1XXzDI58wEo Rdg48JfSFEOvJemXfo4tY9IepyVQn7evk9Eyf5fc3HuKaqCVNiKWM/LE14x9dKsLSKAB bMOw== X-Gm-Message-State: AOAM531FnG901QvT6oJLIXlsZuKa7DZNJk3cDllJEPKlCZ8vrX95fJrS 4XJCeb1DJdV0sP0PJfnEGLeXjusVYmY= X-Google-Smtp-Source: ABdhPJwWAiiWqtqihbUCZBiBb+hiCCGLYOEmHqUxvoIWanfLpsTPgU+VvFX0yTMsszDmE/6ByuoYAA== X-Received: by 2002:a1c:ed03:: with SMTP id l3mr12198750wmh.130.1622975444995; Sun, 06 Jun 2021 03:30:44 -0700 (PDT) From: Matthew Hagan Cc: bjorn.andersson@linaro.org, Matthew Hagan , Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , "David S. Miller" , Jakub Kicinski , Maxime Coquelin , Philipp Zabel , Voon Weifeng , Ong Boon Leong , Wong Vee Khee , Tan Tee Min , "Wong, Vee Khee" , Mohammad Athari Bin Ismail , netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] net: stmmac: explicitly deassert GMAC_AHB_RESET Date: Sun, 6 Jun 2021 11:30:13 +0100 Message-Id: <20210606103019.2807397-1-mnhagan88@gmail.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <3436f8f0-77dc-d4ff-4489-e9294c434a08@gmail.com> References: <3436f8f0-77dc-d4ff-4489-e9294c434a08@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 Signed-off-by: Matthew Hagan --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++++ drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 7 +++++++ include/linux/stmmac.h | 1 + 3 files changed, 12 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/ne= t/ethernet/stmicro/stmmac/stmmac_main.c index 6d41dd6f9f7a..0d4cb423cbbd 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -6840,6 +6840,10 @@ 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\n"); + /* Init MAC and get the capabilities */ ret =3D stmmac_hw_init(priv); if (ret) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/driver= s/net/ethernet/stmicro/stmmac/stmmac_platform.c index 97a1fedcc9ac..a178181f6a24 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 PTR_ERR(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