From patchwork Tue Jul 28 17:49:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han Xu X-Patchwork-Id: 6887801 Return-Path: X-Original-To: patchwork-dmaengine@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 1891D9F380 for ; Tue, 28 Jul 2015 18:13:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0CADD20534 for ; Tue, 28 Jul 2015 18:13:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7D87220645 for ; Tue, 28 Jul 2015 18:13:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753185AbbG1SM4 (ORCPT ); Tue, 28 Jul 2015 14:12:56 -0400 Received: from mail-bl2on0106.outbound.protection.outlook.com ([65.55.169.106]:32535 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752190AbbG1SMy (ORCPT ); Tue, 28 Jul 2015 14:12:54 -0400 X-Greylist: delayed 955 seconds by postgrey-1.27 at vger.kernel.org; Tue, 28 Jul 2015 14:12:53 EDT Received: from DM2PR03CA0002.namprd03.prod.outlook.com (10.141.96.12) by DM2PR0301MB1277.namprd03.prod.outlook.com (10.160.221.146) with Microsoft SMTP Server (TLS) id 15.1.225.19; Tue, 28 Jul 2015 17:56:57 +0000 Received: from BN1AFFO11FD024.protection.gbl (2a01:111:f400:7c10::121) by DM2PR03CA0002.outlook.office365.com (2a01:111:e400:2428::12) with Microsoft SMTP Server (TLS) id 15.1.225.19 via Frontend Transport; Tue, 28 Jul 2015 17:56:56 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; vger.kernel.org; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD024.mail.protection.outlook.com (10.58.52.84) with Microsoft SMTP Server (TLS) id 15.1.231.11 via Frontend Transport; Tue, 28 Jul 2015 17:56:56 +0000 Received: from chopperman.am.freescale.net (chopperman.am.freescale.net [10.81.16.64]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id t6SHutr3027362; Tue, 28 Jul 2015 10:56:55 -0700 From: Han Xu To: CC: , , Subject: [PATCH 2/6] dmaengine: mxs: support i.MX7D and deep sleep mode Date: Tue, 28 Jul 2015 12:49:13 -0500 Message-ID: <1438105753-22146-1-git-send-email-b45815@freescale.com> X-Mailer: git-send-email 1.9.1 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD024; 1:16JifGhkmP+e4tepHNhfMFmsLd6ypgxFLHRnlSCJrKkaDmVYsA0RQfAeD+lDCjZCJGun8Lx6wqCoQI4sMbM1MmMDpl3OgwKkn8DrjLhCx/8vBDRbadCkDCZisTO5YTX1DoTzubztlsAtbSc/dsSda4U5+n7xRKyXjirfizmqQ4wbLndeVF05RLQh5RuYtlWrP/MQ+xhlX/Y+m8X90WBJIyCZ6lJmSiIt9KX48YcpkZJaMQLK4Mhd82EZGYQJTfSSoyi65t0QfR9IxeRDl6Czte2/k+eHs6egljDAfeurNB7L1rTSUwW/iiCoikk+VRJ+H1EovxQLUOFPASJJ6SdOdw== X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(339900001)(199003)(189002)(2351001)(50226001)(33646002)(189998001)(46102003)(50986999)(92566002)(77156002)(5001960100002)(6806004)(62966003)(19580395003)(48376002)(36756003)(110136002)(104016003)(19580405001)(87936001)(77096005)(85426001)(47776003)(106466001)(105606002)(229853001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR0301MB1277; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:sfv; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1277; 2:2zPrdcXdz5rIh03Q1LeTgsmWo2r0xzh2VvVpADZ0ayNZm47DsYXxzZMFeg/WwZUQq4rLa2nlrEWNV2PNIA62VUCGvc5bJjd7r91pC7BugtFlVz8nZwfTeMiKM0n7y0ZQJ4RrIMwUgBRGTWdio2c2MsPoZQIGDPt4lH/7FnW6/eg=; 3:6UW3/5uQZ1rdBRZn8eAiTis9yuJHTx++ASH5sW/yZQ5PUXG4eC1FZIyNT7gegPOcNibBWuRzILBn1qt9sk+4KWvAF8lKofPiTDusnlojISp2SmAwMWxdMJQYSxOkD7j++94t0Vf1zyVWPpSqf/tiOiGPbJAt0Nc4HlJEYySNKqtFaGbhVbeCIhdyzYKXjvTooY0r2rfxM4BExGtA8BlH1YB47Rzgo3axDE2vo7FmtFQ=; 25:WG/uRSC1iwhKQn3mb6uwCzZFH0i2IGIrUZ3ZGlSb4+zZIquaybRG/ZV750j4UBGepO6U9TlIBWTrnPSNsMgKwK/ghwA73NuspnLqeAkzoeUpNLZJ5nP9rOE1DfN352TqoSwmLLkEGyUJqwe3Ipz7uWJZAdehiDaOy0tp3pSz+FaLTQpKUCjDVP06mwhLrfind+v+az93qv225gaIdlZ+/0CwTqcE1xvyN3bJpHsHLYDIH3D1Nh3uR7BlN6OXh5ek X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB1277; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1277; 20:/KHS3agDM4D0z2or332vj6saB8tSopOw/7vrBek5EuMWncJObdWdsXuF8sP8Ma9iAFqIui0ZFZU8BrxNQnoaAG7tAfseWb2PnGDkLW73Qo+g6WGo6m8Cn2FA1yhNLcFs35RwP3GK8r1YyadKq1m8/mJ1DMZ5+6P+iku7R/wqticxUfBNbcey8rZS9Vr/KlM9s5VUFQy4HLuyn0qIKhyz6fL+ViCvH7WV3F0xAF7gEB68GDSBS+hOsV/3E4ELxI1PJu4BwhJMk97HzMTHWOXeOLm393z1XFS9AUbzK3z5M5Gfmg1Ga4L5jXzzU0xHG6ilAwiwk4xr/27RdMxHAApy5HDHX6N2Sn7hSMMtEeAz5ck=; 4:A4Wta3cETAh2oQJKk/ICST7YrFtk7FHWxGzRxqsedHK/ymgmMMOey665xMfI2Cupy8m+1YKRJPcX4WUgpqsaouy2mnMN6Mx9CA1LPjUgyaIicKM17OPc2c7nsSYc2BMA8wFotOdNGM9TepPBhhKAWjvAElcJLei2hqOKIiltzPHElgN3rPMT010prGKBUi0Tzi61AZT4xafATok7rW6Ezgk1ubTybfr/o/qSIh2912yWer/KX2N22JUDFyyxwXb2zIGWHbBQNF0P9yVqZZ2/q3Vk2X8nS4m8a196ICgz3So= DM2PR0301MB1277: X-MS-Exchange-Organization-RulesExecuted X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:DM2PR0301MB1277; BCL:0; PCL:0; RULEID:; SRVR:DM2PR0301MB1277; X-Forefront-PRVS: 06515DA04B X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1277; 23:aw9sFuha35cyZKX4vZ/6DQy+0XLBTaohYOsp9Z2dvQcCO8kMPhTgO1mwQRXX2Hyc0h1vHu4z/bbe/RueT/ket1OWsorF5qld5k+CqlNxO8zBC7I4CRgi52c/PNFIjN/Okq19hIU8Gln+IvXVHqg9cW5v6mbfpg9rCqogoekOmNM+DpDrXAtm2BcFA6VDg0W9GjV1x85QLlhem5dm73EccdCGMoRsJblrruCdPyBp+S1uAmk4QZkoOYSMqIQARSPP4rK2MG6WIWIhsgbTajCRCA4jS/aO1LKYsEbSo1YVOpTa69wCqanfum4K7XybzGVBZraWyacORiFT3WhMjH64WFXa4RLt7EmxZeiV1rV3OU2V5waoZgDFxeCPlThSkpPkMX46g9DBz/Zk6s3gWHTfcElh8As682Z10V+OeuIc8/NcVBD1Vtq9F3SCDq/AslVLcQQtj9BF/Wt3XD9uMnpAEhZqNq6jEJhcMHkusDbWTe9F+pkmLJzVxDiMtialreMQYO/DawEl+m/DIg321M9Jb0TpRhUDsxwFmy/kT94yvBEZyEY82GMK+ZKRe9RACDLzyQsBNr9jNj/fbFtCWroPdCFkqa6NchAPtgANgk7sq79T7qA64NZ0AUF6H3DvRt1mAweqAj2yHOb8jGYgP6EFvBl47ZcQhH7twnaL40gboOyifotnV4+eBb1FqpO+f/BZUnBjHF3nMvClItRjv38qGsbrewBCneuBw6SbaBhBAMAVfDMEdkv5dSCJBlEqdpLnXDedmE6NXe9XVU53imnu56Y4dkq9I7g4uGuu3IXD/OE=; 5:fAx7K7TPJlfX0hLKUAlQLROsWfwv17BrgPoFcERi4ZzMRI+KOMBkmGHHgXtBJz7mv7dZAND/oMD7+2dskN1wwHHQYzP/i2uGi9Hepr1DgsOjJHcfFcqFY95Q AVCN3P6YeA6VTL856llJIDgK3ic61A== X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1277; 24:X5UjRf0URLMhiAfd2QLyaR0sj9uov7WrAdp5XkVy45w55mbSQNTtSYTPjgsNl1qlItphczE4olYAzB/q8v60Lwd7o3X2xxeeeStR2GGcXYY=; 20:lM3hSja2Cab4nPyo/6HVBBat7UuNQ7KzSh0q1rvAYpSzHnrlX2XYH7vNlSUG42a4bXKFRgAY+tQLCHkrHHHJdA== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jul 2015 17:56:56.2186 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB1277 Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 From: Huang Shijie The patch support i.MX7D platform by adding extra DMA clock. Deep Sleep Mode(dsm) turns off the power for APBH DMA module, add suspend/resume function and re-init the APBH DMA during resume. Signed-off-by: Huang Shijie Signed-off-by: Han Xu Signed-off-by: Adrian Alonso --- drivers/dma/mxs-dma.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 67 insertions(+), 6 deletions(-) diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c index 60de352..2b0915d 100644 --- a/drivers/dma/mxs-dma.c +++ b/drivers/dma/mxs-dma.c @@ -1,5 +1,5 @@ /* - * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2011-2015 Freescale Semiconductor, Inc. All Rights Reserved. * * Refer to drivers/dma/imx-sdma.c * @@ -28,7 +28,6 @@ #include #include #include - #include #include "dmaengine.h" @@ -135,6 +134,7 @@ enum mxs_dma_devtype { enum mxs_dma_id { IMX23_DMA, IMX28_DMA, + IMX7D_DMA, }; struct mxs_dma_engine { @@ -142,6 +142,7 @@ struct mxs_dma_engine { enum mxs_dma_devtype type; void __iomem *base; struct clk *clk; + struct clk *clk_io; struct dma_device dma_device; struct device_dma_parameters dma_parms; struct mxs_dma_chan mxs_chans[MXS_DMA_CHANNELS]; @@ -167,6 +168,9 @@ static struct mxs_dma_type mxs_dma_types[] = { }, { .id = IMX28_DMA, .type = MXS_DMA_APBX, + }, { + .id = IMX7D_DMA, + .type = MXS_DMA_APBH, } }; @@ -184,6 +188,9 @@ static const struct platform_device_id mxs_dma_ids[] = { .name = "imx28-dma-apbx", .driver_data = (kernel_ulong_t) &mxs_dma_types[3], }, { + .name = "imx7d-dma-apbh", + .driver_data = (kernel_ulong_t) &mxs_dma_types[4], + }, { /* end of list */ } }; @@ -193,6 +200,7 @@ static const struct of_device_id mxs_dma_dt_ids[] = { { .compatible = "fsl,imx23-dma-apbx", .data = &mxs_dma_ids[1], }, { .compatible = "fsl,imx28-dma-apbh", .data = &mxs_dma_ids[2], }, { .compatible = "fsl,imx28-dma-apbx", .data = &mxs_dma_ids[3], }, + { .compatible = "fsl,imx7d-dma-apbh", .data = &mxs_dma_ids[4], }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, mxs_dma_dt_ids); @@ -440,6 +448,12 @@ static int mxs_dma_alloc_chan_resources(struct dma_chan *chan) if (ret) goto err_clk; + if (mxs_dma->dev_id == IMX7D_DMA) { + ret = clk_prepare_enable(mxs_dma->clk_io); + if (ret) + goto err_clk_unprepare; + } + mxs_dma_reset_chan(chan); dma_async_tx_descriptor_init(&mxs_chan->desc, chan); @@ -450,6 +464,8 @@ static int mxs_dma_alloc_chan_resources(struct dma_chan *chan) return 0; +err_clk_unprepare: + clk_disable_unprepare(mxs_dma->clk); err_clk: free_irq(mxs_chan->chan_irq, mxs_dma); err_irq: @@ -471,6 +487,9 @@ static void mxs_dma_free_chan_resources(struct dma_chan *chan) dma_free_coherent(mxs_dma->dma_device.dev, CCW_BLOCK_SIZE, mxs_chan->ccw, mxs_chan->ccw_phys); + if (mxs_dma->dev_id == IMX7D_DMA) + clk_disable_unprepare(mxs_dma->clk_io); + clk_disable_unprepare(mxs_dma->clk); } @@ -693,7 +712,7 @@ static enum dma_status mxs_dma_tx_status(struct dma_chan *chan, return mxs_chan->status; } -static int __init mxs_dma_init(struct mxs_dma_engine *mxs_dma) +static int mxs_dma_init(struct mxs_dma_engine *mxs_dma) { int ret; @@ -701,6 +720,12 @@ static int __init mxs_dma_init(struct mxs_dma_engine *mxs_dma) if (ret) return ret; + if (mxs_dma->dev_id == IMX7D_DMA) { + ret = clk_prepare_enable(mxs_dma->clk_io); + if (ret) + goto err_out; + } + ret = stmp_reset_block(mxs_dma->base); if (ret) goto err_out; @@ -803,9 +828,19 @@ static int __init mxs_dma_probe(struct platform_device *pdev) if (IS_ERR(mxs_dma->base)) return PTR_ERR(mxs_dma->base); - mxs_dma->clk = devm_clk_get(&pdev->dev, NULL); - if (IS_ERR(mxs_dma->clk)) - return PTR_ERR(mxs_dma->clk); + if (mxs_dma->dev_id == IMX7D_DMA) { + mxs_dma->clk = devm_clk_get(&pdev->dev, "dma_apbh_bch"); + if (IS_ERR(mxs_dma->clk)) + return PTR_ERR(mxs_dma->clk); + mxs_dma->clk_io = devm_clk_get(&pdev->dev, "dma_apbh_io"); + if (IS_ERR(mxs_dma->clk_io)) + return PTR_ERR(mxs_dma->clk_io); + + } else { + mxs_dma->clk = devm_clk_get(&pdev->dev, NULL); + if (IS_ERR(mxs_dma->clk)) + return PTR_ERR(mxs_dma->clk); + } dma_cap_set(DMA_SLAVE, mxs_dma->dma_device.cap_mask); dma_cap_set(DMA_CYCLIC, mxs_dma->dma_device.cap_mask); @@ -835,6 +870,7 @@ static int __init mxs_dma_probe(struct platform_device *pdev) mxs_dma->pdev = pdev; mxs_dma->dma_device.dev = &pdev->dev; + dev_set_drvdata(&pdev->dev, mxs_dma); /* mxs_dma gets 65535 bytes maximum sg size */ mxs_dma->dma_device.dev->dma_parms = &mxs_dma->dma_parms; @@ -872,9 +908,34 @@ static int __init mxs_dma_probe(struct platform_device *pdev) return 0; } +static int mxs_dma_pm_suspend(struct device *dev) +{ + /* + * We do not save any registers here, since the gpmi will release its + * DMA channel. + */ + return 0; +} + +static int mxs_dma_pm_resume(struct device *dev) +{ + struct mxs_dma_engine *mxs_dma = dev_get_drvdata(dev); + int ret; + + ret = mxs_dma_init(mxs_dma); + if (ret) + return ret; + return 0; +} + +static const struct dev_pm_ops mxs_dma_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(mxs_dma_pm_suspend, mxs_dma_pm_resume) +}; + static struct platform_driver mxs_dma_driver = { .driver = { .name = "mxs-dma", + .pm = &mxs_dma_pm_ops, .of_match_table = mxs_dma_dt_ids, }, .id_table = mxs_dma_ids,