From patchwork Tue Nov 8 13:29:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 9417373 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 14CCF60585 for ; Tue, 8 Nov 2016 13:30:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0674029125 for ; Tue, 8 Nov 2016 13:30:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EF54E29127; Tue, 8 Nov 2016 13:30:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6AE5729114 for ; Tue, 8 Nov 2016 13:30:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752164AbcKHNat (ORCPT ); Tue, 8 Nov 2016 08:30:49 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:11982 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750980AbcKHNac (ORCPT ); Tue, 8 Nov 2016 08:30:32 -0500 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OGB006HES6JPI30@mailout1.w1.samsung.com>; Tue, 08 Nov 2016 13:30:20 +0000 (GMT) Received: from eusmges2.samsung.com (unknown [203.254.199.241]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20161108133019eucas1p2cb7b8d78b3d88d7ea7d6da272b78bb30~FFZ2Xmfn32886828868eucas1p2u; Tue, 8 Nov 2016 13:30:19 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2.samsung.com (EUCPMTA) with SMTP id 65.18.02283.A63D1285; Tue, 8 Nov 2016 13:30:18 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20161108133018eucas1p27180e82ae25189bda573766251491e66~FFZ1wghCi0080000800eucas1p2S; Tue, 8 Nov 2016 13:30:18 +0000 (GMT) X-AuditID: cbfec7f1-f79f46d0000008eb-b6-5821d36af83c Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 6F.97.07726.963D1285; Tue, 8 Nov 2016 13:30:17 +0000 (GMT) Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OGB005BFS5J9G30@eusync1.samsung.com>; Tue, 08 Nov 2016 13:30:18 +0000 (GMT) From: Marek Szyprowski To: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, linux-samsung-soc@vger.kernel.org, Joerg Roedel Cc: Marek Szyprowski , Inki Dae , Kukjin Kim , Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , "Rafael J. Wysocki" , Mark Brown , "Luis R. Rodriguez" , Greg Kroah-Hartman , Tomeu Vizoso , Lukas Wunner , Kevin Hilman , Tobias Jakobi , Tomasz Figa Subject: [PATCH v6 6/7] iommu/exynos: Add runtime pm support Date: Tue, 08 Nov 2016 14:29:23 +0100 Message-id: <1478611764-6473-7-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1478611764-6473-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAAzWSe0hTYRjG+85tR+3EaY766CJuZFJhNSn6SImCqEN/Bd1G99EO09JpO9mV aKS5C+ksFYcrtZYVszE1sbTwsmwzZs1cRQQzvNEdldEV0XRn/ve8vM/7e98HXhqX3iIX0Zm6 U7xep85SULFEs/dvIOV4UK5a669NRw02N4nKB4YplO9wU+j6xxIC1bSnIbO9XoKsQ99wNPJw CEOBwHQZbL1BoXBRF0C2QBuGPn9ajFxdIQl6XzICUI+/j0SFdWMkcrZOAFTs6qM2x3PDnVUY 9zh0B3AtlSEJ1+g0U1z7zQcSrvT9PcBNeiVc01sjwRU3OQEXbkzgbMZmcmfc/th0DZ+VeZrX r9l0NDbjZYuVyC1ddnYwWIAZQH2CBcTQkF0HP+SXS0S9APb2uykLiKWlbC2ATVcbMLEIA3jZ 5cRmJ558nyLExl0Aiz5WR10GDFY5HkVcFKuElh+WCEvGOgDstr+LuHC2g4Bfrg3hFkDT8Ww6 dPSyMwMEmwTHzP7IIQy7Hf667Y0elQBfeEvJGR3DcrD7/kCEA9mfEui6NkHOcCC7FDZ24KJ/ KzSUTRKijodffU1RzhJoNnVGI1in81xZJWobgK9+MKJOg898ryO7cHYevN5cgYt4BpoKpaKF gx325ih+C7xd2U+K4e0A9hnHiRKwpAbMcQIZnydka3khdbWgzhbydNrVx3KyG8H04/gnfeOP wWj3Rg9gaaCYy3y2JqqkpPq0cC7bAyCNK2RM8JVcJWU06nPneX3OEX1eFi94wGKaUCxknta8 2SdltepT/Amez+X1s12MjllkAMpOZXmy44K8Tv6tYiTlEvYmbGJ2pPb3nHj7b4N2rw2mftco h1vQoTOJN1Qyb0pu9dpjY8asEb95V1UoOW5+uEy/ovi3lty3wZdkGFy/VHrwkeZkWkjw7h7l 9vSA59tNBdsy/+hcbs8Btykl7ubArotThzN8y9Vt3FRn0cSgRkEIGWrlSlwvqP8DULflwTQD AAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrAIsWRmVeSWpSXmKPExsVy+t/xy7qZlxUjDHY/0LfYOGM9q8XUh0/Y LJoXr2ezmHR/AovFgv3WFp2zN7Bb9D9+zWzxdPNjJovz54Hcy7vmsFl87j3CaDHj/D4mixfP pS3WHrnLbnFjwlNGizOnL7FatK3+wGqxatcfRou+tZfYHIQ9nhycx+Sx4+4SRo+ds+6ye2xa 1cnmsX/uGnaPyTeWM3r8O8buseVqO4tH35ZVjB6fN8l5zGjfxhrAHeVmk5GamJJapJCal5yf kpmXbqsUGuKma6GkkJeYm2qrFKHrGxKkpFCWmFMK5BkZoAEH5wD3YCV9uwS3jLM7+1kKJqtU PLrcwtTAuEGui5GTQ0LARGL3m/8sELaYxIV769m6GLk4hASWMEr0/P3JBpIQEmhiAnKUQWw2 AUOJrrddYEUiAosZJRoOTWEEcZgFjrFILO45yNzFyMEhLGAjsfiCAEgDi4CqxIfO0+wgNq+A u8S3RcfYIbbJSZw8NpkVxOYU8JA4seIhE8Qyd4lfG56xT2DkXcDIsIpRJLW0ODc9t9hQrzgx t7g0L10vOT93EyMw9rYd+7l5B+OljcGHGAU4GJV4eF/0K0QIsSaWFVfmHmKU4GBWEuG9fE4x Qog3JbGyKrUoP76oNCe1+BCjKdBRE5mlRJPzgWkhryTe0MTQ3NLQyNjCwtzISEmct+TDlXAh gfTEktTs1NSC1CKYPiYOTqkGxjnH7iQlah2UFs/8y7VZTlh1se7V86Ufay9MuKiRNFuwref0 ytti1fed70gyuIg1Tf5y/55axvLTvip+Vz9rlry6YTG/mfnUQx+vE+HR1xsXBD29WvEi/f0c O9erf1/1c+uKW5WZ9Ln7iez/ai7w1Ttt+fbAxnuOVRo5HA9qXWf+TE7jNP3xQ4mlOCPRUIu5 qDgRAMzHaJnTAgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20161108133018eucas1p27180e82ae25189bda573766251491e66 X-Msg-Generator: CA X-Sender-IP: 182.198.249.179 X-Local-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRs=?= =?UTF-8?B?7IK87ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRtT?= =?UTF-8?B?YW1zdW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20161108133018eucas1p27180e82ae25189bda573766251491e66 X-RootMTR: 20161108133018eucas1p27180e82ae25189bda573766251491e66 References: <1478611764-6473-1-git-send-email-m.szyprowski@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds runtime pm implementation, which is based on previous suspend/resume code. SYSMMU controller is now being enabled/disabled mainly from the runtime pm callbacks. System sleep callbacks relies on generic pm_runtime_force_suspend/pm_runtime_force_resume helpers. To ensure internal state consistency, additional lock for runtime pm transitions was introduced. Signed-off-by: Marek Szyprowski --- drivers/iommu/exynos-iommu.c | 45 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c index a959443..5e6d7bb 100644 --- a/drivers/iommu/exynos-iommu.c +++ b/drivers/iommu/exynos-iommu.c @@ -206,6 +206,7 @@ struct sysmmu_fault_info { struct exynos_iommu_owner { struct list_head controllers; /* list of sysmmu_drvdata.owner_node */ struct iommu_domain *domain; /* domain this device is attached */ + struct mutex rpm_lock; /* for runtime pm of all sysmmus */ }; /* @@ -594,40 +595,46 @@ static int __init exynos_sysmmu_probe(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM_SLEEP -static int exynos_sysmmu_suspend(struct device *dev) +static int __maybe_unused exynos_sysmmu_suspend(struct device *dev) { struct sysmmu_drvdata *data = dev_get_drvdata(dev); struct device *master = data->master; if (master) { - pm_runtime_put(dev); + struct exynos_iommu_owner *owner = master->archdata.iommu; + + mutex_lock(&owner->rpm_lock); if (data->domain) { dev_dbg(data->sysmmu, "saving state\n"); __sysmmu_disable(data); } + mutex_unlock(&owner->rpm_lock); } return 0; } -static int exynos_sysmmu_resume(struct device *dev) +static int __maybe_unused exynos_sysmmu_resume(struct device *dev) { struct sysmmu_drvdata *data = dev_get_drvdata(dev); struct device *master = data->master; if (master) { - pm_runtime_get_sync(dev); + struct exynos_iommu_owner *owner = master->archdata.iommu; + + mutex_lock(&owner->rpm_lock); if (data->domain) { dev_dbg(data->sysmmu, "restoring state\n"); __sysmmu_enable(data); } + mutex_unlock(&owner->rpm_lock); } return 0; } -#endif static const struct dev_pm_ops sysmmu_pm_ops = { - SET_LATE_SYSTEM_SLEEP_PM_OPS(exynos_sysmmu_suspend, exynos_sysmmu_resume) + SET_RUNTIME_PM_OPS(exynos_sysmmu_suspend, exynos_sysmmu_resume, NULL) + SET_LATE_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, + pm_runtime_force_resume) }; static const struct of_device_id sysmmu_of_match[] __initconst = { @@ -775,7 +782,15 @@ static void exynos_iommu_detach_device(struct iommu_domain *iommu_domain, return; list_for_each_entry(data, &owner->controllers, owner_node) { - __sysmmu_disable(data); + pm_runtime_put_sync(data->sysmmu); + } + + mutex_lock(&owner->rpm_lock); + + list_for_each_entry(data, &owner->controllers, owner_node) { + pm_runtime_get_noresume(data->sysmmu); + if (pm_runtime_active(data->sysmmu)) + __sysmmu_disable(data); pm_runtime_put(data->sysmmu); } @@ -790,6 +805,7 @@ static void exynos_iommu_detach_device(struct iommu_domain *iommu_domain, owner->domain = NULL; spin_unlock_irqrestore(&domain->lock, flags); + mutex_unlock(&owner->rpm_lock); dev_dbg(dev, "%s: Detached IOMMU with pgtable %pa\n", __func__, &pagetable); @@ -810,6 +826,8 @@ static int exynos_iommu_attach_device(struct iommu_domain *iommu_domain, if (owner->domain) exynos_iommu_detach_device(owner->domain, dev); + mutex_lock(&owner->rpm_lock); + spin_lock_irqsave(&domain->lock, flags); list_for_each_entry(data, &owner->controllers, owner_node) { spin_lock(&data->lock); @@ -822,8 +840,16 @@ static int exynos_iommu_attach_device(struct iommu_domain *iommu_domain, spin_unlock_irqrestore(&domain->lock, flags); list_for_each_entry(data, &owner->controllers, owner_node) { + pm_runtime_get_noresume(data->sysmmu); + if (pm_runtime_active(data->sysmmu)) + __sysmmu_enable(data); + pm_runtime_put(data->sysmmu); + } + + mutex_unlock(&owner->rpm_lock); + + list_for_each_entry(data, &owner->controllers, owner_node) { pm_runtime_get_sync(data->sysmmu); - __sysmmu_enable(data); } dev_dbg(dev, "%s: Attached IOMMU with pgtable %pa\n", __func__, @@ -1200,6 +1226,7 @@ static int exynos_iommu_of_xlate(struct device *dev, return -ENOMEM; INIT_LIST_HEAD(&owner->controllers); + mutex_init(&owner->rpm_lock); dev->archdata.iommu = owner; }