From patchwork Thu Feb 23 17:24:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 731632 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vTh4S6PmHz9s7C for ; Fri, 24 Feb 2017 04:27:04 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="U3HMwz9F"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751755AbdBWR0G (ORCPT ); Thu, 23 Feb 2017 12:26:06 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:36014 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751126AbdBWRZA (ORCPT ); Thu, 23 Feb 2017 12:25:00 -0500 Received: by mail-wm0-f65.google.com with SMTP id r18so992134wmd.3; Thu, 23 Feb 2017 09:24:45 -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=CSeEOfdHEAmGS/eHS7MJ85EKrF9QnJR2fjbYR5rop9Y=; b=U3HMwz9Fhzct1L9DxsVigA3vvw34rOnTTxRM8qIQMmfTo4NPKvPMWq15mxIXtp3qF9 ix2F39PglGT7wwS8JiBhm7oIPNjUh4e4Bya/fX6DB2KzVz1PeLNxOEfvJ2c4WulC6m2b umldWb9HQC3A9VJwTqBrwCs4al6Zh99KKgRSZYFzagQ1wDhdQ9wXGTXKuHpmQNKfTVMX /NB0i68EAMfWcJYs5bVEdlA1CY4X3UdCvgG9FlZvhUEtsmnR2AggoDOmprHgixrb8SFb quy4dOoeZXDdyUsiXc4qor+ZBLM9WvR3O0zka6I6E8CR/4YeFIrafGbvYI7z6lwnccFk 3QmA== 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=CSeEOfdHEAmGS/eHS7MJ85EKrF9QnJR2fjbYR5rop9Y=; b=ETyZg0+Mz4sRaa8td6IoCx4Ws4OzpneDEnJtdwd/xFRMIbWghARMMRSRlXsE2HxTsA d3BB98cnqUQ2qEZu4VWs1C4bsYtitgGkBsnn7Plh6AXQ2RPTfF9+tkWCtz1M+XqAxZj/ AFWhTp3vl0T36VJK3InKFQjyVbzK11E6hlityF9yQmLgJFjj6wMw+8xPXTSZ+6yWUpc1 uC5IFiZ8UbHb0mDQ0uYlmqDBdO9Mw9f1z60/688b4lY5nI0PUGXDNRGxSBXO4cPWNEDG C44Yr+uUaU4EwepJ3r+5uFv3/Et8z7UrFkDmC8YuLtxpoA4a1NwjJqEu4nTMBKKQ5DAA qtWA== X-Gm-Message-State: AMke39ljCQzvjjTgL6J6iDILJeXgE00q3rs2PSq6+oX7qIBi0lS1MxoQyw88L6OjIt0zAA== X-Received: by 10.28.102.67 with SMTP id a64mr6104674wmc.140.1487870684121; Thu, 23 Feb 2017 09:24:44 -0800 (PST) Received: from localhost (port-435.pppoe.wtnet.de. [84.46.1.180]) by smtp.gmail.com with ESMTPSA id o2sm6851291wra.42.2017.02.23.09.24.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 23 Feb 2017 09:24:42 -0800 (PST) From: Thierry Reding To: "David S . Miller" Cc: Giuseppe Cavallaro , Alexandre Torgue , Rob Herring , Mark Rutland , Joao Pinto , Alexandre Courbot , Jon Hunter , netdev@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/7] net: stmmac: Balance PTP reference clock enable/disable Date: Thu, 23 Feb 2017 18:24:33 +0100 Message-Id: <20170223172438.14770-3-thierry.reding@gmail.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170223172438.14770-1-thierry.reding@gmail.com> References: <20170223172438.14770-1-thierry.reding@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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. Signed-off-by: Thierry Reding Reviewed-By: Joao Pinto --- 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); }