From patchwork Tue Jan 16 13:25:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeffy Chen X-Patchwork-Id: 10166971 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 09C73601E7 for ; Tue, 16 Jan 2018 13:36:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EB2D72834A for ; Tue, 16 Jan 2018 13:36:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DF31528565; Tue, 16 Jan 2018 13:36:01 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5DEAC2834A for ; Tue, 16 Jan 2018 13:36:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=2xmgOQHsDCKStIVBXFfrux15CyBub2nbp9cCqdtX8Rg=; b=aapUESerNLUyhe4GWn4rXuUuY/ Zj/OM0DBhpI0A8sHytakRaelfe0oPnYmevfppm/kNidUFBWJWfsQVnl0wfPFFKpcBgU+HF46lYGW0 DHh4VwQeK5+ZB6JTleV9tCMzim47reqYsiNSImFZ7gcIj4HG53CZy/NGH3iemXkSUMGNTLVHvACIo g6wtMzg/lUMI58ZMPNB/ATvMs5Ea1k12dtkz5lUrrwusmhlWQtPCHV69Vl0/X8AoQxYqi0MqklHvg qXnTENkNFPjEApZpIZvxuXFpimuhV652yqYzRREnbAeNgxhdLYlf2wrlf0XN8LWDbSywToEa79wDB EK7mcWHQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1ebRPD-0003Jr-TQ; Tue, 16 Jan 2018 13:35:59 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1ebROw-0002qu-ST; Tue, 16 Jan 2018 13:35:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=uTK8gMLaA04KXdNsWh6duizRFlM8QEWHo1pR6NuLhWA=; b=sv/ODP3KAScvflfP6p44QcNRJ WHQiYGjKnkHns+ngqN+PoRynlJxxU85TZMLWHwHrdsh5QMyKPxJMaXdRh6VLFNnX7hspkZkv0QSgL zc60YXR7E+KyTMhQH+2EaUfs3kRWtmrTvbOrttLP3bfM8K0Yfl7ufjZf9IXjs8/i8ZEPGm6jHrGlr 4NwYEnW7CEw1B5K1pyx4+0Mmt3zIRviWJSCt49iy5EXdTFzaPHHdfBXXXDVL93AZmJTJR+qu7WI3k 2RiBMnDqG6/mKH2rCplVEmPiQsDz8fCUM8Q93VyDbNO1OMMdn+kZfgFl4ZKy+nMBS6Z/Dq8eaLbdp OCTy83FNw==; Received: from regular1.263xmail.com ([211.150.99.137]) by casper.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1ebRHP-00013n-De; Tue, 16 Jan 2018 13:28:04 +0000 Received: from jeffy.chen?rock-chips.com (unknown [192.168.167.152]) by regular1.263xmail.com (Postfix) with ESMTP id E2CFFDB18; Tue, 16 Jan 2018 21:27:33 +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 279113AC; Tue, 16 Jan 2018 21:27:31 +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: <9d16acaaf2ba5ed41b5702413b5b074e> 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 14538O1I9FN; Tue, 16 Jan 2018 21:27:35 +0800 (CST) From: Jeffy Chen To: linux-kernel@vger.kernel.org Subject: [PATCH v2 13/13] iommu/rockchip: Support sharing IOMMU between masters Date: Tue, 16 Jan 2018 21:25:40 +0800 Message-Id: <20180116132540.18939-14-jeffy.chen@rock-chips.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180116132540.18939-1-jeffy.chen@rock-chips.com> References: <20180116132540.18939-1-jeffy.chen@rock-chips.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180116_132756_433089_2F80E2D4 X-CRM114-Status: GOOD ( 15.72 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: xxm@rock-chips.com, Joerg Roedel , Jeffy Chen , tfiga@chromium.org, jcliang@chromium.org, linux-rockchip@lists.infradead.org, iommu@lists.linux-foundation.org, robin.murphy@arm.com, linux-arm-kernel@lists.infradead.org, Heiko Stuebner MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP There would be some masters sharing the same IOMMU device. Put them in the same iommu group and share the same iommu domain. Signed-off-by: Jeffy Chen --- Changes in v2: None drivers/iommu/rockchip-iommu.c | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c index c8de1456a016..6c316dd0dd2d 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -100,11 +100,13 @@ struct rk_iommu { struct iommu_device iommu; struct list_head node; /* entry in rk_iommu_domain.iommus */ struct iommu_domain *domain; /* domain to which iommu is attached */ + struct iommu_group *group; struct mutex pm_mutex; /* serializes power transitions */ }; struct rk_iommudata { struct device_link *link; /* runtime PM link from IOMMU to master */ + struct iommu_domain *domain; /* domain to which device is attached */ struct rk_iommu *iommu; }; @@ -964,6 +966,7 @@ static void rk_iommu_detach_device(struct iommu_domain *domain, { struct rk_iommu *iommu; struct rk_iommu_domain *rk_domain = to_rk_domain(domain); + struct rk_iommudata *data = dev->archdata.iommu; unsigned long flags; /* Allow 'virtual devices' (eg drm) to detach from domain */ @@ -971,6 +974,12 @@ static void rk_iommu_detach_device(struct iommu_domain *domain, if (!iommu) return; + /* device already detached */ + if (data->domain != domain) + return; + + data->domain = NULL; + dev_dbg(dev, "Detaching from iommu domain\n"); /* iommu already detached */ @@ -994,6 +1003,7 @@ static int rk_iommu_attach_device(struct iommu_domain *domain, { struct rk_iommu *iommu; struct rk_iommu_domain *rk_domain = to_rk_domain(domain); + struct rk_iommudata *data = dev->archdata.iommu; unsigned long flags; int ret; @@ -1005,15 +1015,21 @@ static int rk_iommu_attach_device(struct iommu_domain *domain, if (!iommu) return 0; + /* device already attached */ + if (data->domain == domain) + return 0; + + if (data->domain) + rk_iommu_detach_device(data->domain, dev); + + data->domain = domain; + 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); @@ -1150,13 +1166,11 @@ static void rk_iommu_remove_device(struct device *dev) static struct iommu_group *rk_iommu_device_group(struct device *dev) { - struct iommu_group *group; + struct rk_iommu *iommu; - group = iommu_group_get(dev); - if (!group) - group = iommu_group_alloc(); + iommu = rk_iommu_from_dev(dev); - return group; + return iommu ? iommu->group : NULL; } static int rk_iommu_of_xlate(struct device *dev, @@ -1263,6 +1277,12 @@ static int rk_iommu_probe(struct platform_device *pdev) if (err) goto err_remove_sysfs; + iommu->group = iommu_group_alloc(); + if (IS_ERR(iommu->group)) { + err = PTR_ERR(iommu->group); + goto err_unreg_iommu; + } + /* * Use the first registered IOMMU device for domain to use with DMA * API, since a domain might not physically correspond to a single @@ -1276,6 +1296,8 @@ static int rk_iommu_probe(struct platform_device *pdev) pm_runtime_enable(dev); return 0; +err_unreg_iommu: + iommu_device_unregister(&iommu->iommu); err_remove_sysfs: iommu_device_sysfs_remove(&iommu->iommu); err_put_clocks: @@ -1289,6 +1311,7 @@ static int rk_iommu_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); + iommu_group_put(iommu->group); iommu_device_unregister(&iommu->iommu); iommu_device_sysfs_remove(&iommu->iommu); rk_iommu_put_clocks(iommu);