From patchwork Fri Mar 10 16:34:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 737456 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vftD855hbz9s7t for ; Sat, 11 Mar 2017 03:35:36 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hQ8uaUV9"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755252AbdCJQf3 (ORCPT ); Fri, 10 Mar 2017 11:35:29 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:32971 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933000AbdCJQfN (ORCPT ); Fri, 10 Mar 2017 11:35:13 -0500 Received: by mail-wm0-f66.google.com with SMTP id n11so3126024wma.0; Fri, 10 Mar 2017 08:35:11 -0800 (PST) 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; bh=hqqQmFq3YWvFuZyYJVAv4ANty7AbQPwXTI1SMI400Bw=; b=hQ8uaUV9+EnowCJy9KZW0k7L/GMVQhSck2C4pA4CPE0HrdKBc0zmq+81P1sbMLQ38Y ON73JnCAQJX0cGKppKFchf78bRrHgpT2nLGC4vwjUkfRZSNl2HMGYAMlz/Y1G0Ua+11X PuFqglWm83nsiJQ3HB2hHOSoJyPuUrAAwB1fXYQ0IVbJ8P9iwK+BOLLI0dAcKkJXkFRj RmCL3TzQ9UUx372rQiDPOnr/n6cLdOiFJ2v/A7ZFckq7wRG8jaxFuElLoyIm22u1koDY qBAurjFfxf9fEQalmawxijrsgo4FaClj5sRQ5LjLBl+aUXu/1w8zhlOPPb5HSt0DhYNa +icQ== 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; bh=hqqQmFq3YWvFuZyYJVAv4ANty7AbQPwXTI1SMI400Bw=; b=BX9f6DXmIAi0K62RrHWXI1IrTLvJ+rMB7RQ3sC2OwO7xh+0rV57noIvv0fiBf+9k5Y VBgdkaetoJ92w5mNXqG0fAttQ3u+M58UmbqY6H4sVcrtb+fn3mMBlntJdtxcxMWL83p3 x0d5bPnz1HKNGMkeyI5wy/sZlRwaOUwZdW+CT32vl3sFOb2vQTYYKQbrOkE0/yw/jXem aTilH+vUbjsPXGg1k/bI94fkjgYJI9ik9kN2B1hPh91wHiy838VIg1O/VPK4HkjZknoy zYT2zbFTRMDhfa5ZuFBPsxWGqiZ1br+93W0CHn5/ifl3XHG//Ua1KBUh+gJ6bxesntCX vz2g== X-Gm-Message-State: AFeK/H0V7p7RH+DCyd/fFyWH7xU6kPIeL0huZZUJ/NzsCeakHZMaHCcVmTuixhJoXXSIkA== X-Received: by 10.28.45.212 with SMTP id t203mr3157516wmt.37.1489163710395; Fri, 10 Mar 2017 08:35:10 -0800 (PST) Received: from localhost (port-55061.pppoe.wtnet.de. [46.59.215.197]) by smtp.gmail.com with ESMTPSA id g45sm13527018wrd.11.2017.03.10.08.35.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 10 Mar 2017 08:35:09 -0800 (PST) From: Thierry Reding To: "David S . Miller" Cc: Giuseppe Cavallaro , Alexandre Torgue , Joao Pinto , Jon Hunter , Mikko Perttunen , netdev@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/9] net: stmmac: Balance PTP reference clock enable/disable Date: Fri, 10 Mar 2017 17:34:56 +0100 Message-Id: <20170310163501.31811-5-thierry.reding@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170310163501.31811-1-thierry.reding@gmail.com> References: <20170310163501.31811-1-thierry.reding@gmail.com> Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org 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. Reviewed-By: Joao Pinto 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 6060410d2b9e..ce6d7e791f3f 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 f2d94eafeb0a..fe49c3105755 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); }