From patchwork Thu Apr 28 11:03:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Pargmann X-Patchwork-Id: 8968531 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DC1709F441 for ; Thu, 28 Apr 2016 11:06:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 433B720295 for ; Thu, 28 Apr 2016 11:06:23 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 32F1420138 for ; Thu, 28 Apr 2016 11:06:22 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1avjkM-0007T5-Sl; Thu, 28 Apr 2016 11:04:38 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1avjkJ-0007S2-S3 for linux-arm-kernel@lists.infradead.org; Thu, 28 Apr 2016 11:04:36 +0000 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtps (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1avjjt-00029N-R4; Thu, 28 Apr 2016 13:04:09 +0200 Received: from mpa by dude.hi.pengutronix.de with local (Exim 4.87) (envelope-from ) id 1avjjs-00082P-Qb; Thu, 28 Apr 2016 13:04:08 +0200 From: Markus Pargmann To: Mark Brown Subject: [PATCH] spi: imx: Add pm-runtime autosuspend Date: Thu, 28 Apr 2016 13:03:31 +0200 Message-Id: <1461841411-26529-1-git-send-email-mpa@pengutronix.de> X-Mailer: git-send-email 2.8.0.rc3 X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: mpa@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160428_040436_096937_44433082 X-CRM114-Status: GOOD ( 15.35 ) X-Spam-Score: -2.9 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sascha Hauer , linux-spi@vger.kernel.org, kernel@pengutronix.de, Markus Pargmann , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently for each transfer the two clocks are enabled and disabled. For heavy SPI usage this can lead to a significant overhead. This patch replaces the clock enable/disable for each transfer by runtime pm autosuspend. The spi core offers the possibility to control resume/suspend and autosuspension marks by setting "auto_runtime_pm". To support systems without CONFIG_PM set, the functions spi_imx_runtime_resume()/suspend() are called manually if the pm_runtime_* functions fail. Signed-off-by: Markus Pargmann --- drivers/spi/spi-imx.c | 76 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 47 insertions(+), 29 deletions(-) diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index 50769078e72e..79038533bc4f 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -1098,32 +1099,33 @@ static void spi_imx_cleanup(struct spi_device *spi) { } -static int -spi_imx_prepare_message(struct spi_master *master, struct spi_message *msg) +static int spi_imx_runtime_resume(struct device *dev) { + struct spi_master *master = dev_get_drvdata(dev); struct spi_imx_data *spi_imx = spi_master_get_devdata(master); int ret; - ret = clk_enable(spi_imx->clk_per); + ret = clk_prepare_enable(spi_imx->clk_per); if (ret) return ret; - ret = clk_enable(spi_imx->clk_ipg); + ret = clk_prepare_enable(spi_imx->clk_ipg); if (ret) { - clk_disable(spi_imx->clk_per); + clk_disable_unprepare(spi_imx->clk_per); return ret; } return 0; } -static int -spi_imx_unprepare_message(struct spi_master *master, struct spi_message *msg) +static int spi_imx_runtime_suspend(struct device *dev) { + struct spi_master *master = dev_get_drvdata(dev); struct spi_imx_data *spi_imx = spi_master_get_devdata(master); - clk_disable(spi_imx->clk_ipg); - clk_disable(spi_imx->clk_per); + clk_disable_unprepare(spi_imx->clk_per); + clk_disable_unprepare(spi_imx->clk_ipg); + return 0; } @@ -1137,7 +1139,7 @@ static int spi_imx_probe(struct platform_device *pdev) struct spi_master *master; struct spi_imx_data *spi_imx; struct resource *res; - int i, ret, num_cs, irq; + int i, ret, num_cs, irq, err; if (!np && !mxc_platform_info) { dev_err(&pdev->dev, "can't get the platform data\n"); @@ -1192,8 +1194,6 @@ static int spi_imx_probe(struct platform_device *pdev) spi_imx->bitbang.txrx_bufs = spi_imx_transfer; spi_imx->bitbang.master->setup = spi_imx_setup; spi_imx->bitbang.master->cleanup = spi_imx_cleanup; - spi_imx->bitbang.master->prepare_message = spi_imx_prepare_message; - spi_imx->bitbang.master->unprepare_message = spi_imx_unprepare_message; spi_imx->bitbang.master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH; if (is_imx51_ecspi(spi_imx)) spi_imx->bitbang.master->mode_bits |= SPI_LOOP; @@ -1233,13 +1233,17 @@ static int spi_imx_probe(struct platform_device *pdev) goto out_master_put; } - ret = clk_prepare_enable(spi_imx->clk_per); - if (ret) - goto out_master_put; + pm_runtime_set_autosuspend_delay(&pdev->dev, 500); + pm_runtime_use_autosuspend(&pdev->dev); + pm_runtime_enable(&pdev->dev); + spi_imx->bitbang.master->auto_runtime_pm = true; - ret = clk_prepare_enable(spi_imx->clk_ipg); - if (ret) - goto out_put_per; + ret = pm_runtime_get_sync(&pdev->dev); + if (ret) { + ret = spi_imx_runtime_resume(&pdev->dev); + if (ret) + goto out_master_put; + } spi_imx->spi_clk = clk_get_rate(spi_imx->clk_per); /* @@ -1249,7 +1253,7 @@ static int spi_imx_probe(struct platform_device *pdev) if (is_imx51_ecspi(spi_imx)) { ret = spi_imx_sdma_init(&pdev->dev, spi_imx, master); if (ret == -EPROBE_DEFER) - goto out_clk_put; + goto out_pm_runtime_put; if (ret < 0) dev_err(&pdev->dev, "dma setup error %d, use pio\n", @@ -1264,19 +1268,18 @@ static int spi_imx_probe(struct platform_device *pdev) ret = spi_bitbang_start(&spi_imx->bitbang); if (ret) { dev_err(&pdev->dev, "bitbang start failed with %d\n", ret); - goto out_clk_put; + goto out_pm_runtime_put; } - dev_info(&pdev->dev, "probed\n"); + pm_runtime_put_autosuspend(&pdev->dev); - clk_disable(spi_imx->clk_ipg); - clk_disable(spi_imx->clk_per); + dev_info(&pdev->dev, "probed\n"); return ret; -out_clk_put: - clk_disable_unprepare(spi_imx->clk_ipg); -out_put_per: - clk_disable_unprepare(spi_imx->clk_per); +out_pm_runtime_put: + err = pm_runtime_put_sync_suspend(&pdev->dev); + if (err == -ENOSYS) + spi_imx_runtime_suspend(&pdev->dev); out_master_put: spi_master_put(master); @@ -1287,21 +1290,36 @@ static int spi_imx_remove(struct platform_device *pdev) { struct spi_master *master = platform_get_drvdata(pdev); struct spi_imx_data *spi_imx = spi_master_get_devdata(master); + int ret; + + ret = pm_runtime_get_sync(&pdev->dev); spi_bitbang_stop(&spi_imx->bitbang); writel(0, spi_imx->base + MXC_CSPICTRL); - clk_unprepare(spi_imx->clk_ipg); - clk_unprepare(spi_imx->clk_per); + + if (ret) { + spi_imx_runtime_suspend(&pdev->dev); + } else { + pm_runtime_put_noidle(&pdev->dev); + pm_runtime_disable(&pdev->dev); + } + spi_imx_sdma_exit(spi_imx); spi_master_put(master); return 0; } +static const struct dev_pm_ops spi_imx_pm_ops = { + SET_RUNTIME_PM_OPS(spi_imx_runtime_suspend, spi_imx_runtime_resume, + NULL) +}; + static struct platform_driver spi_imx_driver = { .driver = { .name = DRIVER_NAME, + .pm = &spi_imx_pm_ops, .of_match_table = spi_imx_dt_ids, }, .id_table = spi_imx_devtype,