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.3 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,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 2AAA4C47096 for ; Sun, 6 Jun 2021 09:37:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0E35B61420 for ; Sun, 6 Jun 2021 09:37:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230129AbhFFJj0 (ORCPT ); Sun, 6 Jun 2021 05:39:26 -0400 Received: from mail-wm1-f44.google.com ([209.85.128.44]:37677 "EHLO mail-wm1-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229962AbhFFJj0 (ORCPT ); Sun, 6 Jun 2021 05:39:26 -0400 Received: by mail-wm1-f44.google.com with SMTP id f16-20020a05600c1550b02901b00c1be4abso211306wmg.2; Sun, 06 Jun 2021 02:37:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding:content-language; bh=MJuP8CxV6bjU2gIDe6Qlmusnyce3p54TGbmJ67b3i24=; b=moV/rgoyuYvOuX2oJAMxsMD5dWl7bn8Kth+LDjn06gSDP96MKJJtdHeiblB9HNbTXN CJVga/pAzwi2UGAy2Xah3nC1sDDXnzhSLsV7IgNbTATu+KxD9Du9Aqkuhht+qGqVUFth zREl1PjycLCiF3R4miwRpR6dG7UKyAcmIx/J6bFgXosCHIjQ04826C4o8bG9bUzO0yok 6qdDtV7kY87J+m6ArfVNYqcgD4tA5dYPB1ETPXBpB4W5ixR7yG5sBqVh/aD1KXSD7n/j 1Cx92lwyi51TCpnB2g33560bSASlyfzUBMRz+99cgHZK8JAYY1YZmsVX+FV/D2/ioPro upwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=MJuP8CxV6bjU2gIDe6Qlmusnyce3p54TGbmJ67b3i24=; b=uKlR2Qcjvo5AUezNsfdG7W0wWNFFWdMpIofZH6wRW8MlPKtrJ/j1mfgBQI3OZ46riD zEDMyfTEW92EgLLtEuLKYKYymSnM8SLJU/3vONDIjca82TLzIHBc3yl2mBa4/Koxzgqf fm3GHtrzHJXiRfF+GSBk3IzDv9aSpjO/pNF/LmfxCyl/efkQlchM1nAnMwvPyYewvNXc 5eaiaQCXL1K6d8fTjgacuNA2ra6E5v9zajIjB18ZodYF0k0P+V7i8vBHvJaEDpdu5q9F 9jLq3jtq690DRNd2tLvwQ9VrKb5vBOsjJdtoLNRtoNQvmHR973uKDFr6eUzygZ6EIcKJ gSKQ== X-Gm-Message-State: AOAM531b20CAiTfnoUduLkDYVpscNJcxRBx4eE86f3SHOlnTJJAu/xEu /CC2BWQSCDHurrdbx793O8s= X-Google-Smtp-Source: ABdhPJyNIZqQPUm8ZPsH8rrCJBxDeoLQi0RWvWLyw30Db65AgsZUfT6IQD3f5Q7tthNSJ6IOqVhmcQ== X-Received: by 2002:a7b:c2a2:: with SMTP id c2mr9663889wmk.89.1622972195496; Sun, 06 Jun 2021 02:36:35 -0700 (PDT) Received: from localhost.localdomain (haganm.plus.com. [212.159.108.31]) by smtp.gmail.com with ESMTPSA id y6sm13818467wmy.23.2021.06.06.02.36.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 06 Jun 2021 02:36:34 -0700 (PDT) Subject: Re: [PATCH 1/3] net: stmmac: explicitly deassert GMAC_AHB_RESET To: Bjorn Andersson 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 References: <20210605173546.4102455-1-mnhagan88@gmail.com> From: Matthew Hagan Message-ID: <3436f8f0-77dc-d4ff-4489-e9294c434a08@gmail.com> Date: Sun, 6 Jun 2021 10:36:33 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On 06/06/2021 04:24, Bjorn Andersson wrote: > 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 >> >> Thanks for the review. Will submit a v2 shortly. Matthew 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=-12.2 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,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 5C99FC47096 for ; Sun, 6 Jun 2021 09:38:17 +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 1E8D46141E for ; Sun, 6 Jun 2021 09:38:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1E8D46141E 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:In-Reply-To:MIME-Version:Date: Message-ID:From:References:Cc:To:Subject:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=GO9VX8qQO7AGqFSzVC4GCv5Fo9u6jhm08nPF9VCOvro=; b=IZH6EmLaY5wlG2U3NSxAl6ST75 3j6frw8T7w3px/9AIPfgQzAcXgCSYQ4iufKu5NR+rl923hqs+FCdXeUxcqMfsiN7jvlSyRFQ0+Qg2 BZsTnYplxQEzhzDy12S5b03d+oNa+DHHSqT4JUUOUfUaRwmQ6Q7zlciTIO+Ud6ZsSISFdm0xqdgnw XMgOWE2RuHraVuUwm5Os8pJBa7TiPs6VkLGGY853v/GIA2ojhd5u1uEmJVDhrSQgOBas4zWxJMWY2 do/C2tDebNVWwhaagzW6EZ1CzFTK1dIOC8FAluIo/VD1onRuxKk70Kf+senY7oa5GWn4PoVwedJGF vo20YH4w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lppCy-0005Ql-Dd; Sun, 06 Jun 2021 09:36:40 +0000 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lppCv-0005QI-6d for linux-arm-kernel@lists.infradead.org; Sun, 06 Jun 2021 09:36:38 +0000 Received: by mail-wm1-x330.google.com with SMTP id n17-20020a7bc5d10000b0290169edfadac9so10600839wmk.1 for ; Sun, 06 Jun 2021 02:36:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding:content-language; bh=MJuP8CxV6bjU2gIDe6Qlmusnyce3p54TGbmJ67b3i24=; b=moV/rgoyuYvOuX2oJAMxsMD5dWl7bn8Kth+LDjn06gSDP96MKJJtdHeiblB9HNbTXN CJVga/pAzwi2UGAy2Xah3nC1sDDXnzhSLsV7IgNbTATu+KxD9Du9Aqkuhht+qGqVUFth zREl1PjycLCiF3R4miwRpR6dG7UKyAcmIx/J6bFgXosCHIjQ04826C4o8bG9bUzO0yok 6qdDtV7kY87J+m6ArfVNYqcgD4tA5dYPB1ETPXBpB4W5ixR7yG5sBqVh/aD1KXSD7n/j 1Cx92lwyi51TCpnB2g33560bSASlyfzUBMRz+99cgHZK8JAYY1YZmsVX+FV/D2/ioPro upwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=MJuP8CxV6bjU2gIDe6Qlmusnyce3p54TGbmJ67b3i24=; b=NolVhS3zl9qb/8mO4s8k0xtMzTK1E5ZMVNXZO7kbhpu0P/NASb9eAUoCkI314E74+O P3htiu5lmk8iP0nvx28dI+R6u1LLEXG4MSGYnUcgRBi121aFGJw7BiXKRu8aPB10mX+N /ShTcXWdGrK+Wb7ZU3vKuge9BugFBOi2kODRdCI+bTi0inGTG/7ypHT+DP3eAGCuz/TU U9DpdrMzhM4N6y41/zbQOT2TMDPTfMeF9GEpW9KzUE5s2r1M4OW5LjncbtkskGGpY8gE F702IKi6CS7NboCR3tpGHNRRivR2NIRwcyEu9EfD0uSQI853cXfVPMzBI3NGbTsC4kgG mcXQ== X-Gm-Message-State: AOAM530L8Xn1TSFNjBVlYg9CE9HQJW/89zDXjPomevm3Ni1Pc3FBpCwe GIZSbMUX61nSdrl0sEhZkVveVZE5/mxRxw== X-Google-Smtp-Source: ABdhPJyNIZqQPUm8ZPsH8rrCJBxDeoLQi0RWvWLyw30Db65AgsZUfT6IQD3f5Q7tthNSJ6IOqVhmcQ== X-Received: by 2002:a7b:c2a2:: with SMTP id c2mr9663889wmk.89.1622972195496; Sun, 06 Jun 2021 02:36:35 -0700 (PDT) Received: from localhost.localdomain (haganm.plus.com. [212.159.108.31]) by smtp.gmail.com with ESMTPSA id y6sm13818467wmy.23.2021.06.06.02.36.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 06 Jun 2021 02:36:34 -0700 (PDT) Subject: Re: [PATCH 1/3] net: stmmac: explicitly deassert GMAC_AHB_RESET To: Bjorn Andersson 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 References: <20210605173546.4102455-1-mnhagan88@gmail.com> From: Matthew Hagan Message-ID: <3436f8f0-77dc-d4ff-4489-e9294c434a08@gmail.com> Date: Sun, 6 Jun 2021 10:36:33 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210606_023637_284563_FFFE7D8E X-CRM114-Status: GOOD ( 22.13 ) 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 06/06/2021 04:24, Bjorn Andersson wrote: > 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 >> >> Thanks for the review. Will submit a v2 shortly. Matthew _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel