From patchwork Fri Dec 22 13:31:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Faiz Abbas X-Patchwork-Id: 852366 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=ti.com header.i=@ti.com header.b="mYzABzeS"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3z38YQ6Cc0z9s7f for ; Sat, 23 Dec 2017 00:31:38 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756039AbdLVNbV (ORCPT ); Fri, 22 Dec 2017 08:31:21 -0500 Received: from lelnx194.ext.ti.com ([198.47.27.80]:49162 "EHLO lelnx194.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755386AbdLVNbM (ORCPT ); Fri, 22 Dec 2017 08:31:12 -0500 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by lelnx194.ext.ti.com (8.15.1/8.15.1) with ESMTP id vBMDV3F1009078; Fri, 22 Dec 2017 07:31:04 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1513949464; bh=DnYPHIvF6+qG+1BkLtKccBo0Q/aqSlGMmI0V7//ivCM=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=mYzABzeSlibS0Bkjw8mPZNVIKbQHRwOAt9b0DSD2ZBpdg/S8c+9/oQrtbYqF+P+k0 TRz2+vEIRpZQwv3cE0IBTHFNIV1sSHSNE2DSdr+YzMxuhSxN4kMhimgcPeuJnXVktZ nJhiLBsBb7MIbzCtuLL5DOVCSUG9peGivaLL7JAA= Received: from DLEE112.ent.ti.com (dlee112.ent.ti.com [157.170.170.23]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id vBMDV3a6012584; Fri, 22 Dec 2017 07:31:03 -0600 Received: from DLEE100.ent.ti.com (157.170.170.30) by DLEE112.ent.ti.com (157.170.170.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1261.35; Fri, 22 Dec 2017 07:31:02 -0600 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE100.ent.ti.com (157.170.170.30) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1261.35 via Frontend Transport; Fri, 22 Dec 2017 07:31:02 -0600 Received: from a0230074-OptiPlex-7010.india.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id vBMDUkNS022298; Fri, 22 Dec 2017 07:30:58 -0600 From: Faiz Abbas To: , , , CC: , , , , , , , , , Subject: [PATCH v6 3/6] can: m_can: Add PM Runtime Date: Fri, 22 Dec 2017 19:01:25 +0530 Message-ID: <1513949488-13026-4-git-send-email-faiz_abbas@ti.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513949488-13026-1-git-send-email-faiz_abbas@ti.com> References: <1513949488-13026-1-git-send-email-faiz_abbas@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Franklin S Cooper Jr Add support for PM Runtime which is the new way to handle managing clocks. However, to avoid breaking SoCs not using PM_RUNTIME leave the old clk management approach in place. PM_RUNTIME is required by OMAP based devices to handle clock management. Therefore, this allows future Texas Instruments SoCs that have the MCAN IP to work with this driver. Signed-off-by: Franklin S Cooper Jr [nsekhar@ti.com: handle pm_runtime_get_sync() failure, fix some bugs] Signed-off-by: Sekhar Nori Signed-off-by: Faiz Abbas --- drivers/net/can/m_can/m_can.c | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c index f72116e..53e764f 100644 --- a/drivers/net/can/m_can/m_can.c +++ b/drivers/net/can/m_can/m_can.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -625,19 +626,33 @@ static int m_can_clk_start(struct m_can_priv *priv) { int err; + err = pm_runtime_get_sync(priv->device); + if (err) { + pm_runtime_put_noidle(priv->device); + return err; + } + err = clk_prepare_enable(priv->hclk); if (err) - return err; + goto pm_runtime_put; err = clk_prepare_enable(priv->cclk); if (err) - clk_disable_unprepare(priv->hclk); + goto disable_hclk; return err; + +disable_hclk: + clk_disable_unprepare(priv->hclk); +pm_runtime_put: + pm_runtime_put_sync(priv->device); + return err; } static void m_can_clk_stop(struct m_can_priv *priv) { + pm_runtime_put_sync(priv->device); + clk_disable_unprepare(priv->cclk); clk_disable_unprepare(priv->hclk); } @@ -1577,13 +1592,20 @@ static int m_can_plat_probe(struct platform_device *pdev) /* Enable clocks. Necessary to read Core Release in order to determine * M_CAN version */ + pm_runtime_enable(&pdev->dev); + ret = pm_runtime_get_sync(&pdev->dev); + if (ret) { + pm_runtime_put_noidle(&pdev->dev); + goto pm_runtime_fail; + } + ret = clk_prepare_enable(hclk); if (ret) - goto disable_hclk_ret; + goto pm_runtime_put; ret = clk_prepare_enable(cclk); if (ret) - goto disable_cclk_ret; + goto disable_hclk_ret; res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "m_can"); addr = devm_ioremap_resource(&pdev->dev, res); @@ -1666,6 +1688,11 @@ static int m_can_plat_probe(struct platform_device *pdev) clk_disable_unprepare(cclk); disable_hclk_ret: clk_disable_unprepare(hclk); +pm_runtime_put: + pm_runtime_put_sync(&pdev->dev); +pm_runtime_fail: + if (ret) + pm_runtime_disable(&pdev->dev); failed_ret: return ret; } @@ -1723,6 +1750,9 @@ static int m_can_plat_remove(struct platform_device *pdev) struct net_device *dev = platform_get_drvdata(pdev); unregister_m_can_dev(dev); + + pm_runtime_disable(&pdev->dev); + platform_set_drvdata(pdev, NULL); free_m_can_dev(dev);