From mboxrd@z Thu Jan 1 00:00:00 1970 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,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 D6846C4743E for ; Sun, 6 Jun 2021 03:25:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B16CB61420 for ; Sun, 6 Jun 2021 03:25:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230083AbhFFD0u (ORCPT ); Sat, 5 Jun 2021 23:26:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230075AbhFFD0t (ORCPT ); Sat, 5 Jun 2021 23:26:49 -0400 Received: from mail-ot1-x334.google.com (mail-ot1-x334.google.com [IPv6:2607:f8b0:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C24CBC061766 for ; Sat, 5 Jun 2021 20:24:48 -0700 (PDT) Received: by mail-ot1-x334.google.com with SMTP id 69-20020a9d0a4b0000b02902ed42f141e1so13299303otg.2 for ; Sat, 05 Jun 2021 20:24:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=ni3eGvt+i+5aePMZevK8GoIbwGrBNouUTOTilLJGCcQ=; b=LZf9hwtjLmlD/EeoSYDYbj1A9ZyuAdhJaEjcMiUf+pLmtpvxN1dqbojhVk3jwiAB+T C3s/rZ/3IRkbA8x2zD4urLBe7zBpASZAnNkF/guex8VaxoqWGd1ijxIhBxeLW4hoiiX9 f3Neg36W0u6VZgVicl3P951NMdw/+0SnHmokQRFpGQyQwH7JbvB2jjoFLL/UqOHel2Wd 8n85WNYLu6Ih1fLoV2FzJz9eTL2lw6/Tq7gqdlj8OnFGRpgH0I/xyBObS2ra9sXppGYK ffEZOTLB1Sg6wgBhHclUaxFBQF7lYlWD3trE0dyApVz52/uEWr3GiKCIZF3MXwoDM05K +RnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=ni3eGvt+i+5aePMZevK8GoIbwGrBNouUTOTilLJGCcQ=; b=nrAqMzL3fuV5e2pKe+2btgfVudM30NiowTOkg96g7Zs157imwCrhfOz6YPrlKi7fiP mBF0RVstM9LsGrl+hQ2J5f9j2VbAGgG17DhWcc7awdpf58iZf5V3gFhJTBGCUr8bKZhI kC3215OxzluARgYirUMUnG9cLHqPlle804STSWfmyfI93uFRGld/4IR3Gdtl1kwOuGAe AyKOHZDPzX4PpT+lkdY01dMmmaBaWXrBtktON3r1TvlLF0cZ5K/qQ7vRY1uSjbvpT/KG dr+dSCI/Vbyx7cIuDQPjHMOMXRHu9pIlEDmX9b+6jkR+6O06weRio7E2/jWwvXX6Sobf q9jg== X-Gm-Message-State: AOAM531ovvyVwiTTZqM2JcNk0XtTnxTPm00slFpc+3v9EuzhKnO20/rt A+zL+KR7S+L9C4xgSAB5T9p4PA== X-Google-Smtp-Source: ABdhPJyRc/QyzvY3Swve80HRZpUbaVQo39xFAvWvcHetsyu19hof3cyxtGdvkdZZlNmzXkkX2BnMdg== X-Received: by 2002:a9d:704b:: with SMTP id x11mr3397307otj.110.1622949887957; Sat, 05 Jun 2021 20:24:47 -0700 (PDT) Received: from builder.lan (104-57-184-186.lightspeed.austtx.sbcglobal.net. [104.57.184.186]) by smtp.gmail.com with ESMTPSA id r5sm1539711otp.45.2021.06.05.20.24.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Jun 2021 20:24:47 -0700 (PDT) Date: Sat, 5 Jun 2021 22:24:45 -0500 From: Bjorn Andersson To: Matthew Hagan Cc: "David S. Miller" , Jakub Kicinski , Rob Herring , Andy Gross , Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , Maxime Coquelin , Philipp Zabel , Voon Weifeng , Ong Boon Leong , Wong Vee Khee , Tan Tee Min , "Wong, Vee Khee" , Fugang Duan , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 1/3] net: stmmac: explicitly deassert GMAC_AHB_RESET Message-ID: References: <20210605173546.4102455-1-mnhagan88@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210605173546.4102455-1-mnhagan88@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On Sat 05 Jun 12:35 CDT 2021, Matthew Hagan wrote: > 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. > Sounds good, just some small style comments below. > Signed-off-by: Matthew Hagan > --- > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 +++++++ > drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 7 +++++++ > include/linux/stmmac.h | 1 + > 3 files changed, 15 insertions(+) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > index 6d41dd6f9f7a..1e28058b65a8 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > @@ -6840,6 +6840,13 @@ int stmmac_dvr_probe(struct device *device, > reset_control_reset(priv->plat->stmmac_rst); > } > > + if (priv->plat->stmmac_ahb_rst) { You don't need this conditional, stmmac_ahb_rst will be NULL if not specified and you can reset_control_deassert(NULL) without any problems. > + ret = reset_control_deassert(priv->plat->stmmac_ahb_rst); > + if (ret == -ENOTSUPP) > + dev_err(priv->device, > + "unable to bring out of ahb reset\n"); No need to wrap this line. > + } > + > /* Init MAC and get the capabilities */ > ret = stmmac_hw_init(priv); > if (ret) > 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; You need a PTR_ERR() around the plat->stmmac_ahb_rst. Regards, Bjorn > + 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 > From mboxrd@z Thu Jan 1 00:00:00 1970 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=-14.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 D362EC4743D for ; Sun, 6 Jun 2021 03:32:56 +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 915F66113E for ; Sun, 6 Jun 2021 03:32:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 915F66113E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org 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:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=A0J6mF24J4DGG8kQDKuQ3fbCPAepMRzEMJA8EPSry+Q=; b=VuyxvwAhxEtOnI tp1Vr//Q8fkAKkVQSzPWR1wEAPPlyQzNuodKm/QhVYACX+tGOjWILDZrzmDF1ukVUHB1kj05XxYzQ fkL1P3jPGNsqOkUQF5mD7mP+QGC+T6/HGoyElOd9DXtGRev53hBeCvYWL2enR9BU6noppj+/xT9sY kniq3B8ii7JKNwS1sGXvXhH2rGy//Hoi5Iz5slIbdQLn/cvRF+c5cXd0cx1fC1Yz1EMVrZ8IQVheQ 4wIg2kUqnt2jA5VuPPCs/PxQiCcJqCVwYGMv8LfjCuYVDSBArwWOkOu9AsbYfsFmII5epspnRyEf1 8pFIH9DkH0yHuwZcs5zg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lpjSH-00HNOk-QQ; Sun, 06 Jun 2021 03:28:06 +0000 Received: from mail-ot1-f50.google.com ([209.85.210.50]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lpjS2-00HNHt-E6 for linux-arm-kernel@lists.infradead.org; Sun, 06 Jun 2021 03:27:51 +0000 Received: by mail-ot1-f50.google.com with SMTP id v27-20020a056830091bb02903cd67d40070so10195889ott.1 for ; Sat, 05 Jun 2021 20:25:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=ni3eGvt+i+5aePMZevK8GoIbwGrBNouUTOTilLJGCcQ=; b=LZf9hwtjLmlD/EeoSYDYbj1A9ZyuAdhJaEjcMiUf+pLmtpvxN1dqbojhVk3jwiAB+T C3s/rZ/3IRkbA8x2zD4urLBe7zBpASZAnNkF/guex8VaxoqWGd1ijxIhBxeLW4hoiiX9 f3Neg36W0u6VZgVicl3P951NMdw/+0SnHmokQRFpGQyQwH7JbvB2jjoFLL/UqOHel2Wd 8n85WNYLu6Ih1fLoV2FzJz9eTL2lw6/Tq7gqdlj8OnFGRpgH0I/xyBObS2ra9sXppGYK ffEZOTLB1Sg6wgBhHclUaxFBQF7lYlWD3trE0dyApVz52/uEWr3GiKCIZF3MXwoDM05K +RnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=ni3eGvt+i+5aePMZevK8GoIbwGrBNouUTOTilLJGCcQ=; b=GmO26deBn0hYrMqSnAUpYDE6AZMDUY1ovPPWCnZAhpHH6ST98WVQlY4kNc82ydjHFu KVYZBG9nCQO06aNwL6+xBxUhwftEPYQdLhmCXD0VulSz+NdeWQIs9SyHYRf/8neaSCtI wMokBuZIQidK4/toQMdk1CMBcv/4k1CDFuaIM49ROEmNRQCZN5MRlfqHNQ3Ty+222Cub G3CJcnv2mxGL+qEEPdsJrxVaW/jI46lfT3CbmmaWwJqVi2/oFn6O9SGzW7M5+Y3AgPue SamSdS+io0n7fcAHiCbYVhEKJ348nfrxdCnGWYrSumKF2xeHmClVjplYX7xrqvHRV7U+ APCQ== X-Gm-Message-State: AOAM533CCexHVdskC0k9jlcN8NkutTVXWBJBleORZlAPIO33SyUwMNKU Dbss52JV+ncPpD9OO77sXaryJQ== X-Google-Smtp-Source: ABdhPJyRc/QyzvY3Swve80HRZpUbaVQo39xFAvWvcHetsyu19hof3cyxtGdvkdZZlNmzXkkX2BnMdg== X-Received: by 2002:a9d:704b:: with SMTP id x11mr3397307otj.110.1622949887957; Sat, 05 Jun 2021 20:24:47 -0700 (PDT) Received: from builder.lan (104-57-184-186.lightspeed.austtx.sbcglobal.net. [104.57.184.186]) by smtp.gmail.com with ESMTPSA id r5sm1539711otp.45.2021.06.05.20.24.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Jun 2021 20:24:47 -0700 (PDT) Date: Sat, 5 Jun 2021 22:24:45 -0500 From: Bjorn Andersson To: Matthew Hagan Cc: "David S. Miller" , Jakub Kicinski , Rob Herring , Andy Gross , Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , Maxime Coquelin , Philipp Zabel , Voon Weifeng , Ong Boon Leong , Wong Vee Khee , Tan Tee Min , "Wong, Vee Khee" , Fugang Duan , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 1/3] net: stmmac: explicitly deassert GMAC_AHB_RESET Message-ID: References: <20210605173546.4102455-1-mnhagan88@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210605173546.4102455-1-mnhagan88@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210605_202750_507818_2CA1BE1E X-CRM114-Status: GOOD ( 20.40 ) 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 On Sat 05 Jun 12:35 CDT 2021, Matthew Hagan wrote: > 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. > Sounds good, just some small style comments below. > Signed-off-by: Matthew Hagan > --- > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 +++++++ > drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 7 +++++++ > include/linux/stmmac.h | 1 + > 3 files changed, 15 insertions(+) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > index 6d41dd6f9f7a..1e28058b65a8 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > @@ -6840,6 +6840,13 @@ int stmmac_dvr_probe(struct device *device, > reset_control_reset(priv->plat->stmmac_rst); > } > > + if (priv->plat->stmmac_ahb_rst) { You don't need this conditional, stmmac_ahb_rst will be NULL if not specified and you can reset_control_deassert(NULL) without any problems. > + ret = reset_control_deassert(priv->plat->stmmac_ahb_rst); > + if (ret == -ENOTSUPP) > + dev_err(priv->device, > + "unable to bring out of ahb reset\n"); No need to wrap this line. > + } > + > /* Init MAC and get the capabilities */ > ret = stmmac_hw_init(priv); > if (ret) > 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; You need a PTR_ERR() around the plat->stmmac_ahb_rst. Regards, Bjorn > + 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