From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754074AbdCBOvO (ORCPT ); Thu, 2 Mar 2017 09:51:14 -0500 Received: from us01smtprelay-2.synopsys.com ([198.182.60.111]:44850 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753587AbdCBOur (ORCPT ); Thu, 2 Mar 2017 09:50:47 -0500 Subject: Re: [PATCH 2/7] net: stmmac: Balance PTP reference clock enable/disable To: Thierry Reding , "David S . Miller" References: <20170223172438.14770-1-thierry.reding@gmail.com> <20170223172438.14770-3-thierry.reding@gmail.com> CC: Giuseppe Cavallaro , Alexandre Torgue , Rob Herring , Mark Rutland , Joao Pinto , "Alexandre Courbot" , Jon Hunter , , , From: Joao Pinto Message-ID: <72ef0b76-0b36-0849-dc54-6efa6ffcda53@synopsys.com> Date: Thu, 2 Mar 2017 14:47:15 +0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <20170223172438.14770-3-thierry.reding@gmail.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.107.19.86] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ās 5:24 PM de 2/23/2017, Thierry Reding escreveu: > From: Thierry Reding > > clk_prepare_enable() and clk_disable_unprepare() for this clock aren't > properly balanced, which can trigger a WARN_ON() in the common clock > framework. > > Signed-off-by: Thierry Reding > --- > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++++ > drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 1 - > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > index 3cbe09682afe..6b7a5ce19589 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > @@ -1711,6 +1711,10 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp) > stmmac_mmc_setup(priv); > > if (init_ptp) { > + ret = clk_prepare_enable(priv->plat->clk_ptp_ref); > + if (ret < 0) > + netdev_warn(priv->dev, "failed to enable PTP reference clock: %d\n", ret); > + > ret = stmmac_init_ptp(priv); > if (ret == -EOPNOTSUPP) > netdev_warn(priv->dev, "PTP not supported by HW\n"); > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c > index 5b18355c0d2b..d285d6cfbd0d 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c > @@ -365,7 +365,6 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac) > plat->clk_ptp_ref = NULL; > dev_warn(&pdev->dev, "PTP uses main clock\n"); > } else { > - clk_prepare_enable(plat->clk_ptp_ref); > plat->clk_ptp_rate = clk_get_rate(plat->clk_ptp_ref); > dev_dbg(&pdev->dev, "PTP rate %d\n", plat->clk_ptp_rate); > } > Reviewed-By: Joao Pinto