Received: by 10.223.148.5 with SMTP id 5csp7307269wrq; Thu, 18 Jan 2018 03:58:29 -0800 (PST) X-Google-Smtp-Source: ACJfBosfyb3KmcpAhHYjMaKAGuFrmfuJ0+ZO+BWHb1Ql1qSAMYlRj1yl1mHqgO6QDKIPS6K4AdDv X-Received: by 10.99.185.74 with SMTP id v10mr35755470pgo.361.1516276709492; Thu, 18 Jan 2018 03:58:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516276709; cv=none; d=google.com; s=arc-20160816; b=crSEstjSb5mq0GBQmtlUi4fTnfP1T60DJwR2GiXcz6iSOetB1CdK6IhnszD5lE4IHA F8jFpfZmVc6KX9ZhovghWv3wTaJxqQ3t4Ly9m/4GG7pSwROYuG8ag36y03LaIy3JWfhL nGMABLi/ogcjWyplJoLm9VVjb46VrUPb+UbxB206G25SktEstvZixEAfLjaqyVBvz9IZ NQbR5XbuLPi0JZ+UiIRrazc+kfybtiKanag69yc5uoFugeIYjcNWr5/GwGtgTTcBfwcN vsQJ1waACPrFKEhUmhVzJYnubXtNyhavatenDbENSePn9a8X0WJlBbRe4g0gPizxYHBB 333w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=YDITeXyvNKPx+2q53ww9I56fparQAa4juICRLlhQeAs=; b=FmixTNQL3soL8aH952o5FrcHH1DuRegBIUoVnPxwpgoHRlxL/RzUWuGib37LM1cRp9 7Gxv6Sck4XwpiLYyI21B15QBZZED0B1BrkTEFAYrXP/q3MDzLbyqLwkVHPect8UTG83U Nk5A8FUiJsTdJMhY7WnREH476w7aEhT+Pq+OxEUuL0v/MqO6susIPtXRpjKe/9UDSCNr KO5w46GhgKLXtNw+1Ilh51rj5rQFduSHd6+BQIs22d5mxyGNW2w55uE0DkD/HX7qEuUg e3MDBpSESG6Fn0MR1X6WuCXq28WL0R0a2evBQETuT+8FHNjDNRWV98T6GTTWsdnHWJso 9PCA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v79si5797689pgb.185.2018.01.18.03.58.15; Thu, 18 Jan 2018 03:58:29 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755654AbeARLyt (ORCPT + 99 others); Thu, 18 Jan 2018 06:54:49 -0500 Received: from regular1.263xmail.com ([211.150.99.135]:50281 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755202AbeARLyp (ORCPT ); Thu, 18 Jan 2018 06:54:45 -0500 Received: from jeffy.chen?rock-chips.com (unknown [192.168.167.76]) by regular1.263xmail.com (Postfix) with ESMTP id 9C75A1E168; Thu, 18 Jan 2018 19:54:39 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 Received: from localhost (localhost [127.0.0.1]) by smtp.263.net (Postfix) with ESMTPA id A2B2739A; Thu, 18 Jan 2018 19:54:37 +0800 (CST) X-RL-SENDER: jeffy.chen@rock-chips.com X-FST-TO: linux-kernel@vger.kernel.org X-SENDER-IP: 103.29.142.67 X-LOGIN-NAME: jeffy.chen@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-SENDER: cjf@rock-chips.com X-DNS-TYPE: 0 Received: from localhost (unknown [103.29.142.67]) by smtp.263.net (Postfix) whith ESMTP id 19604JZQWQM; Thu, 18 Jan 2018 19:54:41 +0800 (CST) From: Jeffy Chen To: linux-kernel@vger.kernel.org Cc: jcliang@chromium.org, robin.murphy@arm.com, xxm@rock-chips.com, tfiga@chromium.org, Jeffy Chen , Heiko Stuebner , linux-rockchip@lists.infradead.org, iommu@lists.linux-foundation.org, Joerg Roedel , linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 12/13] iommu/rockchip: Add runtime PM support Date: Thu, 18 Jan 2018 19:52:50 +0800 Message-Id: <20180118115251.5542-13-jeffy.chen@rock-chips.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180118115251.5542-1-jeffy.chen@rock-chips.com> References: <20180118115251.5542-1-jeffy.chen@rock-chips.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When the power domain is powered off, the IOMMU cannot be accessed and register programming must be deferred until the power domain becomes enabled. Add runtime PM support, and use runtime PM device link from IOMMU to master to startup and shutdown IOMMU. Signed-off-by: Jeffy Chen --- Changes in v4: None Changes in v3: Only call startup() and shutdown() when iommu attached. Remove pm_mutex. Check runtime PM disabled. Check pm_runtime in rk_iommu_irq(). Changes in v2: None drivers/iommu/rockchip-iommu.c | 180 ++++++++++++++++++++++++++++++++--------- 1 file changed, 141 insertions(+), 39 deletions(-) diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c index 2c095f96c033..e2e7acc3039d 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -99,6 +100,7 @@ struct rk_iommu { }; struct rk_iommudata { + struct device_link *link; /* runtime PM link from IOMMU to master */ struct rk_iommu *iommu; }; @@ -583,7 +585,11 @@ static irqreturn_t rk_iommu_irq(int irq, void *dev_id) u32 int_status; dma_addr_t iova; irqreturn_t ret = IRQ_NONE; - int i; + int i, err; + + err = pm_runtime_get_if_in_use(iommu->dev); + if (err <= 0 && err != -EINVAL) + return ret; WARN_ON(rk_iommu_enable_clocks(iommu)); @@ -635,6 +641,9 @@ static irqreturn_t rk_iommu_irq(int irq, void *dev_id) rk_iommu_disable_clocks(iommu); + if (pm_runtime_enabled(iommu->dev)) + pm_runtime_put(iommu->dev); + return ret; } @@ -676,10 +685,20 @@ static void rk_iommu_zap_iova(struct rk_iommu_domain *rk_domain, spin_lock_irqsave(&rk_domain->iommus_lock, flags); list_for_each(pos, &rk_domain->iommus) { struct rk_iommu *iommu; + int ret; + iommu = list_entry(pos, struct rk_iommu, node); - rk_iommu_enable_clocks(iommu); - rk_iommu_zap_lines(iommu, iova, size); - rk_iommu_disable_clocks(iommu); + + /* Only zap TLBs of IOMMUs that are powered on. */ + ret = pm_runtime_get_if_in_use(iommu->dev); + if (ret > 0 || ret == -EINVAL) { + rk_iommu_enable_clocks(iommu); + rk_iommu_zap_lines(iommu, iova, size); + rk_iommu_disable_clocks(iommu); + } + + if (ret > 0) + pm_runtime_put(iommu->dev); } spin_unlock_irqrestore(&rk_domain->iommus_lock, flags); } @@ -882,22 +901,30 @@ static struct rk_iommu *rk_iommu_from_dev(struct device *dev) return data ? data->iommu : NULL; } -static int rk_iommu_attach_device(struct iommu_domain *domain, - struct device *dev) +/* Must be called with iommu powered on and attached */ +static void rk_iommu_shutdown(struct rk_iommu *iommu) { - struct rk_iommu *iommu; + int i; + + /* Ignore error while disabling, just keep going */ + WARN_ON(rk_iommu_enable_clocks(iommu)); + rk_iommu_enable_stall(iommu); + rk_iommu_disable_paging(iommu); + for (i = 0; i < iommu->num_mmu; i++) { + rk_iommu_write(iommu->bases[i], RK_MMU_INT_MASK, 0); + rk_iommu_write(iommu->bases[i], RK_MMU_DTE_ADDR, 0); + } + rk_iommu_disable_stall(iommu); + rk_iommu_disable_clocks(iommu); +} + +/* Must be called with iommu powered on and attached */ +static int rk_iommu_startup(struct rk_iommu *iommu) +{ + struct iommu_domain *domain = iommu->domain; struct rk_iommu_domain *rk_domain = to_rk_domain(domain); - unsigned long flags; int ret, i; - /* - * Allow 'virtual devices' (e.g., drm) to attach to domain. - * Such a device does not belong to an iommu group. - */ - iommu = rk_iommu_from_dev(dev); - if (!iommu) - return 0; - ret = rk_iommu_enable_clocks(iommu); if (ret) return ret; @@ -910,8 +937,6 @@ static int rk_iommu_attach_device(struct iommu_domain *domain, if (ret) goto err_disable_stall; - iommu->domain = domain; - for (i = 0; i < iommu->num_mmu; i++) { rk_iommu_write(iommu->bases[i], RK_MMU_DTE_ADDR, rk_domain->dt_dma); @@ -923,12 +948,6 @@ static int rk_iommu_attach_device(struct iommu_domain *domain, if (ret) goto err_disable_stall; - spin_lock_irqsave(&rk_domain->iommus_lock, flags); - list_add_tail(&iommu->node, &rk_domain->iommus); - spin_unlock_irqrestore(&rk_domain->iommus_lock, flags); - - dev_dbg(dev, "Attached to iommu domain\n"); - rk_iommu_disable_stall(iommu); rk_iommu_disable_clocks(iommu); @@ -948,31 +967,78 @@ static void rk_iommu_detach_device(struct iommu_domain *domain, struct rk_iommu *iommu; struct rk_iommu_domain *rk_domain = to_rk_domain(domain); unsigned long flags; - int i; + int ret; /* Allow 'virtual devices' (eg drm) to detach from domain */ iommu = rk_iommu_from_dev(dev); if (!iommu) return; + dev_dbg(dev, "Detaching from iommu domain\n"); + + /* iommu already detached */ + if (iommu->domain != domain) + return; + + iommu->domain = NULL; + spin_lock_irqsave(&rk_domain->iommus_lock, flags); list_del_init(&iommu->node); spin_unlock_irqrestore(&rk_domain->iommus_lock, flags); - /* Ignore error while disabling, just keep going */ - WARN_ON(rk_iommu_enable_clocks(iommu)); - rk_iommu_enable_stall(iommu); - rk_iommu_disable_paging(iommu); - for (i = 0; i < iommu->num_mmu; i++) { - rk_iommu_write(iommu->bases[i], RK_MMU_INT_MASK, 0); - rk_iommu_write(iommu->bases[i], RK_MMU_DTE_ADDR, 0); - } - rk_iommu_disable_stall(iommu); - rk_iommu_disable_clocks(iommu); + ret = pm_runtime_get_if_in_use(iommu->dev); + if (ret <= 0 && ret != -EINVAL) + return; - iommu->domain = NULL; + rk_iommu_shutdown(iommu); + + if (pm_runtime_enabled(iommu->dev)) + pm_runtime_put(iommu->dev); +} + +static int rk_iommu_attach_device(struct iommu_domain *domain, + struct device *dev) +{ + struct rk_iommu *iommu; + struct rk_iommu_domain *rk_domain = to_rk_domain(domain); + unsigned long flags; + int ret; + + /* + * Allow 'virtual devices' (e.g., drm) to attach to domain. + * Such a device does not belong to an iommu group. + */ + iommu = rk_iommu_from_dev(dev); + if (!iommu) + return 0; + + dev_dbg(dev, "Attaching to iommu domain\n"); + + /* iommu already attached */ + if (iommu->domain == domain) + return 0; + + if (iommu->domain) + rk_iommu_detach_device(iommu->domain, dev); + + iommu->domain = domain; + + spin_lock_irqsave(&rk_domain->iommus_lock, flags); + list_add_tail(&iommu->node, &rk_domain->iommus); + spin_unlock_irqrestore(&rk_domain->iommus_lock, flags); - dev_dbg(dev, "Detached from iommu domain\n"); + ret = pm_runtime_get_if_in_use(iommu->dev); + if (ret <= 0 && ret != -EINVAL) + return 0; + + ret = rk_iommu_startup(iommu); + if (ret) + rk_iommu_detach_device(iommu->domain, dev); + + if (pm_runtime_enabled(iommu->dev)) + pm_runtime_put(iommu->dev); + + return ret; } static struct iommu_domain *rk_iommu_domain_alloc(unsigned type) @@ -1060,17 +1126,21 @@ static int rk_iommu_add_device(struct device *dev) { struct iommu_group *group; struct rk_iommu *iommu; + struct rk_iommudata *data; - iommu = rk_iommu_from_dev(dev); - if (!iommu) + data = dev->archdata.iommu; + if (!data) return -ENODEV; + iommu = rk_iommu_from_dev(dev); + group = iommu_group_get_for_dev(dev); if (IS_ERR(group)) return PTR_ERR(group); iommu_group_put(group); iommu_device_link(&iommu->iommu, dev); + data->link = device_link_add(dev, iommu->dev, DL_FLAG_PM_RUNTIME); return 0; } @@ -1078,9 +1148,11 @@ static int rk_iommu_add_device(struct device *dev) static void rk_iommu_remove_device(struct device *dev) { struct rk_iommu *iommu; + struct rk_iommudata *data = dev->archdata.iommu; iommu = rk_iommu_from_dev(dev); + device_link_del(data->link); iommu_device_unlink(&iommu->iommu, dev); iommu_group_remove_device(dev); } @@ -1197,6 +1269,8 @@ static int rk_iommu_probe(struct platform_device *pdev) bus_set_iommu(&platform_bus_type, &rk_iommu_ops); + pm_runtime_enable(dev); + return 0; err_remove_sysfs: iommu_device_sysfs_remove(&iommu->iommu); @@ -1205,6 +1279,33 @@ static int rk_iommu_probe(struct platform_device *pdev) return err; } +static int __maybe_unused rk_iommu_suspend(struct device *dev) +{ + struct rk_iommu *iommu = dev_get_drvdata(dev); + + if (!iommu->domain) + return 0; + + rk_iommu_shutdown(iommu); + return 0; +} + +static int __maybe_unused rk_iommu_resume(struct device *dev) +{ + struct rk_iommu *iommu = dev_get_drvdata(dev); + + if (!iommu->domain) + return 0; + + return rk_iommu_startup(iommu); +} + +static const struct dev_pm_ops rk_iommu_pm_ops = { + SET_RUNTIME_PM_OPS(rk_iommu_suspend, rk_iommu_resume, NULL) + SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, + pm_runtime_force_resume) +}; + static const struct of_device_id rk_iommu_dt_ids[] = { { .compatible = "rockchip,iommu" }, { /* sentinel */ } @@ -1216,6 +1317,7 @@ static struct platform_driver rk_iommu_driver = { .driver = { .name = "rk_iommu", .of_match_table = rk_iommu_dt_ids, + .pm = &rk_iommu_pm_ops, .suppress_bind_attrs = true, }, }; -- 2.11.0